From: Phil Pennock <pdp@exim.org>
Date: Sat, 17 Mar 2018 01:57:14 +0000 (-0400)
Subject: openssl: use += for LDFLAGS, drop env PC docs
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/1922a912d23fc06ee7fb0d22d9cf3e633a4713dc

openssl: use += for LDFLAGS, drop env PC docs

Using `LDFLAGS=` instead of `LDFLAGS+=` will stomp over an earlier
setting of LDFLAGS, and the DMARC support is now further up in
`src/EDITME`, thus likely to get stomped upon.

Rather than continue to document using `PKG_CONFIG_PATH` via env, the
in-Local/Makefile support has been around for a little while now, so go
ahead and make that the only way we suggest here.

Add a mention of _why_ we use both `USE_OPENSSL_PC` and `LDFLAGS`.
---

diff --git a/doc/doc-txt/openssl.txt b/doc/doc-txt/openssl.txt
index a8d69b690..e4f5d854c 100644
--- a/doc/doc-txt/openssl.txt
+++ b/doc/doc-txt/openssl.txt
@@ -49,23 +49,22 @@ When you copy `src/EDITME` to `Local/Makefile` to make your build edits,
 choose the pkg-config approach in that file, but also tell Exim to add
 the relevant directory into the rpath stamped into the binary:
 
+    PKG_CONFIG_PATH=/opt/openssl/lib/pkgconfig
+
     SUPPORT_TLS=yes
     USE_OPENSSL_PC=openssl
-    LDFLAGS=-ldl -Wl,-rpath,/opt/openssl/lib
+    LDFLAGS+=-ldl -Wl,-rpath,/opt/openssl/lib
 
 The -ldl is needed by OpenSSL 1.0.2+ on Linux and is not needed on most
-other platforms.
+other platforms.  The LDFLAGS is needed because `pkg-config` doesn't know
+how to emit information about RPATH-stamping, but we can still leverage
+`pkg-config` for everything else.
 
-Then tell pkg-config how to find the configuration files for your new
-OpenSSL install, and build Exim:
+Then build Exim:
 
-    export PKG_CONFIG_PATH=/opt/openssl/lib/pkgconfig
     make
     sudo make install
 
-(From Exim 4.89, you can put that `PKG_CONFIG_PATH` directly into
- your `Local/Makefile` file.)
-
 
 Confirming
 ----------