diff options
Diffstat (limited to 'meta/recipes-support/gmp/gmp')
3 files changed, 128 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch new file mode 100644 index 0000000000..325ffe491f --- /dev/null +++ b/meta/recipes-support/gmp/gmp/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch @@ -0,0 +1,61 @@ +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/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch new file mode 100644 index 0000000000..56564db505 --- /dev/null +++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -0,0 +1,49 @@ +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(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -625,17 +625,6 @@ case $host in + any_32_testlist="sizeof-void*-4" + any_64_testlist="sizeof-void*-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" ;; +- *-*-mingw*) +- limb_64=longlong ;; +- esac +- + # FIXME: We make mandatory compiler options optional here. We should + # either enforce them, or organise to strip paths as the corresponding + # options fail. +@@ -780,8 +769,6 @@ case $host in + ;; + *) + path="arm" +- gcc_cflags_arch="-march=armv4" +- GMP_DEFINE_RAW(["define(<NOTHUMB>,1)"]) + ;; + esac + ;; diff --git a/meta/recipes-support/gmp/gmp/use-includedir.patch b/meta/recipes-support/gmp/gmp/use-includedir.patch new file mode 100644 index 0000000000..d27317cdf6 --- /dev/null +++ b/meta/recipes-support/gmp/gmp/use-includedir.patch @@ -0,0 +1,18 @@ +exec includedir should be pointing to general yocto includdir + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +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) |