From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 29 May 2019 09:19:34 +0000 (+0200)
Subject: Pull the values for LFS_{CFLAGS,LDFLAGS,LIBS} from autoconf instead using them direct... 
X-Git-Tag: v9.11.8~6^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f9880fcf6d1aa0f7af92d9bafb90409c6891b6c1;p=thirdparty%2Fbind9.git

Pull the values for LFS_{CFLAGS,LDFLAGS,LIBS} from autoconf instead using them directly in make

(cherry picked from commit d4596baed48b983c881c64edc65b6fe5336f1d24)
---

diff --git a/configure b/configure
index 12d042558fd..080f37da25d 100755
--- a/configure
+++ b/configure
@@ -943,6 +943,9 @@ LDFLAGS
 CFLAGS
 CC
 LIBTOOL
+LFS_LIBS
+LFS_LDFLAGS
+LFS_CFLAGS
 SET_MAKE
 host_os
 host_vendor
@@ -3017,6 +3020,14 @@ sunos*)
     ;;
 esac
 
+LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
+LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
+LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
+
+
+
+
+
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
diff --git a/configure.ac b/configure.ac
index d290c4b0b01..18cfed24c17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,14 @@ sunos*)
     ;;
 esac
 
+LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
+LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
+LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
+
+AC_SUBST([LFS_CFLAGS])
+AC_SUBST([LFS_LDFLAGS])
+AC_SUBST([LFS_LIBS])
+
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index 769d7ff87b1..f6868d15879 100644
--- a/lib/dns/Makefile.in
+++ b/lib/dns/Makefile.in
@@ -179,9 +179,6 @@ include/dns/rdatastruct.h: gen \
 code.h:	gen
 	./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
 
-gen: LFS_CFLAGS  = `getconf LFS_CFLAGS 2>/dev/null`
-gen: LFS_LDFLAGS = `getconf LFS_LDFLAGS 2>/dev/null`
-gen: LFS_LIBS    = `getconf LFS_LIBS 2>/dev/null`
 gen: gen.c
 	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
 	${LFS_CFLAGS} ${LFS_LDFLAGS} \
diff --git a/make/rules.in b/make/rules.in
index 5cc4a4e67d3..3bb1928d33b 100644
--- a/make/rules.in
+++ b/make/rules.in
@@ -114,6 +114,10 @@ BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 BUILD_LIBS = @BUILD_LIBS@
 
+LFS_CFLAGS = @LFS_CFLAGS@
+LFS_LDFLAGS = @LFS_LDFLAGS@
+LFS_LIBS = @LFS_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c .@O@