diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2020-04-25 17:32:17 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2020-04-25 17:34:15 +0300 |
| commit | beece7d04e4b34a25c5a76da6e8d8ba91a680f09 (patch) | |
| tree | d7d42954c48549813c5f654dd09f64e8ade7cea4 /community/php7-pecl-yaml/32bit.patch | |
| parent | c290ece8c5d488bd50bc55c904dcb9e1fe0827d4 (diff) | |
| download | aports-beece7d04e4b34a25c5a76da6e8d8ba91a680f09.tar.bz2 aports-beece7d04e4b34a25c5a76da6e8d8ba91a680f09.tar.xz | |
community/php7-pecl-yaml: improve 32-bit fix from upstream
Diffstat (limited to 'community/php7-pecl-yaml/32bit.patch')
| -rw-r--r-- | community/php7-pecl-yaml/32bit.patch | 57 |
1 files changed, 47 insertions, 10 deletions
diff --git a/community/php7-pecl-yaml/32bit.patch b/community/php7-pecl-yaml/32bit.patch index 5d03ee9822..96eb111f15 100644 --- a/community/php7-pecl-yaml/32bit.patch +++ b/community/php7-pecl-yaml/32bit.patch @@ -1,13 +1,50 @@ +commit eb11e4e425d3d6e703c824fb891b1b0701d683ef +Author: Remi Collet <remi@remirepo.net> +Date: Thu Apr 23 08:16:30 2020 +0200 + + fix [-Wformat=] issue on 32-bit + +diff --git a/emit.c b/emit.c +index 0fd2ebc..234a64e 100644 +--- a/emit.c ++++ b/emit.c +@@ -506,9 +506,9 @@ static int y_write_array( + recursive_idx = y_search_recursive(state, (zend_ulong) ht); + if (-1 != recursive_idx) { + /* create anchor to refer to this structure */ +- anchor_size = snprintf(anchor, 0, "refid%ld", recursive_idx + 1); ++ anchor_size = snprintf(anchor, 0, "refid" ZEND_LONG_FMT, recursive_idx + 1); + anchor = (char*) emalloc(anchor_size + 1); +- snprintf(anchor, anchor_size + 1, "refid%ld", recursive_idx + 1); ++ snprintf(anchor, anchor_size + 1, "refid" ZEND_LONG_FMT, recursive_idx + 1); + + #if PHP_VERSION_ID >= 70300 + if (!(GC_FLAGS(ht) & GC_IMMUTABLE) && GC_IS_RECURSIVE(ht)) { + +commit a5a7f14f37c1d530e8e9868945f4c08af26ba8a9 +Author: Remi Collet <remi@remirepo.net> +Date: Thu Apr 23 08:16:55 2020 +0200 + + relax test on 32-bit (overflow to float) + diff --git a/tests/bug_79494.phpt b/tests/bug_79494.phpt -index f4f8b48..ec630a5 100644 +index d388bd8..f4f8b48 100644 --- a/tests/bug_79494.phpt +++ b/tests/bug_79494.phpt -@@ -1,7 +1,7 @@ - --TEST-- - Test PECL bug #74949 - --SKIPIF-- --<?php if(!extension_loaded('yaml')) die('skip yaml n/a'); ?> -+<?php if(!extension_loaded('yaml') || PHP_INT_SIZE==4) die('skip yaml n/a'); ?> - --FILE-- - <?php - $data = array ( +@@ -22,13 +22,13 @@ $data = array ( + + print yaml_emit($data); + ?> +---EXPECT-- ++--EXPECTF-- + --- + audio: + audioEnabled: +- - 132317787432502136 ++ - 13231778%s + - 0 + eveampGain: +- - 132316833510704299 ++ - 13231683%s + - 0.250000 + ... |