Author: glen Date: Mon Aug 30 15:39:02 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- as %zend_zts can't ever be %{nil} in rpm.macros, make it to be "_ts" or ""
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.577 -> 1.578)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.577
packages/rpm-build-macros/rpm.macros:1.578
--- packages/rpm-build-macros/rpm.macros:1.577 Thu Aug 26 17:00:31 2010
+++ packages/rpm-build-macros/rpm.macros Mon Aug 30 17:38:57 2010
@@ -816,7 +816,9 @@
%php_debug %{expand:%%global php_debug %(awk
'/#define ZEND_DEBUG/{print $3}' %{php_includedir}/main/php_config.h
2>/dev/null || echo ERROR)}%php_debug
%zend_module_api %{expand:%%global zend_module_api %(awk
'/#define ZEND_MODULE_API_NO/{print $3}' %{php_includedir}/Zend/zend_modules.h
2>/dev/null || echo ERROR)}%zend_module_api
%zend_extension_api %{expand:%%global zend_extension_api %(awk
'/#define ZEND_EXTENSION_API_NO/{print $3}'
%{php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo
ERROR)}%zend_extension_api
-%zend_zts %{expand:%%global zend_zts %(Z=$(grep
-sc '^#define ZTS 1' %{php_includedir}/main/php_config.h); echo
${Z:-ERROR})}%zend_zts
+%_zend_zts %{expand:%%global _zend_zts %(Z=$(grep
-sc '^#define ZTS 1' %{php_includedir}/main/php_config.h); echo
${Z:-ERROR})}%_zend_zts
+# "_ts" if ZTS enabled, empty otherwise
+%zend_zts %{expand:%%global
_zend_zts_%{?_zend_zts} 1}%{?_zend_zts_1:_ts}
# helper macro
%__php_api_requires(v:) Requires: php%{-v*}(%{expand:%1}) =
%{expand:%{%{!?2:%{1}}%{?2}}}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.577&r2=1.578&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
