From d9ca5910ca2ed4f5c17d53263843652b53a042e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 30 Aug 2010 15:38:57 +0000 Subject: [PATCH] - as %zend_zts can't ever be %{nil} in rpm.macros, make it to be "_ts" or "" Changed files: rpm.macros -> 1.578 --- rpm.macros | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpm.macros b/rpm.macros index d8c46a5..14f9d88 100644 --- a/rpm.macros +++ b/rpm.macros @@ -816,7 +816,9 @@ fi; \ %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}}} -- 2.44.0