commit f012e16d7c8e878f15791420ffe2d06a9fd6556a
Author: Elan Ruusamäe <[email protected]>
Date: Tue Nov 4 07:35:41 2014 +0200
with system_pcre bcond (for bootstrapping)
rpm.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 62018b0..9f8c281 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -16,6 +16,7 @@
%bcond_with neon # build with HTTP/WebDAV support (neon library)
%bcond_with sqlite # build with SQLite support
%bcond_with system_lua # use system lua
+%bcond_with system_pcre # use system pcre
%bcond_with keyutils # build with keyutils support
# force_cc - force using __cc other than
"%{_target_cpu}-pld-linux-gcc"
# force_cxx - force using __cxx other than
"%{_target_cpu}-pld-linux-g++"
@@ -982,7 +983,7 @@ awk -f %{SOURCE6} %{SOURCE1}
install %{SOURCE26} tools/rpmdb_checkversion.c
install %{SOURCE28} tools/rpmdb_reset.c
-for extlib in beecrypt neon pcre popt; do
+for extlib in beecrypt neon %{?with_system_pcre:pcre} popt; do
[ -d $extlib ] && %{__rm} -r $extlib
done
@@ -1026,7 +1027,7 @@ sed -i \
--with-neon=%{?with_neon:external}%{!?with_neon:no} \
--with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/%%{_target}/macros:%{_rpmlibdir}/macros.d/pld:%{_rpmlibdir}/macros.build:%{_sysconfdir}/rpm/macros.*:%{_sysconfdir}/rpm/macros:%{_sysconfdir}/rpm/%%{_target}/macros:%{_sysconfdir}/rpm/macros.d/*.macros:~/etc/.rpmmacros:~/.rpmmacros'
\
--without-path-versioned \
- --with-pcre=external \
+ --with-pcre=%{!?with_system_pcre:internal}%{?with_system_pcre:external}
\
--with-popt=external \
%{?with_python:--with-python=%{py_ver}
--with-python-lib-dir=%{py_sitedir}} \
%{!?with_python:--without-python} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f012e16d7c8e878f15791420ffe2d06a9fd6556a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
