diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-support/gmp/gmp-6.1.2 | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
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 <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-support/gmp/gmp-6.1.2')
4 files changed, 0 insertions, 143 deletions
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 <alex.kanavin@gmail.com> -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 <laurentiu.palcu@intel.com> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - 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 <<EOF - Decided: --- -2.6.2 - diff --git a/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch deleted file mode 100644 index 1e47924cc..000000000 --- a/poky/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ae1a4c37417a3bbbf8ea1cab198982b0cad47e29 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 12 Aug 2016 17:08:13 +0000 -Subject: [PATCH] confiure.ac: Believe the cflags from environment - -In some toolchains e.g. OpenEmbedded -march options -are passed on compiler cmdline, it does not use -the expected target triplets to make these decision -during configure. - -Secondly, dont set armv4 for march when no selection -is made, since it is passed from cmdline - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Inappropriate[OE-Specific] - - configure.ac | 11 ----------- - 1 file changed, 11 deletions(-) - -Index: gmp-6.1.2/configure.ac -=================================================================== ---- gmp-6.1.2.orig/configure.ac -+++ gmp-6.1.2/configure.ac -@@ -604,15 +604,6 @@ case $host in - any_32_testlist="sizeof-long-4" - any_64_testlist="sizeof-long-8" - -- # This is needed for clang, which is not content with flags like -mfpu=neon -- # alone. -- case $host in -- *-*-*eabi) -- gcc_cflags_fpmode="-mfloat-abi=softfp" ;; -- *-*-*eabihf) -- gcc_cflags_fpmode="-mfloat-abi=hard" ;; -- esac -- - # FIXME: We make mandatory compiler options optional here. We should - # either enforce them, or organise to strip paths as the corresponding - # options fail. -@@ -746,8 +737,6 @@ case $host in - ;; - *) - path="arm" -- gcc_cflags_arch="-march=armv4" -- GMP_DEFINE_RAW(["define(<NOTHUMB>,1)"]) - ;; - esac - ;; diff --git a/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch deleted file mode 100644 index 3935589f8..000000000 --- a/poky/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/longlong.h -=================================================================== ---- gmp-6.1.2.orig/longlong.h -+++ gmp-6.1.2/longlong.h -@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype - count is only an int. */ - #define count_trailing_zeros(count, x) \ - do { \ -+ UDItype __cbtmp; \ - ASSERT ((x) != 0); \ -- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \ -+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ -+ (count) = __cbtmp; \ - } while (0) - #endif /* __amd64__ */ - diff --git a/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch deleted file mode 100644 index 6b089cf39..000000000 --- a/poky/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Index: gmp-6.1.2/Makefile.am -=================================================================== ---- gmp-6.1.2.orig/Makefile.am -+++ gmp-6.1.2/Makefile.am -@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h - # but anyone knowledgeable enough to be playing with exec_prefix will be able - # to address that. - # --includeexecdir = $(exec_prefix)/include -+includeexecdir = $(includedir) - include_HEADERS = $(GMPXX_HEADERS_OPTION) - nodist_includeexec_HEADERS = gmp.h - lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) |