Workaround for PIC compilation problem with gcc-5
Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584 Resolves: rhbz#1190784 Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
parent
2ca260ba15
commit
b0e7a3ba8e
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/lookups/Makefile b/src/lookups/Makefile
|
||||
index 6ba0cb1..21a7ad7 100644
|
||||
--- a/src/lookups/Makefile
|
||||
+++ b/src/lookups/Makefile
|
||||
@@ -22,7 +22,7 @@ lookups.a: $(OBJ)
|
||||
$(FE)$(CC) -c $(CFLAGS) $(INCLUDE) $*.c
|
||||
|
||||
.c.so:; @echo "$(CC) -shared $*.c"
|
||||
- $(FE)$(CC) $(LOOKUP_$*_INCLUDE) $(LOOKUP_$*_LIBS) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) $*.c -o $@
|
||||
+ $(FE)$(CC) $(LOOKUP_$*_INCLUDE) $(LOOKUP_$*_LIBS) -DDYNLOOKUP $(CFLAGS_DYNAMIC) $(CFLAGS) $(INCLUDE) $(DLFLAGS) $(PIC) $*.c -o $@
|
||||
|
||||
lf_check_file.o: $(PHDRS) lf_check_file.c lf_functions.h
|
||||
lf_quote.o: $(PHDRS) lf_quote.c lf_functions.h
|
12
exim.spec
12
exim.spec
|
@ -15,7 +15,7 @@
|
|||
Summary: The exim mail transfer agent
|
||||
Name: exim
|
||||
Version: 4.85
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
License: GPLv2+
|
||||
Url: http://www.exim.org/
|
||||
Group: System Environment/Daemons
|
||||
|
@ -65,6 +65,8 @@ Patch21: exim-4.82-localhost-is-local.patch
|
|||
Patch22: exim-4.82-greylist-conf.patch
|
||||
Patch23: exim-4.82-smarthost-config.patch
|
||||
Patch25: exim-4.82-dynlookup-config.patch
|
||||
# Upstream ticket: http://bugs.exim.org/show_bug.cgi?id=1584
|
||||
Patch26: exim-4.85-pic.patch
|
||||
|
||||
Requires: /etc/pki/tls/certs /etc/pki/tls/private
|
||||
Requires: /etc/aliases
|
||||
|
@ -221,6 +223,7 @@ greylisting unconditional.
|
|||
%patch22 -p1 -b .grey
|
||||
%patch23 -p1 -b .smarthost
|
||||
%patch25 -p1 -b .dynconfig
|
||||
%patch26 -p1 -b .fpic
|
||||
|
||||
cp src/EDITME Local/Makefile
|
||||
sed -i 's@^# LOOKUP_MODULE_DIR=.*@LOOKUP_MODULE_DIR=%{_libdir}/exim/%{version}-%{release}/lookups@' Local/Makefile
|
||||
|
@ -231,8 +234,10 @@ cp exim_monitor/EDITME Local/eximon.conf
|
|||
%build
|
||||
%ifnarch s390 s390x sparc sparcv9 sparcv9v sparc64 sparc64v
|
||||
export PIE=-fpie
|
||||
export PIC=-fpic
|
||||
%else
|
||||
export PIE=-fPIE
|
||||
export PIC=-fPIC
|
||||
%endif
|
||||
make _lib=%{_lib} FULLECHO=
|
||||
|
||||
|
@ -611,6 +616,11 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null 2>&1 || :
|
|||
%{_sysconfdir}/cron.daily/greylist-tidy.sh
|
||||
|
||||
%changelog
|
||||
* Tue Feb 10 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 4.85-2
|
||||
- Shared objects are now compiled with PIC, not PIE, which is needed for gcc-5,
|
||||
(by pic patch)
|
||||
Resolves: rhbz#1190784
|
||||
|
||||
* Tue Jan 13 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 4.85-1
|
||||
- New version
|
||||
Resolves: rhbz#1181479
|
||||
|
|
Loading…
Reference in New Issue