summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-02-27 08:18:33 +0000
committerMichael Weber <xmw@gentoo.org>2013-02-27 08:18:33 +0000
commitd98e1363db27593425b321df196eddf73adb77f9 (patch)
tree28117f4292a4b38dc4972f6e0b3621ec8d89d115 /dev-libs/libwapcaplet
parentUse newexe rather than newins for the udhcpc script as pointed out by Mandeep... (diff)
downloadgentoo-2-d98e1363db27593425b321df196eddf73adb77f9.tar.gz
gentoo-2-d98e1363db27593425b321df196eddf73adb77f9.tar.bz2
gentoo-2-d98e1363db27593425b321df196eddf73adb77f9.zip
Restore cross-compile functionality (thanks James Le Cuirot, bug 431884)
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'dev-libs/libwapcaplet')
-rw-r--r--dev-libs/libwapcaplet/ChangeLog7
-rw-r--r--dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild13
2 files changed, 13 insertions, 7 deletions
diff --git a/dev-libs/libwapcaplet/ChangeLog b/dev-libs/libwapcaplet/ChangeLog
index de4e86bff6aa..6a8d418ea69e 100644
--- a/dev-libs/libwapcaplet/ChangeLog
+++ b/dev-libs/libwapcaplet/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-libs/libwapcaplet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/ChangeLog,v 1.5 2012/07/18 14:25:01 mr_bones_ Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/ChangeLog,v 1.6 2013/02/27 08:18:33 xmw Exp $
+
+ 27 Feb 2013; Michael Weber <xmw@gentoo.org> libwapcaplet-0.1.1.ebuild:
+ Restore cross-compile functionality (thanks James Le Cuirot, bug 431884)
18 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
libwapcaplet-0.1.1.ebuild:
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild
index a66428b88663..86d9e0e5dc5b 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild,v 1.5 2012/07/18 14:25:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild,v 1.6 2013/02/27 08:18:33 xmw Exp $
EAPI=4
@@ -20,14 +20,17 @@ DEPEND="virtual/pkgconfig
test? ( dev-libs/check )"
src_prepare() {
+ sed -e "/^CCOPT :=/s:=.*:=:" \
+ -i build/makefiles/Makefile.{gcc,clang} || die
sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-e "s:-Werror::g" \
-i Makefile || die
sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-i ${PN}.pc.in || die
- echo "Q := " >> Makefile.config.override
- echo "CC := $(tc-getCC)" >> Makefile.config.override
- echo "AR := $(tc-getAR)" >> Makefile.config.override
+
+ echo "Q := " >> Makefile.config
+ echo "CC := $(tc-getCC)" >> Makefile.config
+ echo "AR := $(tc-getAR)" >> Makefile.config
}
src_compile() {