Changeset 57789 in vbox for trunk

Timestamp:

Sep 16, 2015 3:59:29 PM (9 years ago)

Author:

vboxsync

Message:

Installer/linux: support building RPMs without VBoxSDL.

Location:

trunk

Files:

• configure (modified) (3 diffs)
• src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec (modified) (3 diffs)
• src/VBox/Installer/linux/rpm/rules (modified) (2 diffs)

trunk/configure

@@ -1135 +1135 @@
     fi
   else
-    log_failure "SDL not found"
+    log_failure "SDL not found (can be disabled using --disable-sdl)"
     fail
   fi
@@ -2514 +2514 @@
       WITH_LIBVPX=0
       ;;
+    --disable-vboxsdl)
+      WITH_SDL=0
+      ;;
     --build-debug|-d)
       BUILD_TYPE=debug
@@ -2721 +2724 @@
   [ "$OS" != "darwin"  ] && check_png
   [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
-  [ $WITH_SDL -eq 1 ]    && check_sdl
+  if [ $WITH_SDL -eq 1 ]; then
+    check_sdl
+  else
+    cnf_append "VBOX_WITH_VBOXSDL" ""
+  fi
   [ $WITH_SDL_TTF -eq 1 -a $OSE -eq 0 ] && check_sdl_ttf
   [ $WITH_X11    -eq 1 ] && check_x

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -116 +116 @@
 rmdir icons
 mv virtualbox.xml $RPM_BUILD_ROOT/usr/share/mime/packages
-for i in VBoxManage VBoxSVC VBoxSDL VirtualBox VBoxHeadless VBoxDTrace VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart vbox-img; do
+for i in VBoxManage VBoxSVC VirtualBox VBoxHeadless VBoxDTrace VBoxExtPackHelperApp VBoxBalloonCtrl VBoxAutostart vbox-img; do
   mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 if %WEBSVC%; then
@@ -122 +122 @@
     mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 fi
-for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do
+test -f VBoxSDL && mv VBoxSDL $RPM_BUILD_ROOT/usr/lib/virtualbox
+for i in VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetNAT VBoxNetAdpCtl; do
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done
 if [ -f $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxVolInfo ]; then
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxVolInfo
 fi
+test -f VBoxSDL && chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxSDL
 if [ -d ExtensionPacks/VNC ]; then
   mv ExtensionPacks/VNC $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks
@@ -183 +185 @@
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxManage
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxmanage
-ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxSDL
-ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxsdl
+test -f VBoxSDL && ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxSDL
+test -f VBoxSDL && ln -s VBox $RPM_BUILD_ROOT/usr/bin/vboxsdl
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxVRDP
 ln -s VBox $RPM_BUILD_ROOT/usr/bin/VBoxHeadless

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

@@ -24 +24 @@
 #  NOMODS=1         don't build any module
 #  NOQT=1           don't build the Qt GUI
+#  NOSDL=1          don't build VBoxSDL
 #  EFI=1            include the EFI binary from prebuild
 #  VERSUFFIX=<suffix> set a particular package version suffix (e.g. _customer)
@@ -145 +146 @@
 
 cfg_flags := $(if $(NOQT),--disable-qt,) \
+             $(if $(NOSDL),--disable-vboxsdl,) \
              $(if $(filter sles10.1,$(rpmrel)),--build-libxml2,) \
              $(if $(filter el5 el6 sles10.1 sles11.0 mdv2011.0,$(rpmrel)),--build-libvpx,) \