From 741613208ee410e42c0fd3fbe108e6f3db3f11d9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Aug 2018 13:01:00 +0200 Subject: drop -mstackrealign option, workaround to #1593144 --- failed.txt | 5 +++++ php73.spec | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/failed.txt b/failed.txt index 370052c..91d0c41 100644 --- a/failed.txt +++ b/failed.txt @@ -9,8 +9,13 @@ $ grep -r 'Tests failed' /var/lib/mock/{fc,el}*/build.log /var/lib/mock/fc27x/build.log:Tests failed : 0 /var/lib/mock/fc28i/build.log:Tests failed : 0 /var/lib/mock/fc28x/build.log:Tests failed : 0 +/var/lib/mock/fc29i/build.log:Tests failed : 2 +/var/lib/mock/fc29x/build.log:Tests failed : 0 +fc29i + 5 zend_dval_to_lval preserves low bits (32 bit long) [Zend/tests/dval_to_lval_32.phpt] + 5 testing integer underflow (32bit) [Zend/tests/int_underflow_32bit.phpt] 1 proc_open give erratic test results :( diff --git a/php73.spec b/php73.spec index 60d9ce5..6e7c3bb 100644 --- a/php73.spec +++ b/php73.spec @@ -117,7 +117,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 1%{?dist} +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -1284,9 +1284,9 @@ touch configure.ac %if %{with_debug} LDFLAGS="-fsanitize=address" export LDFLAGS -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign -fsanitize=address -ggdb" +CFLAGS=$(echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign -fsanitize=address -ggdb | sed 's/-mstackrealign//') %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign" +CFLAGS=$(echo $RPM_OPT_FLAGS -fno-strict-aliasing -Wno-pointer-sign | sed 's/-mstackrealign//') %endif export CFLAGS @@ -2172,6 +2172,9 @@ fi %changelog +* Wed Aug 22 2018 Remi Collet - 7.3.0~beta2-2 +- drop -mstackrealign option, workaround to #1593144 + * Tue Aug 21 2018 Remi Collet - 7.3.0~beta2-1 - update to 7.3.0beta2 - bump API numbers -- cgit