summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-10-08 16:07:17 -0400
committerMike Frysinger <vapier@gentoo.org>2015-10-08 16:07:35 -0400
commit9de99806960e82425fb2fde97216531a8bcdd6d5 (patch)
treec34586db76087f2e3dc9eb0b770e65f789b7b473 /media-sound/alsa-utils
parentwww-client/firefox-bin: version bump to 41.0.1, bug 562564 (diff)
downloadgentoo-9de99806960e82425fb2fde97216531a8bcdd6d5.tar.gz
gentoo-9de99806960e82425fb2fde97216531a8bcdd6d5.tar.bz2
gentoo-9de99806960e82425fb2fde97216531a8bcdd6d5.zip
media-sound/alsa-utils: 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-sound/alsa-utils')
-rw-r--r--media-sound/alsa-utils/alsa-utils-1.0.29.ebuild1
-rw-r--r--media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch44
2 files changed, 45 insertions, 0 deletions
diff --git a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
index 284390bebc22..120d48d28a25 100644
--- a/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.0.29.ebuild
@@ -24,6 +24,7 @@ RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-alsa )"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-cross-compile.patch
epatch_user
}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
new file mode 100644
index 000000000000..45aa8a9c3c7a
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.0.29-cross-compile.patch
@@ -0,0 +1,44 @@
+fix from upstream
+
+From c0130c8ec22a89960d9304297a904a2a14979506 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Thu, 8 Oct 2015 12:14:05 -0400
+Subject: [PATCH alsa-utils] 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: Mike Frysinger <vapier@gentoo.org>
+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 8c2d1a5..79a9aaf 100644
+--- a/configure
++++ b/configure
+@@ -6192,21 +6192,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+
+
+
+-if test "x$target" != "x$host" -a -z "`echo $CC | grep -e '-gcc'`";
+-then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross-compiler" >&5
+-$as_echo_n "checking for cross-compiler... " >&6; }
+-
+- which ${program_prefix}gcc >/dev/null 2>&1 && CC=${program_prefix}gcc
+- which ${target_cpu}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target-os}-gcc
+- which ${target_cpu}-${target_vendor}-${target_os}-gcc >/dev/null 2>&1 \
+- && CC=${target_cpu}-${target_vendor}-${target_os}-gcc
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+-$as_echo "$CC" >&6; }
+-fi
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'