mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

php: upgrade 8.4.5 -> 8.4.6

Browse Source 
0003-iconv-fix-detection.patch
refreshed for 8.4.6

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Wang Mingyu
2025-04-16 17:01:59 +08:00
committed by Khem Raj
parent 095215ec8e
commit 250084b15e
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/php/php/0003-iconv-fix-detection.patch
+4 -7
View File
@@ -1,7 +1,7 @@
From 35ac74fce1a60025f8d126783b8aa7014eefdf53 Mon Sep 17 00:00:00 2001 From d9fc6b314cefe010a0deb6e591719cfb0ff226a5 Mon Sep 17 00:00:00 2001
From: Claude Bing <cbing@cybernetics.com> From: Claude Bing <cbing@cybernetics.com>
Date: Tue, 9 Nov 2021 13:10:33 -0500 Date: Tue, 9 Nov 2021 13:10:33 -0500
Subject: [PATCH 3/5] iconv: fix detection Subject: [PATCH] iconv: fix detection
Upstream-Status: Pending Upstream-Status: Pending
@@ -20,10 +20,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build/php.m4 b/build/php.m4 diff --git a/build/php.m4 b/build/php.m4
index e45b22b76..1bd3ccceb 100644 index d8a5cbf0..aee21924 100644
--- a/build/php.m4 --- a/build/php.m4
+++ b/build/php.m4 +++ b/build/php.m4
@@ -1820,7 +1820,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ @@ -1829,7 +1829,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
[Define to 1 if you have the 'libiconv' function.]) [Define to 1 if you have the 'libiconv' function.])
dnl Check libc first if no path is provided in --with-iconv. dnl Check libc first if no path is provided in --with-iconv.
@@ -33,6 +33,3 @@ index e45b22b76..1bd3ccceb 100644
dnl Reset LIBS temporarily as it may have already been included -liconv in. dnl Reset LIBS temporarily as it may have already been included -liconv in.
LIBS_save=$LIBS LIBS_save=$LIBS
LIBS= LIBS=
--
2.25.1
meta-oe/recipes-devtools/php/php_8.4.5.bb → meta-oe/recipes-devtools/php/php_8.4.6.bb
+1 -1
View File
@@ -29,7 +29,7 @@ SRC_URI:append:class-target = " \
S = "${WORKDIR}/php-${PV}" S = "${WORKDIR}/php-${PV}"
SRC_URI[sha256sum] = "9378c78887d0cd7462fc5c17f2de30c852f20f79d28795e2573fe3250d39436e" SRC_URI[sha256sum] = "9cf2734509b603f6589617ab52a9712a03e0fe059951cddd2d4623df4bf7c6c6"
CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_GROUPS += "CVE_STATUS_PHP"
CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored."