diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2015-06-18 14:43:50 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-23 12:43:11 +0200 |
commit | befc528b8c13cf099a2eed38b67f13dafbaa04db (patch) | |
tree | 4a746faec3ee93c4d874b802d1a2d60c8c9bd278 | |
parent | 583e3987db4d7e58cd748eeab99d89c70c5cd9a9 (diff) | |
download | meta-openembedded-befc528b8c13cf099a2eed38b67f13dafbaa04db.tar.gz |
llvm3.3: fix error output from configure if CFLAGS is set
Error is cosmetic, but distracting. Backport upstream fix.
| .../build-vbox32/tmp/work/core2-32-rdk-linux-musl/llvm3.3/3.3-r0/llvm-3.3.src/configure: line 1990: -O2: command not found
| .../build-vbox32/tmp/work/core2-32-rdk-linux-musl/llvm3.3/3.3-r0/llvm-3.3.src/configure: line 1991: -O2: command not found
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch | 52 | ||||
-rw-r--r-- | meta-oe/recipes-core/llvm/llvm3.3_3.3.bb | 3 |
2 files changed, 55 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch b/meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch new file mode 100644 index 000000000..44387e898 --- /dev/null +++ b/meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | From d4bf7a3853dab12c11cbfc8088fd76f548a8d017 Mon Sep 17 00:00:00 2001 | ||
2 | From: Patrik Hagglund <patrik.h.hagglund@ericsson.com> | ||
3 | Date: Tue, 24 Sep 2013 11:38:45 +0000 | ||
4 | Subject: [PATCH] Remove error output from configure if CFLAGS is set (r174313). | ||
5 | |||
6 | This fixes PR16724. | ||
7 | |||
8 | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191289 91177308-0d34-0410-b5e6-96231b3b80d8 | ||
9 | |||
10 | https://github.com/llvm-mirror/llvm/commit/d4bf7a3853dab12c11cbfc8088fd76f548a8d017 | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
15 | --- | ||
16 | autoconf/configure.ac | 4 ++-- | ||
17 | configure | 4 ++-- | ||
18 | 2 files changed, 4 insertions(+), 4 deletions(-) | ||
19 | |||
20 | diff --git a/autoconf/configure.ac b/autoconf/configure.ac | ||
21 | index f9c365c..45f2fe4 100644 | ||
22 | --- a/autoconf/configure.ac | ||
23 | +++ b/autoconf/configure.ac | ||
24 | @@ -61,8 +61,8 @@ fi | ||
25 | |||
26 | dnl Default to empty (i.e. assigning the null string to) CFLAGS and CXXFLAGS, | ||
27 | dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). | ||
28 | -${CFLAGS=} | ||
29 | -${CXXFLAGS=} | ||
30 | +: ${CFLAGS=} | ||
31 | +: ${CXXFLAGS=} | ||
32 | |||
33 | dnl We need to check for the compiler up here to avoid anything else | ||
34 | dnl starting with a different one. | ||
35 | diff --git a/configure b/configure | ||
36 | index f3a6594..9090cda 100755 | ||
37 | --- a/configure | ||
38 | +++ b/configure | ||
39 | @@ -1992,8 +1992,8 @@ echo "$as_me: error: Already configured in ${srcdir}" >&2;} | ||
40 | fi | ||
41 | fi | ||
42 | |||
43 | -${CFLAGS=} | ||
44 | -${CXXFLAGS=} | ||
45 | +: ${CFLAGS=} | ||
46 | +: ${CXXFLAGS=} | ||
47 | |||
48 | ac_ext=c | ||
49 | ac_cpp='$CPP $CPPFLAGS' | ||
50 | -- | ||
51 | 1.9.1 | ||
52 | |||
diff --git a/meta-oe/recipes-core/llvm/llvm3.3_3.3.bb b/meta-oe/recipes-core/llvm/llvm3.3_3.3.bb index 4617efa8b..f0598a72c 100644 --- a/meta-oe/recipes-core/llvm/llvm3.3_3.3.bb +++ b/meta-oe/recipes-core/llvm/llvm3.3_3.3.bb | |||
@@ -3,7 +3,10 @@ require llvm.inc | |||
3 | DEPENDS += "zlib" | 3 | DEPENDS += "zlib" |
4 | EXTRA_OECONF += "--enable-zlib" | 4 | EXTRA_OECONF += "--enable-zlib" |
5 | 5 | ||
6 | SRC_URI += "file://Remove-error-output-from-configure-if-CFLAGS-is-set-.patch" | ||
7 | |||
6 | SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " | 8 | SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " |
9 | |||
7 | SRC_URI[md5sum] = "40564e1dc390f9844f1711c08b08e391" | 10 | SRC_URI[md5sum] = "40564e1dc390f9844f1711c08b08e391" |
8 | SRC_URI[sha256sum] = "68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578" | 11 | SRC_URI[sha256sum] = "68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578" |
9 | 12 | ||