From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- ...user-provided-flags-to-the-auto-detected-.patch | 61 ---------------------- 1 file changed, 61 deletions(-) delete mode 100644 poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch (limited to 'poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch') diff --git a/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch deleted file mode 100644 index 325ffe491..000000000 --- a/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch +++ /dev/null @@ -1,61 +0,0 @@ -From d3b9fc523fc11260ced890c35bc5c9e6391c8656 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 14 Dec 2015 14:19:49 +0200 -Subject: [PATCH] Append the user provided flags to the auto-detected ones. - -Upstream-Status: Inappropriate -Signed-off-by: Laurentiu Palcu -Signed-off-by: Alexander Kanavin ---- - configure.ac | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9cedfeb..87caee5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1921,8 +1921,12 @@ cclist=$cclist - EOF - - --test_CFLAGS=${CFLAGS+set} --test_CPPFLAGS=${CPPFLAGS+set} -+test_CFLAGS= -+test_CPPFLAGS= -+ -+user_CFLAGS=$CFLAGS -+user_CPPFLAGS=$CPPFLAGS -+user_CXXFLAGS=$CXXFLAGS - - for abi in $abilist; do - abi_last="$abi" -@@ -2353,7 +2357,7 @@ AC_SUBST(CCAS) - # The C++ compiler, if desired. - want_cxx=no - if test $enable_cxx != no; then -- test_CXXFLAGS=${CXXFLAGS+set} -+ test_CXXFLAGS= - AC_PROG_CXX - - echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC -@@ -2381,7 +2385,7 @@ if test $enable_cxx != no; then - # Automake includes $CPPFLAGS in a C++ compile, so we do the same here. - # - for cxxflags_choice in $cxxflags_list; do -- eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\" -+ eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice $user_CXXFLAGS\" - GMP_PROG_CXX_WORKS($CXX $CPPFLAGS $CXXFLAGS, - [want_cxx=yes - break]) -@@ -2477,6 +2481,8 @@ if test "$enable_assembly" = "no"; then - # done - fi - -+CFLAGS="$CFLAGS $user_CFLAGS" -+CPPFLAGS="$CPPFLAGS $user_CPPFLAGS" - - cat >&AC_FD_CC <