diff options
| -rw-r--r--[-rwxr-xr-x] | meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch | 27 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/php/php_7.4.9.bb (renamed from meta-oe/recipes-devtools/php/php_7.4.4.bb) | 5 |
2 files changed, 17 insertions, 15 deletions
diff --git a/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch b/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch index 21050f7605..a4804d1849 100755..100644 --- a/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch +++ b/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch | |||
| @@ -1,31 +1,32 @@ | |||
| 1 | php: remove host specific info from header file | 1 | From 1234a8ef7c5ab88e24bc5908f0ccfd55af21aa39 Mon Sep 17 00:00:00 2001 |
| 2 | From: Leon Anavi <leon.anavi@konsulko.com> | ||
| 3 | Date: Mon, 31 Aug 2020 16:03:27 +0300 | ||
| 4 | Subject: [PATCH] php: remove host specific info from header file | ||
| 2 | 5 | ||
| 6 | Based on: | ||
| 3 | https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/ | 7 | https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/ |
| 4 | 0036-php-5.4.9-fixheader.patch | 8 | 0036-php-5.4.9-fixheader.patch |
| 5 | 9 | ||
| 6 | Upstream-Status: Inappropriate [not author] | 10 | Upstream-Status: Inappropriate [not author] |
| 7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | 11 | Signed-off-by: Joe Slater <joe.slater@windriver.com> |
| 8 | 12 | Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> | |
| 9 | --- | ||
| 10 | From: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org> | ||
| 11 | Date: Sat, 2 May 2015 10:26:56 +0200 | ||
| 12 | Subject: php-5.4.9-fixheader | ||
| 13 | |||
| 14 | Make generated php_config.h constant across rebuilds. | ||
| 15 | --- | 13 | --- |
| 16 | configure.ac | 2 +- | 14 | configure.ac | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | 16 | ||
| 19 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
| 20 | index 433d7e6..41893d7 100644 | 18 | index 2a474ba36d..6d22a21630 100644 |
| 21 | --- a/configure.ac | 19 | --- a/configure.ac |
| 22 | +++ b/configure.ac | 20 | +++ b/configure.ac |
| 23 | @@ -1357,7 +1357,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` | 21 | @@ -1323,7 +1323,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` |
| 24 | fi | 22 | fi |
| 25 | AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) | 23 | AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) |
| 26 | 24 | ||
| 27 | -PHP_UNAME=`uname -a | xargs` | 25 | -UNAME=`uname -a | xargs` |
| 28 | +PHP_UNAME=`uname | xargs` | 26 | +UNAME=`uname | xargs` |
| 27 | PHP_UNAME=${PHP_UNAME:-$UNAME} | ||
| 29 | AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) | 28 | AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) |
| 30 | PHP_OS=`uname | xargs` | 29 | PHP_OS=`uname | xargs` |
| 31 | AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) | 30 | -- |
| 31 | 2.17.1 | ||
| 32 | |||
diff --git a/meta-oe/recipes-devtools/php/php_7.4.4.bb b/meta-oe/recipes-devtools/php/php_7.4.9.bb index f74533c1d0..abd8b16723 100644 --- a/meta-oe/recipes-devtools/php/php_7.4.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.4.9.bb | |||
| @@ -31,9 +31,10 @@ SRC_URI_append_class-target = " \ | |||
| 31 | file://0001-opcache-config.m4-enable-opcache.patch \ | 31 | file://0001-opcache-config.m4-enable-opcache.patch \ |
| 32 | file://xfail_two_bug_tests.patch \ | 32 | file://xfail_two_bug_tests.patch \ |
| 33 | " | 33 | " |
| 34 | |||
| 34 | S = "${WORKDIR}/php-${PV}" | 35 | S = "${WORKDIR}/php-${PV}" |
| 35 | SRC_URI[md5sum] = "262c258a3b8b5699fcca89a64e58758c" | 36 | SRC_URI[md5sum] = "e68a66c54b080d108831f6dc2e1e403d" |
| 36 | SRC_URI[sha256sum] = "308e8f4182ec8a2767b0b1b8e1e7c69fb149b37cfb98ee4a37475e082fa9829f" | 37 | SRC_URI[sha256sum] = "2e270958a4216480da7886743438ccc92b6acf32ea96fefda88d07e0a5095deb" |
| 37 | 38 | ||
| 38 | inherit autotools pkgconfig python3native gettext | 39 | inherit autotools pkgconfig python3native gettext |
| 39 | 40 | ||
