diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2021-09-29 10:58:23 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2021-10-11 17:32:48 +0200 |
| commit | b8f8a434e2415b7a5239bfef720f9e9566f863fd (patch) | |
| tree | a5c76ed6fb26b560062196a974d8d9f40a50ba59 | |
| parent | 18bea4005fc0a1c7a44dbf10a51f336ecece3ea2 (diff) | |
php: update to 7.4.24
| -rw-r--r-- | package/php/Makefile | 7 | ||||
| -rw-r--r-- | package/php/patches/patch-ext_standard_crc32_c | 38 |
2 files changed, 43 insertions, 2 deletions
diff --git a/package/php/Makefile b/package/php/Makefile index 0af345f4c..c7b7818d4 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,11 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 7.4.11 +PKG_VERSION:= 7.4.24 PKG_RELEASE:= 1 -PKG_HASH:= 5d31675a9b9c21b5bd03389418218c30b26558246870caba8eb54f5856e2d6ce +PKG_HASH:= ff7658ee2f6d8af05b48c21146af5f502e121def4e76e862df5ec9fa06e98734 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang +PKG_BUILDDEP:= libpng +PKG_DEPENDS:= libpng PKG_NEEDS:= threads PHP_URL:= http://www.php.net/ PKG_SITES:= http://de2.php.net/distributions/ @@ -146,6 +148,7 @@ PKG_CONFIGURE_OPTS+= --without-ldap endif ifneq ($(ADK_PACKAGE_PHP_MOD_MARIADB),) PKG_CONFIGURE_OPTS+= --with-pdo-mysql=shared,"$(STAGING_TARGET_DIR)/usr" +TARGET_CFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/mysql else PKG_CONFIGURE_OPTS+= --without-pdo-mysql endif diff --git a/package/php/patches/patch-ext_standard_crc32_c b/package/php/patches/patch-ext_standard_crc32_c new file mode 100644 index 000000000..c04b5b80c --- /dev/null +++ b/package/php/patches/patch-ext_standard_crc32_c @@ -0,0 +1,38 @@ +--- php-7.4.24.orig/ext/standard/crc32.c 2021-09-21 13:23:20.000000000 +0200 ++++ php-7.4.24/ext/standard/crc32.c 2021-09-29 10:27:37.144637295 +0200 +@@ -23,7 +23,6 @@ + #if HAVE_AARCH64_CRC32 + # include <arm_acle.h> + # if defined(__linux__) +-# include <sys/auxv.h> + # include <asm/hwcap.h> + # endif + +@@ -32,13 +31,6 @@ static inline int has_crc32_insn() { + static int res = -1; + if (res != -1) + return res; +-# if defined(HWCAP_CRC32) +- res = getauxval(AT_HWCAP) & HWCAP_CRC32; +- return res; +-# elif defined(HWCAP2_CRC32) +- res = getauxval(AT_HWCAP2) & HWCAP2_CRC32; +- return res; +-# else + res = 0; + return res; + # endif +@@ -85,13 +77,6 @@ PHP_NAMED_FUNCTION(php_if_crc32) + + crc = crcinit^0xFFFFFFFF; + +-#if HAVE_AARCH64_CRC32 +- if (has_crc32_insn()) { +- crc = crc32_aarch64(crc, p, nr); +- RETURN_LONG(crc^0xFFFFFFFF); +- } +-#endif +- + for (; nr--; ++p) { + crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ]; + } |