Add an upstream patch:

http://git.php.net/?p=php-src.git;a=commit;h=72ec23d8233ac9a2071f991752cff55febb167d5

This eliminate a warning while building with clang on 32-bit system and enable
other programs' configure scripts test PHP feature with `-Werror`

Approved by:	tz (maintainer)
This commit is contained in:
Li-Wen Hsu 2017-12-17 10:19:10 +00:00
parent 7d7e2a54d7
commit 86d4a95570
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=456526
9 changed files with 69 additions and 3 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= php70
PORTVERSION= 7.0.26
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.c.orig 2017-12-13 20:20:30 UTC
+++ Zend/zend_hash.c
@@ -1573,7 +1573,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_ap
}
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
{
uint32_t idx;
Bucket *p;

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.h.orig 2017-12-13 20:20:24 UTC
+++ Zend/zend_hash.h
@@ -131,7 +131,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_gr
ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht);
ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func);
ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *);
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
/* This function should be used with special care (in other words,
* it should usually not be used). When used with the ZEND_HASH_APPLY_STOP

View file

@ -3,7 +3,7 @@
PORTNAME= php71
PORTVERSION= 7.1.12
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${PORTVERSION}

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.c.orig 2017-12-13 20:22:03 UTC
+++ Zend/zend_hash.c
@@ -1544,7 +1544,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_ap
}
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
{
uint32_t idx;
Bucket *p;

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.h.orig 2017-12-13 20:15:42 UTC
+++ Zend/zend_hash.h
@@ -138,7 +138,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_gr
ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht);
ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func);
ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *);
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
/* This function should be used with special care (in other words,
* it should usually not be used). When used with the ZEND_HASH_APPLY_STOP

View file

@ -2,7 +2,7 @@
PORTNAME= php72
DISTVERSION= 7.2.0
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= lang devel www
MASTER_SITES= PHP/distributions
DISTNAME= php-${DISTVERSION}

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.c.orig 2017-12-13 20:23:18 UTC
+++ Zend/zend_hash.c
@@ -1543,7 +1543,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_ap
}
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int num_args, ...)
{
uint32_t idx;
Bucket *p;

View file

@ -0,0 +1,11 @@
--- Zend/zend_hash.h.orig 2017-12-13 20:16:12 UTC
+++ Zend/zend_hash.h
@@ -145,7 +145,7 @@ ZEND_API void ZEND_FASTCALL zend_hash_gr
ZEND_API void ZEND_FASTCALL zend_hash_graceful_reverse_destroy(HashTable *ht);
ZEND_API void ZEND_FASTCALL zend_hash_apply(HashTable *ht, apply_func_t apply_func);
ZEND_API void ZEND_FASTCALL zend_hash_apply_with_argument(HashTable *ht, apply_func_arg_t apply_func, void *);
-ZEND_API void ZEND_FASTCALL zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
+ZEND_API void zend_hash_apply_with_arguments(HashTable *ht, apply_func_args_t apply_func, int, ...);
/* This function should be used with special care (in other words,
* it should usually not be used). When used with the ZEND_HASH_APPLY_STOP