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 0000000000..44387e8988 --- /dev/null +++ b/meta-oe/recipes-core/llvm/llvm3.3/Remove-error-output-from-configure-if-CFLAGS-is-set-.patch @@ -0,0 +1,52 @@ +From d4bf7a3853dab12c11cbfc8088fd76f548a8d017 Mon Sep 17 00:00:00 2001 +From: Patrik Hagglund <patrik.h.hagglund@ericsson.com> +Date: Tue, 24 Sep 2013 11:38:45 +0000 +Subject: [PATCH] Remove error output from configure if CFLAGS is set (r174313). + +This fixes PR16724. + +git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191289 91177308-0d34-0410-b5e6-96231b3b80d8 + +https://github.com/llvm-mirror/llvm/commit/d4bf7a3853dab12c11cbfc8088fd76f548a8d017 + +Upstream-Status: Backport + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> +--- + autoconf/configure.ac | 4 ++-- + configure | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/autoconf/configure.ac b/autoconf/configure.ac +index f9c365c..45f2fe4 100644 +--- a/autoconf/configure.ac ++++ b/autoconf/configure.ac +@@ -61,8 +61,8 @@ fi + + dnl Default to empty (i.e. assigning the null string to) CFLAGS and CXXFLAGS, + dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). +-${CFLAGS=} +-${CXXFLAGS=} ++: ${CFLAGS=} ++: ${CXXFLAGS=} + + dnl We need to check for the compiler up here to avoid anything else + dnl starting with a different one. +diff --git a/configure b/configure +index f3a6594..9090cda 100755 +--- a/configure ++++ b/configure +@@ -1992,8 +1992,8 @@ echo "$as_me: error: Already configured in ${srcdir}" >&2;} + fi + fi + +-${CFLAGS=} +-${CXXFLAGS=} ++: ${CFLAGS=} ++: ${CXXFLAGS=} + + ac_ext=c + ac_cpp='$CPP $CPPFLAGS' +-- +1.9.1 + 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 4617efa8b7..f0598a72cb 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 DEPENDS += "zlib" EXTRA_OECONF += "--enable-zlib" +SRC_URI += "file://Remove-error-output-from-configure-if-CFLAGS-is-set-.patch" + SRC_URI_append_libc-uclibc = " file://arm_fenv_uclibc.patch " + SRC_URI[md5sum] = "40564e1dc390f9844f1711c08b08e391" SRC_URI[sha256sum] = "68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578" |