summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-08-22 08:58:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:35:50 +0100
commitc2591e10d5b7a09e5d3d42befafa9ed7a638c918 (patch)
tree777144e767d5a69e0771fbe0494ad8e40598eedd /meta/recipes-multimedia
parentb2c1e64ecd3ab7c569feb50ea74f3235e4e7d66a (diff)
downloadpoky-c2591e10d5b7a09e5d3d42befafa9ed7a638c918.tar.gz
alsa-lib: Lift the limitation to use gcc only cross compiler
alsa-lib configure tries to see that if CC variabled doesnt contain 'gcc' then it tries to guess and redefine CC to be something gcc, which doesnt work with OE since we define CC to have sysroot and options attached to it. So all tests fail when configure constructs the CC for cross compiler like this. This portion is not needed at all (From OE-Core rev: 33a7eb64cded61601c6ad6883e4d64ebe9ff547c) (From OE-Core rev: 47212cb032b67dc59277f6c38e9aeda5a9b628a4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch45
-rw-r--r--meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb1
2 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
new file mode 100644
index 0000000000..583bc3daab
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-build-Do-not-try-to-detect-cross-compiler.patch
@@ -0,0 +1,45 @@
1From 17aeb3565f411e7796cabe403f92d15948a8ca95 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Aug 2015 14:42:45 -0700
4Subject: [PATCH] build: Do not try to detect cross-compiler
5
6cross compilers are passed via path may not be a gcc based cross
7compiler in such cases this check fails and try's to force gcc based
8cross compiler detection, This code is a convenience that limits the
9build system
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 configure.ac | 14 --------------
16 1 file changed, 14 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 3022cf8..9d77440 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr)
23
24 dnl Checks for programs.
25
26-dnl try to gues cross-compiler if not set
27-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`";
28-then
29- AC_MSG_CHECKING(for cross-compiler)
30-
31- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
32- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \
33- && CC=${host_cpu}-${host_os}-gcc
34- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \
35- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc
36-
37- AC_MSG_RESULT($CC)
38-fi
39-
40 CFLAGS="$CFLAGS -D_GNU_SOURCE"
41
42
43--
442.1.4
45
diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
index fc6ba693f5..730f427402 100644
--- a/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
+++ b/meta/recipes-multimedia/alsa/alsa-lib_1.0.29.bb
@@ -16,6 +16,7 @@ ARM_INSTRUCTION_SET = "arm"
16 16
17SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ 17SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \
18 file://Check-if-wordexp-function-is-supported.patch \ 18 file://Check-if-wordexp-function-is-supported.patch \
19 file://0001-build-Do-not-try-to-detect-cross-compiler.patch \
19" 20"
20SRC_URI[md5sum] = "de67e0eca72474d6b1121037dafe1024" 21SRC_URI[md5sum] = "de67e0eca72474d6b1121037dafe1024"
21SRC_URI[sha256sum] = "73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0" 22SRC_URI[sha256sum] = "73043c35eb9636be0f4af6a240235c213f12a25feb1f04aeeac8cb7e30fcbdd0"