diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2014-08-12 14:33:37 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:19:54 +0100 |
| commit | f181c6ce8b364fbf761a456d998ab78fbd751f35 (patch) | |
| tree | 222a7d0d0e4849416d5fdcf7131d3da1eb724ac3 /meta/recipes-support/gmp/gmp/append_user_provided_flags.patch | |
| parent | ab659b1c1e13fd6863893abff86990d88aa36790 (diff) | |
| download | openembedded-core-contrib-f181c6ce8b364fbf761a456d998ab78fbd751f35.tar.gz | |
gmp: uprev it to 6.0.0
Uprev gmp from 5.1.1 to 6.0.0, and remove the 4.2.1 version which is GPLv2,
since gmp-6.0.0 is dual-licensing, LGPLv3 or GPLv2;
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gmp/gmp/append_user_provided_flags.patch')
| -rw-r--r-- | meta/recipes-support/gmp/gmp/append_user_provided_flags.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch b/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch new file mode 100644 index 0000000000..ae1386c4c1 --- /dev/null +++ b/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch @@ -0,0 +1,52 @@ +Upstream-Status: Inappropriate + +Append the user provided flags to the auto-detected ones. + +Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> + +Index: gmp-5.1.1/configure.ac +=================================================================== +--- gmp-5.1.1.orig/configure.ac 2014-02-11 15:05:44.925202403 +0200 ++++ gmp-5.1.1/configure.ac 2014-02-11 15:19:03.918511398 +0200 +@@ -1745,8 +1745,12 @@ + 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" +@@ -2175,7 +2179,7 @@ + want_cxx=no + AC_PROG_CXX + if test $enable_cxx != no; then +- test_CXXFLAGS=${CXXFLAGS+set} ++ test_CXXFLAGS= + + echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() + cxxflags_ac_prog_cxx=$CXXFLAGS +@@ -2202,7 +2206,7 @@ + # 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]) +@@ -2292,6 +2296,8 @@ + # done + fi + ++CFLAGS="$CFLAGS $user_CFLAGS" ++CPPFLAGS="$CPPFLAGS $user_CPPFLAGS" + + cat >&AS_MESSAGE_LOG_FD() <<EOF + Decided: |