diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-27 16:05:59 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 11:43:59 +0100 |
commit | 6fac60da96eee89d5b7c2156bbb92fe72dc28aef (patch) | |
tree | af55f9157508f35ece55c012d3e8cb25ac532e71 /meta/recipes-support/gmp/gmp/append_user_provided_flags.patch | |
parent | b9ade91413f56ffeeeec753a45e3d1d64efe4802 (diff) | |
download | poky-6fac60da96eee89d5b7c2156bbb92fe72dc28aef.tar.gz |
gmp: Bring back version 4.2.1 (LGPL 2.1+)
gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It
was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides
a useful alternative to the newer "GPLv2 | LGPLv3" version.
* Reintroduce 4.2.1. The source includes files that are GPL but the
library package is LGPL 2.1+
* Also reintroduce the two patches removed in f181c6ce8b.
* Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way.
* Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+".
[YOCTO #8197]
(From OE-Core rev: 1adec83621f36a3dd748990c307ca4ebebcdd554)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.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, 0 insertions, 52 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 deleted file mode 100644 index ae1386c4c1..0000000000 --- a/meta/recipes-support/gmp/gmp/append_user_provided_flags.patch +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate | ||
2 | |||
3 | Append the user provided flags to the auto-detected ones. | ||
4 | |||
5 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
6 | |||
7 | Index: gmp-5.1.1/configure.ac | ||
8 | =================================================================== | ||
9 | --- gmp-5.1.1.orig/configure.ac 2014-02-11 15:05:44.925202403 +0200 | ||
10 | +++ gmp-5.1.1/configure.ac 2014-02-11 15:19:03.918511398 +0200 | ||
11 | @@ -1745,8 +1745,12 @@ | ||
12 | EOF | ||
13 | |||
14 | |||
15 | -test_CFLAGS=${CFLAGS+set} | ||
16 | -test_CPPFLAGS=${CPPFLAGS+set} | ||
17 | +test_CFLAGS= | ||
18 | +test_CPPFLAGS= | ||
19 | + | ||
20 | +user_CFLAGS=$CFLAGS | ||
21 | +user_CPPFLAGS=$CPPFLAGS | ||
22 | +user_CXXFLAGS=$CXXFLAGS | ||
23 | |||
24 | for abi in $abilist; do | ||
25 | abi_last="$abi" | ||
26 | @@ -2175,7 +2179,7 @@ | ||
27 | want_cxx=no | ||
28 | AC_PROG_CXX | ||
29 | if test $enable_cxx != no; then | ||
30 | - test_CXXFLAGS=${CXXFLAGS+set} | ||
31 | + test_CXXFLAGS= | ||
32 | |||
33 | echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AS_MESSAGE_LOG_FD() | ||
34 | cxxflags_ac_prog_cxx=$CXXFLAGS | ||
35 | @@ -2202,7 +2206,7 @@ | ||
36 | # Automake includes $CPPFLAGS in a C++ compile, so we do the same here. | ||
37 | # | ||
38 | for cxxflags_choice in $cxxflags_list; do | ||
39 | - eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\" | ||
40 | + eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice $user_CXXFLAGS\" | ||
41 | GMP_PROG_CXX_WORKS($CXX $CPPFLAGS $CXXFLAGS, | ||
42 | [want_cxx=yes | ||
43 | break]) | ||
44 | @@ -2292,6 +2296,8 @@ | ||
45 | # done | ||
46 | fi | ||
47 | |||
48 | +CFLAGS="$CFLAGS $user_CFLAGS" | ||
49 | +CPPFLAGS="$CPPFLAGS $user_CPPFLAGS" | ||
50 | |||
51 | cat >&AS_MESSAGE_LOG_FD() <<EOF | ||
52 | Decided: | ||