commit 479b251b52eef39f6ba988330cbcb14d5e2d1fb7
Author: Jakub Bogusz <[email protected]>
Date: Tue Sep 1 19:23:46 2020 +0200
- adjust makedefs to work also with libx32 dirs
postfix.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/postfix.spec b/postfix.spec
index 94571cf..4c14bf7 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -299,14 +299,14 @@ cat %{SOURCE7} | %{__patch} -p1 -s
cat %{SOURCE11} | %{__patch} -p1 -s
%endif
-find -type f | xargs sed -i -e 's|/etc/postfix|/etc/mail|g'
+find -type f | xargs %{__sed} -i -e 's|/etc/postfix|/etc/mail|g'
%patch0 -p1
%patch3 -p1
%{?with_hir:%patch4 -p0}
-sed -i '/scache_clnt_create/s/server/var_scache_service/'
src/global/scache_clnt.c
+%{__sed} -i -e '/scache_clnt_create/s/server/var_scache_service/'
src/global/scache_clnt.c
%patch7 -p1
%patch8 -p1
@@ -319,6 +319,8 @@ sed -i '/scache_clnt_create/s/server/var_scache_service/'
src/global/scache_clnt
sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
%endif
+%{__sed} -i -e 's,/lib64\>,/%{_lib},' makedefs
+
%build
# export, as the same variables must be passed both to 'make makefiles' and
'make'
export CCARGS="%{!?with_epoll:-DNO_EPOLL} %{?with_ldap:-DHAS_LDAP} -DHAS_PCRE
%{?with_sasl:-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl}
%{?with_mysql:-DHAS_MYSQL -I/usr/include/mysql} %{?with_pgsql:-DHAS_PGSQL}
%{?with_ssl:-DUSE_TLS} -DMAX_DYNAMIC_MAPS %{?with_cdb:-DHAS_CDB}
%{?with_sqlite:-DHAS_SQLITE} %{?with_lmdb:-DHAS_LMDB} -LHAS_SDBM"
@@ -333,7 +335,8 @@ export AUXLIBS_SQLITE="%{?with_sqlite:-lsqlite3}"
export CC="%{__cc}"
%{__make} makefiles \
- shared=yes dynamicmaps=yes \
+ shared=yes \
+ dynamicmaps=yes \
daemon_directory="%{_libdir}/postfix" \
shlib_directory="%{_libdir}/postfix" \
manpage_directory="%{_mandir}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postfix.git/commitdiff/479b251b52eef39f6ba988330cbcb14d5e2d1fb7
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
