[packages/rpm-build-macros] memoize php_suffix
glen
glen at pld-linux.org
Sat Jun 22 21:33:38 CEST 2013
commit 0ac68253037e85704f6f401bf91fccfd5c4826ef
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Jun 22 22:33:22 2013 +0300
memoize php_suffix
rpm.macros | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/rpm.macros b/rpm.macros
index f76e133..45ac621 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -946,7 +946,7 @@ fi; \
%php_name php%{?php_suffix}
# use rpmbuild -D 'php_suffix 54' to build php extension for php 5.4
# NOTE: error output must be empty. otherwise can't build pecl packages if no php*-devel is installed
-%php_suffix %(c=$(php-config --sysconfdir 2>/dev/null) || echo '' && echo ${c#/etc/php})
+%php_suffix %{expand:%%global php_suffix %(c=$(php-config --sysconfdir 2>/dev/null) || echo '' && echo ${c#/etc/php})%%{nil}}%php_suffix
# php cli. version that php headers are installed for
%__php /usr/bin/%{php_name}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/0ac68253037e85704f6f401bf91fccfd5c4826ef
More information about the pld-cvs-commit
mailing list