[openssh-commits] [openssh] 01/01: compile sk-dummy.so with no-PIE version of LDFLAGS

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 443848155ffcda65a6077aac118c861b503a093f
Author: Damien Miller <djm at mindrot.org>
Date:   Fri Nov 29 15:10:21 2019 +1100

    compile sk-dummy.so with no-PIE version of LDFLAGS
    
    This lets it pick up the -L path to libcrypto for example.
---
 Makefile.in                | 3 ++-
 configure.ac               | 4 +++-
 openbsd-compat/Makefile.in | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a3760562..1c5adfe9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,6 +61,7 @@ SED=@SED@
 ENT=@ENT@
 XAUTH_PATH=@XAUTH_PATH@
 LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
+LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@
 EXEEXT=@EXEEXT@
 MANFMT=@MANFMT@
 MKDIR_P=@MKDIR_P@
@@ -607,7 +608,7 @@ SK_DUMMY_OBJS=\
 
 regress/misc/sk-dummy/sk-dummy.so: $(SK_DUMMY_OBJS)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared -o $@ $(SK_DUMMY_OBJS) \
-	    -L. -Lopenbsd-compat -lopenbsd-compat $(LIBS)
+	    -L. -Lopenbsd-compat -lopenbsd-compat $(LDFLAGS_NOPIE) $(LIBS)
 
 regress-binaries: regress-prep $(LIBCOMPAT) \
 	regress/modpipe$(EXEEXT) \
diff --git a/configure.ac b/configure.ac
index c57b2401..a12fc0d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5313,8 +5313,10 @@ AC_SUBST([DEPEND], [$(cat $srcdir/.depend)])
 CFLAGS="${CFLAGS} ${CFLAGS_AFTER}"
 LDFLAGS="${LDFLAGS} ${LDFLAGS_AFTER}"
 
-# Make a copy of CFLAGS without -fpie
+# Make a copy of CFLAGS/LDFLAGS without PIE options.
+LDFLAGS_NOPIE=`echo "$LDFLAGS" | sed 's/ -pie//'`
 CFLAGS_NOPIE=`echo "$CFLAGS" | sed 's/ -fPIE//'`
+AC_SUBST([LDFLAGS_NOPIE])
 AC_SUBST([CFLAGS_NOPIE])
 
 AC_EXEEXT
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index c2423324..43544eba 100644
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -15,6 +15,7 @@ AR=@AR@
 RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 LDFLAGS=-L. @LDFLAGS@
+LDFLAGS_NOPIE=-L. -Lopenbsd-compat/ @LDFLAGS_NOPIE@
 
 OPENBSD=base64.o \
 	basename.o \

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.