diff options
author | changqing.li@windriver.com <changqing.li@windriver.com> | 2018-06-29 14:22:13 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-06-29 07:00:52 -0700 |
commit | 188097b4e9f458b3c2268ba10ac28d0938b4fd2e (patch) | |
tree | 08f82f51f87e240874e66cc2cdd898b2bcb23837 /meta-oe | |
parent | 661375ee6d6eb64b01ab1f7891b8bc6fc4fac736 (diff) | |
download | meta-openembedded-188097b4e9f458b3c2268ba10ac28d0938b4fd2e.tar.gz |
php: upgrade 7.2.4 -> 7.2.7
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/iconv.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/pear-makefile.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php/php_exec_native.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/php/php_7.2.7.bb (renamed from meta-oe/recipes-devtools/php/php_7.2.4.bb) | 5 |
8 files changed, 9 insertions, 10 deletions
diff --git a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch index 51a5e43b6..e7d326d7e 100644 --- a/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch +++ b/meta-oe/recipes-devtools/php/php/0001-acinclude-use-pkgconfig-for-libxml2-config.patch | |||
@@ -4,7 +4,7 @@ Date: Tue, 17 Jun 2014 09:53:00 +0200 | |||
4 | Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config | 4 | Subject: [PATCH 3/8] acinclude: use pkgconfig for libxml2 config |
5 | 5 | ||
6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> | 6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> |
7 | Upstream-Status: pending | 7 | Upstream-Status: Pending |
8 | --- | 8 | --- |
9 | acinclude.m4 | 63 ++++++++++++++++++++++-------------------------------------- | 9 | acinclude.m4 | 63 ++++++++++++++++++++++-------------------------------------- |
10 | 1 file changed, 23 insertions(+), 40 deletions(-) | 10 | 1 file changed, 23 insertions(+), 40 deletions(-) |
diff --git a/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch b/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch index 30811a74b..d0831669f 100644 --- a/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch +++ b/meta-oe/recipes-devtools/php/php/acinclude-xml2-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | Upstream-status: Unknown | 1 | Upstream-Status: Pending |
2 | 2 | ||
3 | diff --git a/acinclude.m4 b/acinclude.m4 | 3 | diff --git a/acinclude.m4 b/acinclude.m4 |
4 | index 4fd452e..206fcbf 100644 | 4 | index 4fd452e..206fcbf 100644 |
diff --git a/meta-oe/recipes-devtools/php/php/iconv.patch b/meta-oe/recipes-devtools/php/php/iconv.patch index b6e3ceb0b..ecf7d8720 100644 --- a/meta-oe/recipes-devtools/php/php/iconv.patch +++ b/meta-oe/recipes-devtools/php/php/iconv.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001 | 1 | From 17cc5645f3acf943a5a06465d09d0ebcfea987bd Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 | 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
4 | Subject: [PATCH] Upstream-status: Unknown | 4 | Subject: [PATCH] Upstream-Status: Pending |
5 | 5 | ||
6 | --- | 6 | --- |
7 | acinclude.m4 | 3 ++- | 7 | acinclude.m4 | 3 ++- |
diff --git a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch index b5fb7d4fd..16359af9f 100644 --- a/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch +++ b/meta-oe/recipes-devtools/php/php/imap-fix-autofoo.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 | 1 | From c084c8349d1780980e232cb28b60a109e3d89438 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 | 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
4 | Subject: [PATCH] Upstream-status: Unknown | 4 | Subject: [PATCH] Upstream-Status: Pending |
5 | 5 | ||
6 | --- | 6 | --- |
7 | acinclude.m4 | 2 +- | 7 | acinclude.m4 | 2 +- |
diff --git a/meta-oe/recipes-devtools/php/php/pear-makefile.patch b/meta-oe/recipes-devtools/php/php/pear-makefile.patch index 4bc102526..fcbf25be9 100644 --- a/meta-oe/recipes-devtools/php/php/pear-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/pear-makefile.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 | 1 | From edd575a546d56bb5683aff19782b16963d61fd0b Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 | 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
4 | Subject: [PATCH] Upstream-status: Unknown | 4 | Subject: [PATCH] Upstream-Status: Pending |
5 | 5 | ||
6 | --- | 6 | --- |
7 | pear/Makefile.frag | 2 +- | 7 | pear/Makefile.frag | 2 +- |
diff --git a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch index cff6426ab..997430309 100644 --- a/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch +++ b/meta-oe/recipes-devtools/php/php/php5-pear-makefile.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001 | 1 | From 79725e82d5981fc94eb657f0f46a499dbfc1cc40 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 | 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
4 | Subject: [PATCH] Upstream-status: Unknown | 4 | Subject: [PATCH] Upstream-Status: Pending |
5 | 5 | ||
6 | %% original patch: php5-pear-makefile.patch | 6 | %% original patch: php5-pear-makefile.patch |
7 | --- | 7 | --- |
diff --git a/meta-oe/recipes-devtools/php/php/php_exec_native.patch b/meta-oe/recipes-devtools/php/php/php_exec_native.patch index 6af0dc81a..80409000d 100644 --- a/meta-oe/recipes-devtools/php/php/php_exec_native.patch +++ b/meta-oe/recipes-devtools/php/php/php_exec_native.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 00:00:00 2001 | 1 | From d251b5aa3d23803d016ca16818e2e1d2f2b70a02 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 | 3 | Date: Wed, 2 Nov 2011 16:54:57 +0100 |
4 | Subject: [PATCH] Upstream-status: Inappriate | 4 | Subject: [PATCH] Upstream-Status: Inappriate |
5 | 5 | ||
6 | --- | 6 | --- |
7 | sapi/cli/config.m4 | 2 +- | 7 | sapi/cli/config.m4 | 2 +- |
diff --git a/meta-oe/recipes-devtools/php/php_7.2.4.bb b/meta-oe/recipes-devtools/php/php_7.2.7.bb index 2fd1e66c7..a256cd750 100644 --- a/meta-oe/recipes-devtools/php/php_7.2.4.bb +++ b/meta-oe/recipes-devtools/php/php_7.2.7.bb | |||
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=67e369bc8d1f2e641236b8002039a6a2" | |||
4 | 4 | ||
5 | SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ | 5 | SRC_URI += "file://change-AC_TRY_RUN-to-AC_TRY_LINK.patch \ |
6 | file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ | 6 | file://0001-acinclude.m4-skip-binconfig-check-for-libxml.patch \ |
7 | file://0001-main-php_ini.c-build-empty-php_load_zend_extension_c.patch \ | ||
8 | file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ | 7 | file://0001-fix-error-caused-by-a-new-variable-is-declared-after.patch \ |
9 | " | 8 | " |
10 | SRC_URI_append_class-target = " \ | 9 | SRC_URI_append_class-target = " \ |
@@ -13,8 +12,8 @@ SRC_URI_append_class-target = " \ | |||
13 | file://0001-opcache-config.m4-enable-opcache.patch \ | 12 | file://0001-opcache-config.m4-enable-opcache.patch \ |
14 | " | 13 | " |
15 | 14 | ||
16 | SRC_URI[md5sum] = "864c64ffd2f1686b035ef8ce6a6d8478" | 15 | SRC_URI[md5sum] = "4b5698c8c6c2b9cbff3a5706da67bb0f" |
17 | SRC_URI[sha256sum] = "11658a0d764dc94023b9fb60d4b5eb75d438ad17981efe70abb0d0d09a447ef3" | 16 | SRC_URI[sha256sum] = "cc81675a96af4dd18d8ffc02f26a36c622abadf86af7ecfea7bcde8d3c96d5a3" |
18 | 17 | ||
19 | PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ | 18 | PACKAGECONFIG[mysql] = "--with-mysqli=${STAGING_BINDIR_CROSS}/mysql_config \ |
20 | --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ | 19 | --with-pdo-mysql=${STAGING_BINDIR_CROSS}/mysql_config \ |