Overriden DEF_SHLIB_DIR according to build host

Resolves: rhbz#1202921
This commit is contained in:
Jaroslav Škarvada 2015-03-24 16:48:06 +01:00
parent 193d7f243d
commit 545b3695b6

View File

@ -42,7 +42,7 @@
Name: postfix Name: postfix
Summary: Postfix Mail Transport Agent Summary: Postfix Mail Transport Agent
Version: 3.0.0 Version: 3.0.0
Release: 4%{?dist} Release: 5%{?dist}
Epoch: 2 Epoch: 2
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.postfix.org URL: http://www.postfix.org
@ -210,6 +210,11 @@ maps with Postfix, you need this.
%patch3 -p1 -b .alternatives %patch3 -p1 -b .alternatives
%patch8 -p1 -b .large-fs %patch8 -p1 -b .large-fs
# Change DEF_SHLIB_DIR according to build host
sed -i \
's|^\(\s*#define\s\+DEF_SHLIB_DIR\s\+\)"/usr/lib/postfix"|\1"%{_libdir}/postfix"|' \
src/global/mail_params.h
%if %{with pflogsumm} %if %{with pflogsumm}
gzip -dc %{SOURCE53} | tar xf - gzip -dc %{SOURCE53} | tar xf -
pushd pflogsumm-%{pflogsumm_ver} pushd pflogsumm-%{pflogsumm_ver}
@ -278,6 +283,10 @@ CCARGS="${CCARGS} $(getconf LFS_CFLAGS)"
LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}" LDFLAGS="%{?__global_ldflags} %{?_hardened_build:-Wl,-z,relro,-z,now}"
# SHLIB_RPATH is needed to find private libraries
# LDFLAGS are added to SHLIB_RPATH because the postfix build system
# ignores them. Adding LDFLAGS to SHLIB_RPATH is currently the only
# way how to get them in
make -f Makefile.init makefiles shared=yes dynamicmaps=yes \ make -f Makefile.init makefiles shared=yes dynamicmaps=yes \
%{?_hardened_build:pie=yes} CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \ %{?_hardened_build:pie=yes} CCARGS="${CCARGS}" AUXLIBS="${AUXLIBS}" \
AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_PCRE="${AUXLIBS_PCRE}" \ AUXLIBS_LDAP="${AUXLIBS_LDAP}" AUXLIBS_PCRE="${AUXLIBS_PCRE}" \
@ -719,6 +728,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Tue Mar 24 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.0-5
- Overriden DEF_SHLIB_DIR according to build host
Resolves: rhbz#1202921
* Fri Mar 13 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.0-4 * Fri Mar 13 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.0.0-4
- Switched to dynamically loaded libraries and database plugins - Switched to dynamically loaded libraries and database plugins
- Enabled PostgreSQL support by default - Enabled PostgreSQL support by default