diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-12-04 18:39:44 +0100 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-12-06 14:44:40 +0100 |
| commit | 75dadc1d8ffc3ac84c4b1988c266ef60de1a6cfe (patch) | |
| tree | c20f02932796de4be8845d90f8a6a4d69f91769a | |
| parent | f618e35a1ac25426912c26ef1948a2cc6217e8f0 (diff) | |
| download | freeipa-75dadc1d8ffc3ac84c4b1988c266ef60de1a6cfe.tar.gz freeipa-75dadc1d8ffc3ac84c4b1988c266ef60de1a6cfe.tar.xz freeipa-75dadc1d8ffc3ac84c4b1988c266ef60de1a6cfe.zip | |
Include LDFLAGS provided by rpmbuild in global LDFLAGS in the spec file.
Remove explicitly specified hardening flags from LDFLAGS in ipa-otpd.
https://fedorahosted.org/freeipa/ticket/3896
| -rw-r--r-- | daemons/ipa-otpd/Makefile.am | 2 | ||||
| -rw-r--r-- | freeipa.spec.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am index f0b75284..ed99c3ec 100644 --- a/daemons/ipa-otpd/Makefile.am +++ b/daemons/ipa-otpd/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS := $(CFLAGS) @LDAP_CFLAGS@ @LIBVERTO_CFLAGS@ -AM_LDFLAGS := $(LDFLAGS) @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ -pie -Wl,-z,relro -Wl,-z,now +AM_LDFLAGS := $(LDFLAGS) @LDAP_LIBS@ @LIBVERTO_LIBS@ @KRAD_LIBS@ noinst_HEADERS = internal.h libexec_PROGRAMS = ipa-otpd diff --git a/freeipa.spec.in b/freeipa.spec.in index fa382b0f..2a4d8fcb 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -322,6 +322,7 @@ This package contains tests that verify IPA functionality. %build export CFLAGS="%{optflags} $CFLAGS" export CPPFLAGS="%{optflags} $CPPFLAGS" +export LDFLAGS="%{__global_ldflags} $LDFLAGS" %if 0%{?fedora} >= 19 export SUPPORTED_PLATFORM=fedora19 %else |