diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-10-08 12:22:52 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-08 13:07:41 -0400 |
| commit | 962a094e5e7db16e2b9d26a8a69564329f7dee4b (patch) | |
| tree | e2e3d33ff88db7cef88d4a1731e67ec2de18de80 /media-libs/alsa-lib | |
| parent | kde-plasma: version bump 5.4.2 (diff) | |
| download | gentoo-962a094e5e7db16e2b9d26a8a69564329f7dee4b.tar.gz gentoo-962a094e5e7db16e2b9d26a8a69564329f7dee4b.tar.bz2 gentoo-962a094e5e7db16e2b9d26a8a69564329f7dee4b.zip | |
media-libs/alsa-lib: add upstream fix for cross-compiling
The configure script would blindly ignore $CC when cross-compiling.
Add the upstream commit that deletes that insanity.
Diffstat (limited to 'media-libs/alsa-lib')
| -rw-r--r-- | media-libs/alsa-lib/alsa-lib-1.0.29.ebuild | 1 | ||||
| -rw-r--r-- | media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch | 46 |
2 files changed, 47 insertions, 0 deletions
diff --git a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild index 288a03fabf11..4e127b07ec9a 100644 --- a/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild +++ b/media-libs/alsa-lib/alsa-lib-1.0.29.ebuild @@ -34,6 +34,7 @@ pkg_setup() { src_prepare() { find . -name Makefile.am -exec sed -i -e '/CFLAGS/s:-g -O2::' {} + || die + epatch "${FILESDIR}"/${P}-cross-compile.patch # https://bugs.gentoo.org/509886 use elibc_uclibc && { sed -i -e 's:oldapi queue_timer:queue_timer:' test/Makefile.am || die; } epatch_user diff --git a/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch new file mode 100644 index 000000000000..11fd99a2f9e2 --- /dev/null +++ b/media-libs/alsa-lib/files/alsa-lib-1.0.29-cross-compile.patch @@ -0,0 +1,46 @@ +fix from upstream + +From c82417650a1ea4446c19dd82bfab9d8e6cd5a969 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 15 Sep 2015 18:48:02 +0300 +Subject: [PATCH] build: Do not try to detect cross-compiler + +cross compilers are passed via path may not be a gcc based cross +compiler in such cases this check fails and try's to force gcc based +cross compiler detection, This code is a convenience that limits the +build system + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + configure.ac | 14 -------------- + 1 file changed, 14 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a482b3e..a14e52d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -27,20 +27,6 @@ AC_PREFIX_DEFAULT(/usr) + + dnl Checks for programs. + +-dnl try to gues cross-compiler if not set +-if test "x$host" != "x$build" -a -z "`echo $CC | grep -e '-gcc'`"; +-then +- AC_MSG_CHECKING(for cross-compiler) +- +- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc +- which ${host_cpu}-${host_os}-gcc >/dev/null 2>&1 \ +- && CC=${host_cpu}-${host_os}-gcc +- which ${host_cpu}-${host_vendor}-${host_os}-gcc >/dev/null 2>&1 \ +- && CC=${host_cpu}-${host_vendor}-${host_os}-gcc +- +- AC_MSG_RESULT($CC) +-fi +- + CFLAGS="$CFLAGS -D_GNU_SOURCE" + + +-- +2.5.2 + |