Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

php7-pecl-http: fix build for big endian (fixes #3691)

Browse source 
While at, improve pre-seeded dependency detection.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
This commit is contained in:
Michael Heimpold 2016-12-23 22:57:28 +01:00
parent 96d5c779b2
commit 333957fba9
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/php7-pecl-http/Makefile
View file

@ -32,8 +32,8 @@ include $(INCLUDE_DIR)/nls.mk
include ../php7/pecl.mk include ../php7/pecl.mk
CONFIGURE_VARS+= \ CONFIGURE_VARS+= \
PHP_PROPRO=yes \ PECL_cv_HAVE_EXT_propro=yes \
PHP_RAPHF=yes \ PECL_cv_HAVE_EXT_raphf=yes \
PECL_cv_HAVE_LIBCURL_ARES=no \ PECL_cv_HAVE_LIBCURL_ARES=no \
PECL_cv_HAVE_LIBCURL_OpenSSL=$(if $(CONFIG_LIBCURL_OPENSSL),yes,no) \ PECL_cv_HAVE_LIBCURL_OpenSSL=$(if $(CONFIG_LIBCURL_OPENSSL),yes,no) \
PECL_cv_HAVE_LIBCURL_GnuTLS=$(if $(CONFIG_LIBCURL_GNUTLS),yes,no) \ PECL_cv_HAVE_LIBCURL_GnuTLS=$(if $(CONFIG_LIBCURL_GNUTLS),yes,no) \

11
lang/php7-pecl-http/patches/100_php_http_etag_bigendian_check.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/src/php_http_etag.c 2016-12-12 10:04:21.000000000 +0100
+++ b/src/php_http_etag.c 2016-12-23 21:10:59.523222367 +0100
@@ -60,7 +60,7 @@
unsigned char buf[4];
*((uint *) e->ctx) = ~*((uint *) e->ctx);
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
etag = php_http_etag_digest((unsigned char *) e->ctx, 4);
#else
buf[0] = ((unsigned char *) e->ctx)[3];

3
lang/php7/pecl.mk
View file

@ -16,6 +16,9 @@ define Build/Prepare
( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 ) ( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/usr/bin/phpize7 )
endef endef
CONFIGURE_VARS+= \
ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-php-config=$(STAGING_DIR)/usr/bin/php7-config --with-php-config=$(STAGING_DIR)/usr/bin/php7-config