forked from pool/virtualbox
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
|
--- VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
|
||
|
|
+++ VirtualBox-4.0.0_OSE/src/libs/xpcom18a4/Makefile.kmk
|
||
|
|
@@ -469,9 +469,11 @@
|
||
|
|
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)
|
||
|
|
xpidl_LDFLAGS = \
|
||
|
|
- $(libIDL_config_libs)
|
||
|
|
+ $(shell pkg-config --libs-only-L libIDL-2.0)
|
||
|
|
+xpidl_LIBS.linux = \
|
||
|
|
+ $(shell pkg-config --libs-only-l libIDL-2.0 | sed -e 's/-l//g')
|
||
|
|
xpidl_LDFLAGS.linux = \
|
||
|
|
$(VBOX_LD_as_needed)
|
||
|
|
endif
|
||
|
|
--- VirtualBox-4.0.0_OSE/Config.kmk
|
||
|
|
+++ VirtualBox-4.0.0_OSE/Config.kmk
|
||
|
|
@@ -4082,7 +4082,7 @@
|
||
|
|
TEMPLATE_VBOXBLDPROG_LDFLAGS.amd64 = -m64
|
||
|
|
TEMPLATE_VBOXBLDPROG_LDFLAGS.sparc64 = -m64
|
||
|
|
ifeq ($(KBUILD_HOST),linux)
|
||
|
|
-TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl
|
||
|
|
+TEMPLATE_VBOXBLDPROG_LIBS = pthread m rt dl crypt
|
||
|
|
else ifeq ($(KBUILD_HOST),os2)
|
||
|
|
TEMPLATE_VBOXBLDPROG_TOOL = GXX3OMF
|
||
|
|
TEMPLATE_VBOXBLDPROG_LIBS = socket iconv
|