linux

Timestamp:

Feb 22, 2012 4:14:36 PM (13 years ago)

Author:

vboxsync

Message:

configure/rpm/deb: fix for r76165 (always build libssl for the extpack)

Location:

trunk/src/VBox/Installer/linux

Files:

trunk/src/VBox/Installer/linux/debian/LocalConfig.kmk

r38386	r40217
31	31	VBOX_PATH_APP_DOCS = $(VBOX_PATH_PACKAGE_DOCS)
32	32
33		~~# only relevant for non-OSE builds: don't build the PUEL package~~
34		~~VBOX_WITH_EXTPACK_PUEL_BUILD :=~~

-              r39358
+              r40217
              $(if $(DEBUG),--build-debug,) \
              $(if $(NOWINE),,--setup-wine) \
+             $(if $(NOWEBSVC),,--enable-webservice)
+             $(if $(NOWEBSVC),,--enable-webservice) \
+             --disable-extpack
 bld_flags := AUTOCFG=$(current)/debian/AutoConfig.kmk \

r38386	r40217
32	32	# gcc 4.5 produces some more false positives
33	33	VBOX_WITH_WARNINGS_AS_ERRORS :=
34
35		~~# only relevant for non-OSE builds: don't build the PUEL package~~
36		~~VBOX_WITH_EXTPACK_PUEL_BUILD :=~~

-              r39358
+              r40217
              $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5,$(rpmrel)),--enable-pulse,) \
              $(if $(filter rhel4 rhel5 ol4 ol5 centos4 centos5 sles10.1 turbolinux11,$(rpmrel)),--with-qt4-dir=/home/vbox/Qt-4.7.4-stdc++6-$(arch)) \
+             $(if $(DEBUG),--build-debug,)
+             $(if $(DEBUG),--build-debug,) \
+             --disable-extpack
 bld_flags := AUTOCFG=$(current)/rpm/AutoConfig.kmk \

Note: See TracChangeset for help on using the changeset viewer.