diff options
author | Slater, Joseph <joe.slater@windriver.com> | 2019-07-18 13:26:53 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-07-21 09:31:09 -0700 |
commit | cfcbbdc48b44fa00f2a1b15ed2f0dc81b8632637 (patch) | |
tree | c7d9ed84c5f9c0f5fb2475c6e4e3ccb66956ec3d | |
parent | 2fe3b668233bbea187f3b75002baf540726e2683 (diff) | |
download | meta-openembedded-cfcbbdc48b44fa00f2a1b15ed2f0dc81b8632637.tar.gz |
php: remove host specific info from header file
Import patch from Debian.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rwxr-xr-x | meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php_7.3.7.bb | 1 |
2 files changed, 32 insertions, 0 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 new file mode 100755 index 000000000..21050f760 --- /dev/null +++ b/meta-oe/recipes-devtools/php/php/debian-php-fixheader.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | php: remove host specific info from header file | ||
2 | |||
3 | https://sources.debian.org/data/main/p/php7.3/7.3.6-1/debian/patches/ | ||
4 | 0036-php-5.4.9-fixheader.patch | ||
5 | |||
6 | Upstream-Status: Inappropriate [not author] | ||
7 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
8 | |||
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 | --- | ||
16 | configure.ac | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index 433d7e6..41893d7 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -1357,7 +1357,7 @@ PHP_BUILD_DATE=`date -u +%Y-%m-%d` | ||
24 | fi | ||
25 | AC_DEFINE_UNQUOTED(PHP_BUILD_DATE,"$PHP_BUILD_DATE",[PHP build date]) | ||
26 | |||
27 | -PHP_UNAME=`uname -a | xargs` | ||
28 | +PHP_UNAME=`uname | xargs` | ||
29 | AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) | ||
30 | PHP_OS=`uname | xargs` | ||
31 | AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) | ||
diff --git a/meta-oe/recipes-devtools/php/php_7.3.7.bb b/meta-oe/recipes-devtools/php/php_7.3.7.bb index 1028cf16a..72e4c26ba 100644 --- a/meta-oe/recipes-devtools/php/php_7.3.7.bb +++ b/meta-oe/recipes-devtools/php/php_7.3.7.bb | |||
@@ -6,6 +6,7 @@ SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \ | |||
6 | file://0048-Use-pkg-config-for-FreeType2-detection.patch \ | 6 | file://0048-Use-pkg-config-for-FreeType2-detection.patch \ |
7 | file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ | 7 | file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \ |
8 | file://0001-Use-pkg-config-for-libxml2-detection.patch \ | 8 | file://0001-Use-pkg-config-for-libxml2-detection.patch \ |
9 | file://debian-php-fixheader.patch \ | ||
9 | " | 10 | " |
10 | SRC_URI_append_class-target = " \ | 11 | SRC_URI_append_class-target = " \ |
11 | file://pear-makefile.patch \ | 12 | file://pear-makefile.patch \ |