summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2011-10-05 09:40:17 +0000
committerLars Wendler <polynomial-c@gentoo.org>2011-10-05 09:40:17 +0000
commit2cefd6e1bb933efd7416e2acccd041c7844666bc (patch)
tree765655bc0c18c8b73f5820c64d6d1d5f2031640a /app-emulation/virtualbox
parentFix cims -> libcims. (diff)
downloadgentoo-2-2cefd6e1bb933efd7416e2acccd041c7844666bc.tar.gz
gentoo-2-2cefd6e1bb933efd7416e2acccd041c7844666bc.tar.bz2
gentoo-2-2cefd6e1bb933efd7416e2acccd041c7844666bc.zip
Simplified asneeded patch
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/virtualbox')
-rw-r--r--app-emulation/virtualbox/ChangeLog6
-rw-r--r--app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch15
2 files changed, 5 insertions, 16 deletions
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 823d3add3762..be30570100d1 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,10 @@
# 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.85 2011/10/04 18:00:30 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.86 2011/10/05 09:40:17 polynomial-c Exp $
+
+ 05 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+ files/virtualbox-4.1.4-asneeded.patch:
+ Simplified asneeded patch. Thanks to xarthisius for reviewing the patch.
*virtualbox-4.1.4 (04 Oct 2011)
diff --git a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
index 003dc5db6978..6135aa38bcff 100644
--- a/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
+++ b/app-emulation/virtualbox/files/virtualbox-4.1.4-asneeded.patch
@@ -9,18 +9,3 @@
else ifeq ($(KBUILD_HOST),os2)
TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF
TEMPLATE_VBOXBLDPROG_LIBS = socket iconv
---- VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
-+++ VirtualBox-4.1.4_OSE/src/libs/xpcom18a4/Makefile.kmk
-@@ -469,10 +469,10 @@
- libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
- libIDL_config_libs := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
- xpidl_CFLAGS = \
-- $(libIDL_config_cflags)
-+ $(shell pkg-config --cflags libIDL-2.0)
- ifeq ($(BUILD_PLATFORM),linux)
- xpidl_LDFLAGS = \
-- $(filter-out -l%,$(libIDL_config_libs))
-+ $(filter-out -l%,$(shell pkg-config --libs-only-L libIDL-2.0))
- else
- xpidl_LDFLAGS = \
- $(libIDL_config_libs)