diff options
| author | Peter Seiderer <ps.report@gmx.net> | 2020-03-09 15:50:38 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2020-03-22 22:31:54 +0100 |
| commit | 16e0bf6b9f9f681df8619c12e9504dc00fc28410 (patch) | |
| tree | abebc78fe1b48b8bc66d4f11f03c85b10750331f /package/php | |
| parent | 3817f0e87b96add0d0c63932dce0f0dd395849cb (diff) | |
| download | buildroot-16e0bf6b9f9f681df8619c12e9504dc00fc28410.tar.bz2 | |
package/php: fix aarch64 uclibc-ng compile
The aarch64 compile uses the sys/auxv.h header which is not
provided by ulcibc-ng. Add configure.ac patch to check for
the header before using it in ext/standard/crc32.c.
Fixes:
https://bugs.busybox.net/show_bug.cgi?id=12626
build/php-7.4.3/ext/standard/crc32.c:26:12: schwerwiegender Fehler: sys/auxv.h: Datei oder Verzeichnis nicht gefunden
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/php')
| -rw-r--r-- | package/php/0005-Check-for-sys-auxv.h-before-using-it.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch b/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch new file mode 100644 index 0000000000..559c64db8a --- /dev/null +++ b/package/php/0005-Check-for-sys-auxv.h-before-using-it.patch @@ -0,0 +1,60 @@ +From f150702d5ab72878d45b722b6d7d4194db92c44a Mon Sep 17 00:00:00 2001 +From: Peter Seiderer <ps.report@gmx.net> +Date: Mon, 9 Mar 2020 15:36:48 +0100 +Subject: [PATCH] Check for sys/auxv.h before using it. + +Fixes aarch64 compile wiht uclibc-ng (does not provide +sys/auxv.h header file). + +Signed-off-by: Peter Seiderer <ps.report@gmx.net> +Upstream: https://github.com/php/php-src/commit/f73528f0e0d59ac744ccb4a94a3a9d7b9f0fba1b +--- + configure.ac | 1 + + ext/standard/crc32.c | 9 +++++++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5219a5f2..caf62302 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -440,6 +440,7 @@ resolv.h \ + strings.h \ + syslog.h \ + sysexits.h \ ++sys/auxv.h \ + sys/ioctl.h \ + sys/file.h \ + sys/mman.h \ +diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c +index c3ca5903..e59ab45f 100644 +--- a/ext/standard/crc32.c ++++ b/ext/standard/crc32.c +@@ -17,10 +17,15 @@ + */ + + #include "php.h" ++#ifdef PHP_WIN32 ++#include "config.w32.h" ++#else ++#include <php_config.h> ++#endif + #include "basic_functions.h" + #include "crc32.h" + +-#if defined(__aarch64__) ++#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) + # include <arm_acle.h> + # if defined(__linux__) + # include <sys/auxv.h> +@@ -85,7 +90,7 @@ PHP_NAMED_FUNCTION(php_if_crc32) + + crc = crcinit^0xFFFFFFFF; + +-#if defined(__aarch64__) ++#if defined(__aarch64__) && defined(HAVE_SYS_AUXV_H) + if (has_crc32_insn()) { + crc = crc32_aarch64(crc, p, nr); + RETURN_LONG(crc^0xFFFFFFFF); +-- +2.25.1 + |