summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-04-20 12:50:03 +0000
committerMike Frysinger <vapier@gentoo.org>2008-04-20 12:50:03 +0000
commitcea30084f4e3cb3b895cb466adcf850325d33c82 (patch)
tree488b1b498a5392941e14a7cf0824fa82294e19f5 /sys-apps
parentupdate patch for libtool-2.2 #212718 (diff)
downloadgentoo-2-cea30084f4e3cb3b895cb466adcf850325d33c82.tar.gz
gentoo-2-cea30084f4e3cb3b895cb466adcf850325d33c82.tar.bz2
gentoo-2-cea30084f4e3cb3b895cb466adcf850325d33c82.zip
Fix building with newer libtool #212772.
(Portage version: 2.2_pre5)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/hal/ChangeLog6
-rw-r--r--sys-apps/hal/files/hal-0.5.10-autotools.patch14
-rw-r--r--sys-apps/hal/hal-0.5.10.ebuild4
3 files changed, 22 insertions, 2 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index e9a8b68e35ed..38e38dc0fe4d 100644
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/hal
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.230 2008/04/14 18:36:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.231 2008/04/20 12:50:02 vapier Exp $
+
+ 20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/hal-0.5.10-autotools.patch, hal-0.5.10.ebuild:
+ Fix building with newer libtool #212772.
14 Apr 2008; Doug Goldstein <cardoe@gentoo.org> hal-0.5.7.1-r5.ebuild,
hal-0.5.9-r1.ebuild, hal-0.5.9.1-r1.ebuild, hal-0.5.9.1-r2.ebuild,
diff --git a/sys-apps/hal/files/hal-0.5.10-autotools.patch b/sys-apps/hal/files/hal-0.5.10-autotools.patch
new file mode 100644
index 000000000000..86214fce028c
--- /dev/null
+++ b/sys-apps/hal/files/hal-0.5.10-autotools.patch
@@ -0,0 +1,14 @@
+since we refer to C++ later in configure, we need to search for the prog
+
+http://bugs.gentoo.org/212772
+
+--- configure.in
++++ configure.in
+@@ -30,6 +30,7 @@
+ AC_ISC_POSIX
+ AC_PROG_CC
+ AM_PROG_CC_C_O
++AC_PROG_CXX
+ AC_HEADER_STDC
+ AC_PROG_LIBTOOL
+ AC_PROG_MAKE_SET
diff --git a/sys-apps/hal/hal-0.5.10.ebuild b/sys-apps/hal/hal-0.5.10.ebuild
index 707637d10649..e5d19671ffbf 100644
--- a/sys-apps/hal/hal-0.5.10.ebuild
+++ b/sys-apps/hal/hal-0.5.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.14 2008/04/14 18:36:31 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.10.ebuild,v 1.15 2008/04/20 12:50:02 vapier Exp $
inherit eutils linux-info autotools flag-o-matic
@@ -134,6 +134,8 @@ src_unpack() {
EPATCH_FORCE="yes" \
epatch
+ epatch "${FILESDIR}"/${P}-autotools.patch #212772
+
# Hide recovery partitions
epatch "${FILESDIR}/hal-0.5.9-hide-recovery-partitions.patch"