- link with full reloc options.
This commit is contained in:
parent
bfe1a8b3f1
commit
a41d5f9d71
46
autofs-5.0.7-dont-override-LDFLAGS-in-make-rules.patch
Normal file
46
autofs-5.0.7-dont-override-LDFLAGS-in-make-rules.patch
Normal file
@ -0,0 +1,46 @@
|
||||
autofs-5.0.7 - don't override LDFLAGS in make rules
|
||||
|
||||
From: Ian Kent <ikent@redhat.com>
|
||||
|
||||
Ensure that externally defined LDFLAGS is not overridden.
|
||||
---
|
||||
CHANGELOG | 1 +
|
||||
Makefile.rules | 6 +++---
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CHANGELOG b/CHANGELOG
|
||||
index 5d90139..37eac72 100644
|
||||
--- a/CHANGELOG
|
||||
+++ b/CHANGELOG
|
||||
@@ -53,6 +53,7 @@
|
||||
- fix probe each nfs version in turn for singleton mounts.
|
||||
- misc man page fixes.
|
||||
- fix add null check in parse_server_string().
|
||||
+- don't override LDFLAGS in make rules.
|
||||
|
||||
25/07/2012 autofs-5.0.7
|
||||
=======================
|
||||
diff --git a/Makefile.rules b/Makefile.rules
|
||||
index f2ba386..6b5b2bd 100644
|
||||
--- a/Makefile.rules
|
||||
+++ b/Makefile.rules
|
||||
@@ -24,16 +24,16 @@ endif
|
||||
|
||||
ifdef DEBUG
|
||||
CFLAGS ?= -g -Wall -DDEBUG
|
||||
-LDFLAGS = -g
|
||||
+LDFLAGS ?= -g
|
||||
STRIP = :
|
||||
else
|
||||
ifdef DONTSTRIP
|
||||
CFLAGS ?= -O2 -g
|
||||
-LDFLAGS = -g
|
||||
+LDFLAGS ?= -g
|
||||
STRIP = :
|
||||
else
|
||||
CFLAGS ?= -O2 -Wall
|
||||
-LDFLAGS = -s
|
||||
+LDFLAGS ?= -s
|
||||
STRIP = strip --strip-debug
|
||||
endif
|
||||
endif
|
||||
@ -8,7 +8,7 @@
|
||||
Summary: A tool for automatically mounting and unmounting filesystems
|
||||
Name: autofs
|
||||
Version: 5.0.7
|
||||
Release: 25%{?dist}
|
||||
Release: 26%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: System Environment/Daemons
|
||||
@ -96,6 +96,7 @@ Patch80: autofs-5.0.7-misc-man-page-fixes.patch
|
||||
Patch81: autofs-5.0.7-fix-add-null-check-in-parse_server_string.patch
|
||||
Patch82: autofs-5.0.7-check-for-protocol-option.patch
|
||||
Patch83: autofs-5.0.7-use-ulimit-max-open-files-if-greater-than-internal-maximum.patch
|
||||
Patch84: autofs-5.0.7-dont-override-LDFLAGS-in-make-rules.patch
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
%if %{with_systemd}
|
||||
BuildRequires: systemd-units
|
||||
@ -236,9 +237,10 @@ echo %{version}-%{release} > .version
|
||||
%patch81 -p1
|
||||
%patch82 -p1
|
||||
%patch83 -p1
|
||||
%patch84 -p1
|
||||
|
||||
%build
|
||||
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
|
||||
LDFLAGS=-Wl,-z,now
|
||||
%configure --disable-mount-locking --enable-ignore-busy --with-libtirpc %{?systemd_configure_arg:}
|
||||
make initdir=%{_initrddir} DONTSTRIP=1
|
||||
|
||||
@ -327,6 +329,9 @@ fi
|
||||
%dir /etc/auto.master.d
|
||||
|
||||
%changelog
|
||||
* Fri Jul 12 2013 Ian Kent <ikent@redhat.com> - 1:5.0.7-26
|
||||
- link with full reloc options.
|
||||
|
||||
* Fri Jul 12 2013 Ian Kent <ikent@redhat.com> - 1:5.0.7-25
|
||||
- fix default path used for unitdir.
|
||||
- fix changelog inconsistent dates.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user