Author: glen Date: Fri Oct 28 07:16:45 2005 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- another try with %zend_zts
---- Files affected:
SOURCES:
rpm.macros (1.158.4.72 -> 1.158.4.73)
SOURCES:
rpm.macros (1.250 -> 1.251)
---- Diffs:
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.158.4.72 SOURCES/rpm.macros:1.158.4.73
--- SOURCES/rpm.macros:1.158.4.72 Fri Oct 28 01:34:12 2005
+++ SOURCES/rpm.macros Fri Oct 28 09:16:40 2005
@@ -482,7 +482,7 @@
%php_debug %(awk '/#define ZEND_DEBUG/{print $3}'
%{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
%zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}'
%{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
%zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print
$3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts %(grep -c '^#define ZTS 1'
%{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
+%zend_zts %(Z=$(grep -sc '^#define ZTS 1'
/usr/include/php/main/php_config.h); echo ${Z:-ERROR})
# helper macro
%__php_api_requires() Requires: php(%{expand:%1}) =
%{expand:%{%{!?2:%{1}}%{?2}}}
================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.250 SOURCES/rpm.macros:1.251
--- SOURCES/rpm.macros:1.250 Fri Oct 28 01:34:12 2005
+++ SOURCES/rpm.macros Fri Oct 28 09:16:40 2005
@@ -483,7 +483,7 @@
%php_debug %(awk '/#define ZEND_DEBUG/{print $3}'
%{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
%zend_module_api %(awk '/#define ZEND_MODULE_API_NO/{print $3}'
%{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
%zend_extension_api %(awk '/#define ZEND_EXTENSION_API_NO/{print
$3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
-%zend_zts %(grep -c '^#define ZTS 1'
%{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
+%zend_zts %(Z=$(grep -sc '^#define ZTS 1'
/usr/include/php/main/php_config.h); echo ${Z:-ERROR})
# helper macro
%__php_api_requires() Requires: php(%{expand:%1}) =
%{expand:%{%{!?2:%{1}}%{?2}}}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.158.4.72&r2=1.158.4.73&f=u
http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.250&r2=1.251&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
