diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-07-06 18:37:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-12 23:10:14 +0100 |
commit | 4de8b37aa66bb676bd2176496cce6f5f0784d12b (patch) | |
tree | 64c84f9765eb0291fab395dfa7c012d05e0182ef /meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch | |
parent | 65a8f241e1b6576263c743a93a70018dd08c9902 (diff) | |
download | poky-4de8b37aa66bb676bd2176496cce6f5f0784d12b.tar.gz |
gmp: 6.1.0 -> 6.1.1
(From OE-Core rev: 55fea8ead3ebef7e28a982a7721bc0ec42b5ca86)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch')
-rw-r--r-- | meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp-6.1.1/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-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | From d3b9fc523fc11260ced890c35bc5c9e6391c8656 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 14 Dec 2015 14:19:49 +0200 | ||
4 | Subject: [PATCH] Append the user provided flags to the auto-detected ones. | ||
5 | |||
6 | Upstream-Status: Inappropriate | ||
7 | Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 14 ++++++++++---- | ||
11 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 9cedfeb..87caee5 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -1921,8 +1921,12 @@ cclist=$cclist | ||
18 | EOF | ||
19 | |||
20 | |||
21 | -test_CFLAGS=${CFLAGS+set} | ||
22 | -test_CPPFLAGS=${CPPFLAGS+set} | ||
23 | +test_CFLAGS= | ||
24 | +test_CPPFLAGS= | ||
25 | + | ||
26 | +user_CFLAGS=$CFLAGS | ||
27 | +user_CPPFLAGS=$CPPFLAGS | ||
28 | +user_CXXFLAGS=$CXXFLAGS | ||
29 | |||
30 | for abi in $abilist; do | ||
31 | abi_last="$abi" | ||
32 | @@ -2353,7 +2357,7 @@ AC_SUBST(CCAS) | ||
33 | # The C++ compiler, if desired. | ||
34 | want_cxx=no | ||
35 | if test $enable_cxx != no; then | ||
36 | - test_CXXFLAGS=${CXXFLAGS+set} | ||
37 | + test_CXXFLAGS= | ||
38 | AC_PROG_CXX | ||
39 | |||
40 | echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC | ||
41 | @@ -2381,7 +2385,7 @@ if test $enable_cxx != no; then | ||
42 | # Automake includes $CPPFLAGS in a C++ compile, so we do the same here. | ||
43 | # | ||
44 | for cxxflags_choice in $cxxflags_list; do | ||
45 | - eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\" | ||
46 | + eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice $user_CXXFLAGS\" | ||
47 | GMP_PROG_CXX_WORKS($CXX $CPPFLAGS $CXXFLAGS, | ||
48 | [want_cxx=yes | ||
49 | break]) | ||
50 | @@ -2477,6 +2481,8 @@ if test "$enable_assembly" = "no"; then | ||
51 | # done | ||
52 | fi | ||
53 | |||
54 | +CFLAGS="$CFLAGS $user_CFLAGS" | ||
55 | +CPPFLAGS="$CPPFLAGS $user_CPPFLAGS" | ||
56 | |||
57 | cat >&AC_FD_CC <<EOF | ||
58 | Decided: | ||
59 | -- | ||
60 | 2.6.2 | ||
61 | |||