Changeset 45772 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Apr 26, 2013 11:58:45 AM (12 years ago)

Author:

vboxsync

Message:

VPX: allow to build against libvpx provided by the build system

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (2 diffs)
• debian/rules (modified) (1 diff)
• rpm/rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -146 +146 @@
         VBoxHostChannel.so \
         $(if $(VBOX_WITH_DRAG_AND_DROP),VBoxDragAndDropSvc.so,) \
-        $(if $(VBOX_WITH_VPX),VBoxVPX.so,) \
         $(if $(VBOX_WITH_MAIN), \
                 VBoxAutostart \
@@ -175 +174 @@
         helpers/generate_service_file
 
+if defined(VBOX_WITH_VPX) && ("$(SDK_VBOX_VPX_LIBS)" == "$(SDK_VBOX_VPX_DEFAULT_LIBS)")
+ VBOX_LNX_STRIP_BIN += VBoxVPX.so
+endif
+
 # Do not remove relocation information of these binaries
 VBOX_LNX_STRIP_OBJ = \

trunk/src/VBox/Installer/linux/debian/rules

@@ -97 +97 @@
              $(if $(filter _Ubuntu_hardy _Debian_lenny,$(debrel)),--with-qt4-dir=$(qtstdc6)) \
              $(if $(filter _Ubuntu_hardy,$(debrel)),--build-libcurl,) \
+             $(if $(filter _Ubuntu_hardy,$(debrel)),--build-libvpx,) \
              $(if $(ose),--ose,) $(if $(LINUX),--with-linux=$(LINUX),) \
              $(if $(HEADLESS),--build-headless,) \

trunk/src/VBox/Installer/linux/rpm/rules

@@ -134 +134 @@
 cfg_flags := $(if $(NOQT),--disable-qt,) \
              $(if $(filter el4 sles10.1,$(rpmrel)),--build-libxml2,) \
+             $(if $(filter el4 el5 el6,$(rpmrel)),--build-libvpx,) \
              $(if $(filter el4,$(rpmrel)),--build-libssl,) \
              $(if $(filter el4 el5 ol4 ol5 centos4 centos5 sles10.1 sles11.0,$(rpmrel)),--build-libcurl,) \