diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch
new file mode 100644
index 0000000..daf90ad
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch
@@ -0,0 +1,67 @@
+From a3eba0fcee5e96ef47a6d3fac7196a1074f0dc17 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@stusta.de>
+Date: Wed, 30 Oct 2019 11:07:23 +0200
+Subject: Avoid use of "mips" which is reserved on mips
+
+Upstream-Status: Submitted [https://github.com/brasko/gdbwire/pull/9]
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+
+diff --git a/src/gdbwire_mi_parser.c b/src/gdbwire_mi_parser.c
+index 3f6b563..24aa0cf 100644
+--- a/lib/tgdb/gdbwire.c
++++ b/lib/tgdb/gdbwire.c
+@@ -40,7 +40,7 @@ struct gdbwire_mi_parser {
+     /* The GDB/MI lexer state */
+     yyscan_t mils;
+     /* The GDB/MI push parser state */
+-    gdbwire_mi_pstate *mips;
++    gdbwire_mi_pstate *mipst;
+     /* The client parser callbacks */
+     struct gdbwire_mi_parser_callbacks callbacks;
+ };
+@@ -71,8 +71,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
+     }
+ 
+     /* Create a new push parser state instance */
+-    parser->mips = gdbwire_mi_pstate_new();
+-    if (!parser->mips) {
++    parser->mipst = gdbwire_mi_pstate_new();
++    if (!parser->mipst) {
+         gdbwire_mi_lex_destroy(parser->mils);
+         gdbwire_string_destroy(parser->buffer);
+         free(parser);
+@@ -81,7 +81,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
+ 
+     /* Ensure that the callbacks are non null */
+     if (!callbacks.gdbwire_mi_output_callback) {
+-        gdbwire_mi_pstate_delete(parser->mips);
++        gdbwire_mi_pstate_delete(parser->mipst);
+         gdbwire_mi_lex_destroy(parser->mils);
+         gdbwire_string_destroy(parser->buffer);
+         free(parser);
+@@ -109,9 +109,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser)
+         }
+ 
+         /* Free the push parser instance */
+-        if (parser->mips) {
+-            gdbwire_mi_pstate_delete(parser->mips);
+-            parser->mips = NULL;
++        if (parser->mipst) {
++            gdbwire_mi_pstate_delete(parser->mipst);
++            parser->mipst = NULL;
+         }
+ 
+         free(parser);
+@@ -162,7 +162,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser,
+         pattern = gdbwire_mi_lex(parser->mils);
+         if (pattern == 0)
+             break;
+-        mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL,
++        mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL,
+             parser->mils, &output);
+     } while (mi_status == YYPUSH_MORE);
+ 
+-- 
+2.20.1
+
diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch
deleted file mode 100644
index 4358629..0000000
--- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb/remove-help2man.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable building manpages so that make install doesn't fail due to lack of help2man
-
-Upstream-Status: Inappropriate [config]
-
-Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
----
- configure.ac    | 3 ---
- doc/Makefile.am | 5 -----
- 2 files changed, 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee7eca0..1f0d924 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,9 +134,6 @@ dnl check that the required tools are available to generate documentation
- if test "$HAS_MAKEINFO" != "yes" ; then
- 	AC_MSG_ERROR([Please install makeinfo before installing])
- fi
--if test "$HAS_HELP2MAN" != "yes" ; then
--	AC_MSG_ERROR([Please install help2man])
--fi
- 
- dnl Checking for log10 function in math - I would like to remove this
- AC_CHECK_LIB(m, log10)
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 60662f6..0ae0013 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,15 +1,10 @@
- info_TEXINFOS = cgdb.texi
- cgdb_TEXINFOS = gpl.texi
- 
--dist_man_MANS = cgdb.1
- EXTRA_DIST = cgdb.txt
- 
- dist_pkgdata_DATA = cgdb.txt
- 
--# generate the man page using help2man.
--cgdb.1:
--	help2man --output=$(top_srcdir)/doc/cgdb.1 $(top_builddir)/cgdb/cgdb$(EXEEXT)
--
- cgdb.txt: cgdb.texi $(srcdir)/version.texi $(cgdb_TEXINFOS)
- TEXTS = cgdb.txt
- text-am: $(TEXTS)
--- 
-1.9.1
-
diff --git a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb
similarity index 68%
rename from meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb
rename to meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb
index 74019fb..57e364e 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.6.8.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb
@@ -10,11 +10,12 @@
 inherit autotools
 
 SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \
-    file://remove-help2man.patch"
-SRC_URI[md5sum] = "7bd38c79bf4d794d239928fef401fca3"
-SRC_URI[sha256sum] = "be203e29be295097439ab67efe3dc8261f742c55ff3647718d67d52891f4cf41"
+           file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \
+"
+SRC_URI[md5sum] = "a104862ffd3145b076303992e9a3af26"
+SRC_URI[sha256sum] = "bb723be58ec68cb59a598b8e24a31d10ef31e0e9c277a4de07b2f457fe7de198"
 
-CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2"
+CACHED_CONFIGUREVARS = "ac_cv_file__dev_ptmx=yes ac_cv_rl_version=6.2 ac_cv_file__proc_self_status=yes"
 EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR} \
     --with-ncurses=${STAGING_LIBDIR}"
 
diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch
deleted file mode 100644
index bbebc4d..0000000
--- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen/0001-Fix-6906.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 81b213b98f51ec3eed5774f6f797c074ac35db3e Mon Sep 17 00:00:00 2001
-From: Ton van den Heuvel <tonvandenheuvel@gmail.com>
-Date: Mon, 6 May 2019 15:17:28 +0200
-Subject: [PATCH] Fix #6906
-
-Generate configvalues.h only as a dependency for the VHDL parser. Fixes
-a problem in combination with Ninja v1.9.0 because of duplicate rules
-for generating configvalues.h.
-
-Upstream-Status: Backport
-Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
----
- addon/doxyapp/CMakeLists.txt   |  8 --------
- addon/doxyparse/CMakeLists.txt |  8 --------
- src/CMakeLists.txt             |  4 ++++
- vhdlparser/CMakeLists.txt      | 12 +++---------
- 4 files changed, 7 insertions(+), 25 deletions(-)
-
-diff --git a/addon/doxyapp/CMakeLists.txt b/addon/doxyapp/CMakeLists.txt
-index a7377112..0aaf4655 100644
---- a/addon/doxyapp/CMakeLists.txt
-+++ b/addon/doxyapp/CMakeLists.txt
-@@ -1,11 +1,3 @@
--# configvalues.h
--add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h
--    DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
--    OUTPUT ${GENERATED_SRC}/configvalues.h
--)
--set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
--
- find_package(Iconv)
- 
- include_directories(
-diff --git a/addon/doxyparse/CMakeLists.txt b/addon/doxyparse/CMakeLists.txt
-index ff198fb4..1620c72e 100644
---- a/addon/doxyparse/CMakeLists.txt
-+++ b/addon/doxyparse/CMakeLists.txt
-@@ -1,11 +1,3 @@
--# configvalues.h
--add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h
--    DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
--    OUTPUT ${GENERATED_SRC}/configvalues.h
--)
--set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
--
- find_package(Iconv)
- 
- include_directories(
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 92a302ab..37a21ff6 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -43,6 +43,10 @@ add_custom_command(
-     OUTPUT ${GENERATED_SRC}/configvalues.h
- )
- set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
-+add_custom_target(
-+    generate_configvalues_header
-+    DEPENDS ${GENERATED_SRC}/configvalues.h
-+)
- 
- # configvalues.cpp
- add_custom_command(
-diff --git a/vhdlparser/CMakeLists.txt b/vhdlparser/CMakeLists.txt
-index 71e97df5..f89008c5 100644
---- a/vhdlparser/CMakeLists.txt
-+++ b/vhdlparser/CMakeLists.txt
-@@ -1,14 +1,5 @@
--# configvalues.h
--add_custom_command(
--    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/configgen.py -maph ${CMAKE_SOURCE_DIR}/src/config.xml > ${GENERATED_SRC}/configvalues.h
--    DEPENDS ${CMAKE_SOURCE_DIR}/src/config.xml ${CMAKE_SOURCE_DIR}/src/configgen.py
--    OUTPUT ${GENERATED_SRC}/configvalues.h
--)
--set_source_files_properties(${GENERATED_SRC}/configvalues.h PROPERTIES GENERATED 1)
--
- include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/qtools ${GENERATED_SRC})
- add_library(vhdlparser STATIC
--${GENERATED_SRC}/configvalues.h
- CharStream.cc
- ParseException.cc
- Token.cc
-@@ -17,3 +8,6 @@ VhdlParser.cc
- VhdlParserTokenManager.cc
- VhdlParserIF.cpp
- )
-+add_dependencies(vhdlparser
-+    generate_configvalues_header
-+)
--- 
-2.17.1
-
diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb
similarity index 71%
rename from meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb
rename to meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb
index b49fbd4..4df994c 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.15.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.8.16.bb
@@ -8,9 +8,9 @@
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \
            file://0001-build-don-t-look-for-Iconv.patch \
-           file://0001-Fix-6906.patch"
-SRC_URI[md5sum] = "2c98c73eba392d334f5bbaf15e09bae3"
-SRC_URI[sha256sum] = "bd9c0ec462b6a9b5b41ede97bede5458e0d7bb40d4cfa27f6f622eb33c59245d"
+"
+SRC_URI[md5sum] = "3ec5f8bfda38a05845161fbbd5d8b439"
+SRC_URI[sha256sum] = "ff981fb6f5db4af9deb1dd0c0d9325e0f9ba807d17bd5750636595cf16da3c82"
 
 inherit cmake python3native
 
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
deleted file mode 100644
index ed3bac3..0000000
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0003-Crypto-reduce-memory-usage-of-SignFinal.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 20282b1cb0389553421c4c5b14de198c5dfff50b Mon Sep 17 00:00:00 2001
-From: Anna Henningsen <anna@addaleax.net>
-Date: Sat, 20 Oct 2018 05:24:54 +0200
-Subject: [PATCH] src: use more explicit return type in Sign::SignFinal()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Using the non-indexed variant of `std::get<>` broke Travis CI.
-Also, this allows us to be a bit more concise when returning
-from `SignFinal()` due to some error condition.
-
-Refs: https://github.com/nodejs/node/pull/23427
-
-PR-URL: https://github.com/nodejs/node/pull/23779
-Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
-Reviewed-By: Tobias Nießen <tniessen@tnie.de>
-Reviewed-By: Refael Ackermann <refack@gmail.com>
-Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
----
- src/node_crypto.cc | 23 +++++++++++------------
- src/node_crypto.h  | 12 +++++++++++-
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/src/node_crypto.cc b/src/node_crypto.cc
-index bd8d9e032554..ec7d4f2bb5be 100644
---- a/src/node_crypto.cc
-+++ b/src/node_crypto.cc
-@@ -3562,22 +3562,20 @@ static MallocedBuffer<unsigned char> Node_SignFinal(EVPMDPointer&& mdctx,
-   return MallocedBuffer<unsigned char>();
- }
- 
--std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
-+Sign::SignResult Sign::SignFinal(
-     const char* key_pem,
-     int key_pem_len,
-     const char* passphrase,
-     int padding,
-     int salt_len) {
--  MallocedBuffer<unsigned char> buffer;
--
-   if (!mdctx_)
--    return std::make_pair(kSignNotInitialised, std::move(buffer));
-+    return SignResult(kSignNotInitialised);
- 
-   EVPMDPointer mdctx = std::move(mdctx_);
- 
-   BIOPointer bp(BIO_new_mem_buf(const_cast<char*>(key_pem), key_pem_len));
-   if (!bp)
--    return std::make_pair(kSignPrivateKey, std::move(buffer));
-+    return SignResult(kSignPrivateKey);
- 
-   EVPKeyPointer pkey(PEM_read_bio_PrivateKey(bp.get(),
-                                              nullptr,
-@@ -3588,7 +3586,7 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
-   // without `pkey` being set to nullptr;
-   // cf. the test of `test_bad_rsa_privkey.pem` for an example.
-   if (!pkey || 0 != ERR_peek_error())
--    return std::make_pair(kSignPrivateKey, std::move(buffer));
-+    return SignResult(kSignPrivateKey);
- 
- #ifdef NODE_FIPS_MODE
-   /* Validate DSA2 parameters from FIPS 186-4 */
-@@ -3612,9 +3610,10 @@ std::pair<SignBase::Error, MallocedBuffer<unsigned char>> Sign::SignFinal(
-   }
- #endif  // NODE_FIPS_MODE
- 
--  buffer = Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
-+  MallocedBuffer<unsigned char> buffer =
-+      Node_SignFinal(std::move(mdctx), pkey, padding, salt_len);
-   Error error = buffer.is_empty() ? kSignPrivateKey : kSignOk;
--  return std::make_pair(error, std::move(buffer));
-+  return SignResult(error, std::move(buffer));
- }
- 
- 
-@@ -3639,18 +3638,18 @@ void Sign::SignFinal(const FunctionCallbackInfo<Value>& args) {
- 
-   ClearErrorOnReturn clear_error_on_return;
- 
--  std::pair<Error, MallocedBuffer<unsigned char>> ret = sign->SignFinal(
-+  SignResult ret = sign->SignFinal(
-       buf,
-       buf_len,
-       len >= 2 && !args[1]->IsNull() ? *passphrase : nullptr,
-       padding,
-       salt_len);
- 
--  if (std::get<Error>(ret) != kSignOk)
--    return sign->CheckThrow(std::get<Error>(ret));
-+  if (ret.error != kSignOk)
-+    return sign->CheckThrow(ret.error);
- 
-   MallocedBuffer<unsigned char> sig =
--      std::move(std::get<MallocedBuffer<unsigned char>>(ret));
-+      std::move(ret.signature);
- 
-   Local<Object> rc =
-       Buffer::New(env, reinterpret_cast<char*>(sig.release()), sig.size)
-diff --git a/src/node_crypto.h b/src/node_crypto.h
-index 6fcf737f6c43..0c26c1f6ff1d 100644
---- a/src/node_crypto.h
-+++ b/src/node_crypto.h
-@@ -518,7 +518,17 @@ class Sign : public SignBase {
-  public:
-   static void Initialize(Environment* env, v8::Local<v8::Object> target);
- 
--  std::pair<Error, MallocedBuffer<unsigned char>> SignFinal(
-+  struct SignResult {
-+    Error error;
-+    MallocedBuffer<unsigned char> signature;
-+
-+    explicit SignResult(
-+        Error err,
-+        MallocedBuffer<unsigned char>&& sig = MallocedBuffer<unsigned char>())
-+      : error(err), signature(std::move(sig)) {}
-+  };
-+
-+  SignResult SignFinal(
-       const char* key_pem,
-       int key_pem_len,
-       const char* passphrase,
diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
rename to meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
index a978eeb..4afe341 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.16.3.bb
+++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb
@@ -17,7 +17,6 @@
 
 SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \
            file://0001-Disable-running-gyp-files-for-bundled-deps.patch \
-           file://0003-Crypto-reduce-memory-usage-of-SignFinal.patch \
            file://0004-Make-compatibility-with-gcc-4.8.patch \
            file://0005-Link-atomic-library.patch \
            file://0006-Use-target-ldflags.patch \
@@ -26,8 +25,8 @@
            file://0002-Using-native-torque.patch \
            "
 
-SRC_URI[md5sum] = "b41275a018e670947c1950b12f050a2f"
-SRC_URI[sha256sum] = "7bf1123d7415964775b8f81fe6ec6dd5c3c08abb42bb71dfe4409dbeeba26bbd"
+SRC_URI[md5sum] = "d5a56d0abf764a91f627f0690cd4b9f3"
+SRC_URI[sha256sum] = "412667d76bd5273c07cb69c215998109fd5bb35c874654f93e6a0132d666c58e"
 
 S = "${WORKDIR}/node-v${PV}"
 
@@ -52,9 +51,11 @@
 GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' "
 ARCHFLAGS ?= ""
 
-PACKAGECONFIG ??= "zlib icu"
-PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
+PACKAGECONFIG ??= "ares icu libuv zlib"
+PACKAGECONFIG[ares] = "--shared-cares,,c-ares"
 PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu"
+PACKAGECONFIG[libuv] = "--shared-libuv,,libuv"
+PACKAGECONFIG[zlib] = "--shared-zlib,,zlib"
 
 # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi
 do_configure () {
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch b/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch
deleted file mode 100644
index 2258c4c..0000000
--- a/meta-openembedded/meta-oe/recipes-devtools/php/php/0049-ext-intl-Use-pkg-config-to-detect-icu.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 03fecab78f9fa747ad8ab3484e7ca00c0148321d Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Sun, 28 Apr 2019 16:45:02 +0800
-Subject: [PATCH] From: Hugh McMaster <hugh.mcmaster@outlook.com> Date: Wed, 5
- Dec 2018 23:27:30 +1100 Subject: ext/intl: Use pkg-config to detect icu
-
-The developers of icu recommend using pkg-config to detect icu,
-because icu-config is deprecated.
-
-Upstream-Status: Pending
-
-update to version 7.3.4
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- acinclude.m4       | 95 ++++++------------------------------------------------
- ext/intl/config.m4 | 16 ++++-----
- 2 files changed, 15 insertions(+), 96 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 7d77c33..86b0ecc 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -2158,92 +2158,15 @@ dnl
- dnl Common setup macro for ICU
- dnl
- AC_DEFUN([PHP_SETUP_ICU],[
--  PHP_ARG_WITH(icu-dir,,
--  [  --with-icu-dir=DIR      Specify where ICU libraries and headers can be found], DEFAULT, no)
--
--  if test "$PHP_ICU_DIR" = "no"; then
--    PHP_ICU_DIR=DEFAULT
--  fi
--
--  AC_MSG_CHECKING([for location of ICU headers and libraries])
--  found_icu=no
--
--  dnl First try to find pkg-config
--  if test -z "$PKG_CONFIG"; then
--    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
--  fi
--
--  dnl If pkg-config is found try using it
--  if test "$PHP_ICU_DIR" = "DEFAULT" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists icu-uc icu-io icu-i18n; then
--    if $PKG_CONFIG --atleast-version=40 icu-uc; then
--      found_icu=yes
--      icu_version_full=`$PKG_CONFIG --modversion icu-uc`
--      ac_IFS=$IFS
--      IFS="."
--      set $icu_version_full
--      IFS=$ac_IFS
--      icu_version=`expr [$]1 \* 1000 + [$]2`
--      AC_MSG_RESULT([found $icu_version_full])
--
--      ICU_LIBS=`$PKG_CONFIG --libs icu-uc icu-io icu-i18n`
--      ICU_INCS=`$PKG_CONFIG --cflags-only-I icu-uc icu-io icu-i18n`
--      ICU_CXXFLAGS="-DU_USING_ICU_NAMESPACE=1"
--
--      AC_MSG_RESULT([found $ICU_VERSION])
--
--      PHP_EVAL_LIBLINE($ICU_LIBS, $1)
--      PHP_EVAL_INCLINE($ICU_INCS)
--    else
--      AC_MSG_ERROR([ICU version 4.0 or later required.])
--    fi
--  fi
--
--  dnl If pkg-config fails for some reason, revert to the old method
--  if test "$found_icu" = "no"; then
--    if test "$PHP_ICU_DIR" = "DEFAULT"; then
--      dnl Try to find icu-config
--      AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
--    else
--      ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config"
--    fi
--
--    dnl Trust icu-config to know better what the install prefix is..
--    icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
--    if test "$?" != "0" || test -z "$icu_install_prefix"; then
--      AC_MSG_RESULT([not found])
--      AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.])
--    else
--      AC_MSG_RESULT([$icu_install_prefix])
--
--      dnl Check ICU version
--      AC_MSG_CHECKING([for ICU 4.0 or greater])
--      icu_version_full=`$ICU_CONFIG --version`
--      ac_IFS=$IFS
--      IFS="."
--      set $icu_version_full
--      IFS=$ac_IFS
--      icu_version=`expr [$]1 \* 1000 + [$]2`
--      AC_MSG_RESULT([found $icu_version_full])
--
--      if test "$icu_version" -lt "4000"; then
--        AC_MSG_ERROR([ICU version 4.0 or later is required])
--      fi
--
--      ICU_VERSION=$icu_version
--      ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
--      ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
--      PHP_EVAL_INCLINE($ICU_INCS)
--      PHP_EVAL_LIBLINE($ICU_LIBS, $1)
--
--      ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags`
--      if test "$icu_version" -ge "49000"; then
--        ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
--        ICU_CFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
--      fi
--      if test "$icu_version" -ge "60000"; then
--        ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
--      fi
--    fi
-+  PKG_CHECK_MODULES([ICU], [icu-io >= 50.1])
-+  PHP_EVAL_INCLINE($ICU_CFLAGS)
-+  PHP_EVAL_LIBLINE($ICU_LIBS, $1)
-+  
-+  ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
-+  ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
-+  
-+  if $PKG_CONFIG icu-io --atleast-version=60; then
-+    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-   fi
- ])
- 
-diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
-index 4b9f469..fdae88a 100644
---- a/ext/intl/config.m4
-+++ b/ext/intl/config.m4
-@@ -9,15 +9,7 @@ if test "$PHP_INTL" != "no"; then
-   PHP_SETUP_ICU(INTL_SHARED_LIBADD)
-   PHP_SUBST(INTL_SHARED_LIBADD)
-   PHP_REQUIRE_CXX()
--  INTL_COMMON_FLAGS="$ICU_INCS $ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
--  if test "$icu_version" -ge "4002"; then
--    icu_spoof_src=" spoofchecker/spoofchecker_class.c \
--    spoofchecker/spoofchecker.c\
--    spoofchecker/spoofchecker_create.c\
--    spoofchecker/spoofchecker_main.c"
--  else
--    icu_spoof_src=""
--  fi
-+  INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
-   PHP_NEW_EXTENSION(intl, php_intl.c \
-     intl_error.c \
-     intl_convert.c \
-@@ -68,7 +60,11 @@ if test "$PHP_INTL" != "no"; then
-     transliterator/transliterator_methods.c \
-     uchar/uchar.c \
-     idn/idn.c \
--    $icu_spoof_src, $ext_shared,,$INTL_COMMON_FLAGS,cxx)
-+    spoofchecker/spoofchecker_class.c \
-+    spoofchecker/spoofchecker.c\
-+    spoofchecker/spoofchecker_create.c\
-+    spoofchecker/spoofchecker_main.c \
-+    , $ext_shared,,$INTL_COMMON_FLAGS,cxx)
- 
-   PHP_INTL_CXX_SOURCES="intl_convertcpp.cpp \
-     common/common_enum.cpp \
--- 
-2.7.4
-
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb
similarity index 93%
rename from meta-openembedded/meta-oe/recipes-devtools/php/php.inc
rename to meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb
index 3d537e5..e7fb847 100644
--- a/meta-openembedded/meta-oe/recipes-devtools/php/php.inc
+++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.11.bb
@@ -3,6 +3,7 @@
 SECTION = "console/network"
 
 LICENSE = "PHP-3.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e"
 
 BBCLASSEXTEND = "native"
 DEPENDS = "zlib bzip2 libxml2 virtual/libiconv php-native lemon-native"
@@ -12,6 +13,11 @@
 
 SRC_URI = "http://php.net/distributions/php-${PV}.tar.bz2 \
            file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch \
+           file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
+           file://0048-Use-pkg-config-for-FreeType2-detection.patch \
+           file://0001-Use-pkg-config-for-libxml2-detection.patch \
+           file://debian-php-fixheader.patch \
+           file://CVE-2019-6978.patch \
           "
 
 SRC_URI_append_class-target = " \
@@ -22,8 +28,14 @@
             file://php-fpm-apache.conf \
             file://70_mod_php${PHP_MAJOR_VERSION}.conf \
             file://php-fpm.service \
+            file://pear-makefile.patch \
+            file://phar-makefile.patch \
+            file://0001-opcache-config.m4-enable-opcache.patch \
+            file://xfail_two_bug_tests.patch \
           "
 S = "${WORKDIR}/php-${PV}"
+SRC_URI[md5sum] = "21b710b4126d4d54714de9693a6c7b0d"
+SRC_URI[sha256sum] = "92d1ff4b13c7093635f1ec338a5e6891ca99b10e65fbcadd527e5bb84d11b5e7"
 
 inherit autotools pkgconfig pythonnative gettext
 
diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb
deleted file mode 100644
index a5c7b9b..0000000
--- a/meta-openembedded/meta-oe/recipes-devtools/php/php_7.3.9.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-require php.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fb07bfc51f6d5e0c30b65d9701233b2e"
-
-SRC_URI += "file://0001-acinclude.m4-don-t-unset-cache-variables.patch \
-            file://0048-Use-pkg-config-for-FreeType2-detection.patch \
-            file://0049-ext-intl-Use-pkg-config-to-detect-icu.patch \
-            file://0001-Use-pkg-config-for-libxml2-detection.patch \
-            file://debian-php-fixheader.patch \
-            file://CVE-2019-6978.patch \
-           "
-SRC_URI_append_class-target = " \
-                                file://pear-makefile.patch \
-                                file://phar-makefile.patch \
-                                file://0001-opcache-config.m4-enable-opcache.patch \
-                                file://xfail_two_bug_tests.patch \
-                                "
-
-SRC_URI[md5sum] = "bcc37749815009c9201e4c126e1ab8ee"
-SRC_URI[sha256sum] = "a39c9709a8c9eb7ea8ac4933ef7a78b92f7e5735a405c8b8e42ee39541d963c4"