Compare commits
No commits in common. 'c9' and 'i8c' have entirely different histories.
@ -1,47 +0,0 @@
|
||||
From a4ba0ead6c82b3efe409c04d17de7ca06054356a Mon Sep 17 00:00:00 2001
|
||||
From: Colin Walters <walters@verbum.org>
|
||||
Date: Wed, 3 Oct 2018 15:11:52 +0000
|
||||
Subject: [PATCH] build-sys: Inherit LDFLAGS
|
||||
|
||||
So that we can respect e.g. the Fedora hardening flags.
|
||||
---
|
||||
Makefile | 2 +-
|
||||
configure | 3 ++-
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8d9b7d2..badecdc 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -10,7 +10,7 @@ O := files-pwd.o \
|
||||
files-have_o_cloexec.o
|
||||
|
||||
CFLAGS += $(EXTRA_CFLAGS) -pthread -fpic
|
||||
-LDFLAGS += $(CFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
|
||||
+LDFLAGS += $(CFLAGS) $(EXTRA_LDFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
|
||||
CPPFLAGS += -D_GNU_SOURCE
|
||||
|
||||
ifneq ($(strip $(DATADIR)),)
|
||||
diff --git a/configure b/configure
|
||||
index 3336c3d..8d0bf6d 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -34,13 +34,14 @@ done
|
||||
#
|
||||
test -n "${CXXFLAGS}" && EXTRA_CXXFLAGS=${CXXFLAGS}
|
||||
test -n "${CFLAGS}" && EXTRA_CFLAGS=${CFLAGS}
|
||||
+test -n "${LDFLAGS}" && EXTRA_LDFLAGS=${LDFLAGS}
|
||||
|
||||
# Inspect arguments and generate config.mk
|
||||
#
|
||||
echo "# autogenerated by: $0 $*" > config.mk
|
||||
for var in "$@" ; do
|
||||
case ${var} in
|
||||
- CFLAGS=* | CXXFLAGS=*)
|
||||
+ CFLAGS=* | CXXFLAGS=* | LDFLAGS=* )
|
||||
echo "Setting EXTRA_${var}"
|
||||
echo "EXTRA_${var}" >> config.mk
|
||||
;;
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,41 @@
|
||||
Only in nss-altfiles-2.18.1.new: config.mk
|
||||
diff -ur nss-altfiles-2.18.1/configure nss-altfiles-2.18.1.new/configure
|
||||
--- nss-altfiles-2.18.1/configure 2014-03-14 13:13:43.000000000 +0000
|
||||
+++ nss-altfiles-2.18.1.new/configure 2019-04-02 14:44:03.399819940 +0000
|
||||
@@ -34,13 +34,14 @@
|
||||
#
|
||||
test -n "${CXXFLAGS}" && EXTRA_CXXFLAGS=${CXXFLAGS}
|
||||
test -n "${CFLAGS}" && EXTRA_CFLAGS=${CFLAGS}
|
||||
+test -n "${LDFLAGS}" && EXTRA_LDFLAGS=${LDFLAGS}
|
||||
|
||||
# Inspect arguments and generate config.mk
|
||||
#
|
||||
echo "# autogenerated by: $0 $*" > config.mk
|
||||
for var in "$@" ; do
|
||||
case ${var} in
|
||||
- CFLAGS=* | CXXFLAGS=*)
|
||||
+ CFLAGS=* | CXXFLAGS=* | LDFLAGS=* )
|
||||
echo "Setting EXTRA_${var}"
|
||||
echo "EXTRA_${var}" >> config.mk
|
||||
;;
|
||||
Only in nss-altfiles-2.18.1.new: debugfiles.list
|
||||
Only in nss-altfiles-2.18.1.new: debuglinks.list
|
||||
Only in nss-altfiles-2.18.1.new: debugsourcefiles.list
|
||||
Only in nss-altfiles-2.18.1.new: debugsources.list
|
||||
Only in nss-altfiles-2.18.1.new: elfbins.list
|
||||
Only in nss-altfiles-2.18.1.new: files-grp.o
|
||||
Only in nss-altfiles-2.18.1.new: files-have_o_cloexec.o
|
||||
Only in nss-altfiles-2.18.1.new: files-pwd.o
|
||||
Only in nss-altfiles-2.18.1.new: libnss_altfiles.so.2
|
||||
diff -ur nss-altfiles-2.18.1/Makefile nss-altfiles-2.18.1.new/Makefile
|
||||
--- nss-altfiles-2.18.1/Makefile 2014-03-14 13:13:43.000000000 +0000
|
||||
+++ nss-altfiles-2.18.1.new/Makefile 2019-04-02 14:44:28.023780755 +0000
|
||||
@@ -10,7 +10,7 @@
|
||||
files-have_o_cloexec.o
|
||||
|
||||
CFLAGS += $(EXTRA_CFLAGS) -pthread -fpic
|
||||
-LDFLAGS += $(CFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
|
||||
+LDFLAGS += $(CFLAGS) $(EXTRA_LDFLAGS) -Wl,-soname,$T -Wl,-as-needed -nostdlib -lpthread
|
||||
CPPFLAGS += -D_GNU_SOURCE
|
||||
|
||||
ifneq ($(strip $(DATADIR)),)
|
||||
Loading…
Reference in new issue