summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-01-07 18:42:22 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-01-07 18:42:22 +0000
commitc2cb0d8f86fa29092f6dad6fdad10944da1d1dc3 (patch)
treefed98d3030be981edefb4996c41175519391a645 /app-emulation
parentVersion bump. (diff)
downloadhistorical-c2cb0d8f86fa29092f6dad6fdad10944da1d1dc3.tar.gz
historical-c2cb0d8f86fa29092f6dad6fdad10944da1d1dc3.tar.bz2
historical-c2cb0d8f86fa29092f6dad6fdad10944da1d1dc3.zip
Respect LDFLAGS properly
Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virtualbox/ChangeLog5
-rw-r--r--app-emulation/virtualbox/Manifest4
-rw-r--r--app-emulation/virtualbox/virtualbox-4.0.0.ebuild12
3 files changed, 13 insertions, 8 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 80ba3c5774ee..6b658e425278 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/virtualbox
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.50 2011/01/07 18:16:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.51 2011/01/07 18:42:22 polynomial-c Exp $
+
+ 07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.0.0.ebuild:
+ Respect LDFLAGS properly. Thanks to xarthisius for providing a feasible fix.
07 Jan 2011; Lars Wendler <polynomial-c@gentoo.org>
virtualbox-3.2.12-r3.ebuild, virtualbox-3.2.12-r4.ebuild,
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index e60189680d66..c24d4f7ae3db 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -22,7 +22,7 @@ DIST VirtualBox-4.0.0.tar.bz2 70279717 RMD160 8cfce949fc8fc3fccdcb46781fd1d861f3
EBUILD virtualbox-3.1.8.ebuild 8384 RMD160 9ad6a4cc9673d2da3ed6a63018dcab0fb6a42cf7 SHA1 e40823ab16a6d3f1df4e1e69d732947b7d59b782 SHA256 10c25aa08345cbb205048385ee012264f0424f2ccb6ccc170d4b3d39bf7619ef
EBUILD virtualbox-3.2.12-r3.ebuild 9407 RMD160 3584b759ec434d196040c82d1c2b72fd79088ea9 SHA1 7143669f9152db1696ff76cf5a40374813ee61e4 SHA256 d2dfc980457dea4627d98eaac670eb0c2e0a8a0ed02dcbe3ef2cc21ea55a4668
EBUILD virtualbox-3.2.12-r4.ebuild 9666 RMD160 bc93534a444722721e98e9167bae7e49818d8906 SHA1 f15380cc7c20b91006f391558135e798887af278 SHA256 d3adf4458c9fb2cec6d6166378c8d516ae80075104b5237867ba9a1dc75ba8bb
-EBUILD virtualbox-4.0.0.ebuild 10328 RMD160 5e94cf30913cc68317fc7296793f2e4c1cb254ee SHA1 66962da7afda984b88feff38e3dfc9fecae46565 SHA256 104eaec09d5d95a156191078b0a447c9d6e07d1f9e60896272a943777443b808
+EBUILD virtualbox-4.0.0.ebuild 10372 RMD160 925d35d1eeb992c9a50c0653fbe0cde8ff16c4f7 SHA1 41f879b3c223d28c909cfda2f6da693f12f6a371 SHA256 8765bb38589b4ba73ead2e55764ec827d65a88c1e04c2ec727cc2803c51ae8b1
EBUILD virtualbox-9999.ebuild 5623 RMD160 3e3eeabc7dfcddc0583974335494f51b23c8327b SHA1 fcc07a44770a14802e337c9ff2a87f19b2d149f3 SHA256 301e900d619a1fd9c9e38793671fb0ab843c2d973bda2612e64e34c1fdbf3c8d
-MISC ChangeLog 1972 RMD160 f03abdc000f0b59e77d9dee49098da9dd0e76c6b SHA1 78254d6c4952fbb47efcf0199804318a30f2b71b SHA256 e55d6054cc7515ee3c59dea0eebf9d63043aaa86b306495bc0b901903ac27aab
+MISC ChangeLog 2131 RMD160 104c1e1dd6facf421d34545dee61d5149fc21ee3 SHA1 81df6021829926fa5d05f60bf4686b643779e885 SHA256 f7664e0dd81ef23977d2e37cfa9c0837193132a7ec89c5d48e82ba8f63795d8a
MISC metadata.xml 787 RMD160 ba43b02e20c2649a3bfb0dbf1b7d8ce30d5c0beb SHA1 6efd8b7802c97c203b8be8154bb2913cd3e24266 SHA256 9250eb6045eadd27afda974481dbea721de9f5d5157dddc3f0786ba2fcc98d21
diff --git a/app-emulation/virtualbox/virtualbox-4.0.0.ebuild b/app-emulation/virtualbox/virtualbox-4.0.0.ebuild
index 7344fa2d7866..0201a0bd38de 100644
--- a/app-emulation/virtualbox/virtualbox-4.0.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.0.ebuild,v 1.4 2011/01/07 11:16:33 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.0.0.ebuild,v 1.5 2011/01/07 18:42:22 polynomial-c Exp $
EAPI=2
@@ -132,16 +132,18 @@ src_prepare() {
sed -e "s/MY_LIBDIR/$(get_libdir)/" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
- # unset useless/problematic mesa checks in configure
+ # unset useless/problematic checks in configure
epatch "${FILESDIR}/${PN}-ose-3.2.8-mesa-check.patch"
- # unset useless makeself checks in configure
epatch "${FILESDIR}/${PN}-4-makeself-check.patch"
- # unset useless mkisofs checks in configure
epatch "${FILESDIR}/${PN}-4-mkisofs-check.patch"
- # fix build with --as-needed (bug #249295)
+ # fix build with --as-needed (bug #249295 and bug #350907)
epatch "${FILESDIR}/${PN}-4-asneeded.patch"
+ # Respect LDFLAGS
+ sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die
+
# add the --enable-vnc option to configure script (bug #348204)
epatch "${FILESDIR}/${PN}-4-vnc.patch"