File VirtualBox-2.1.2-libpath.patch of Package virtualbox-ose

Overview Repositories Revisions Requests Users Attributes Meta

File VirtualBox-2.1.2-libpath.patch of Package virtualbox-ose (Revision 2bb763839c50d07ffa8a4b929b074f95)

Currently displaying revision 2bb763839c50d07ffa8a4b929b074f95 , Show latest

--- VirtualBox-2.1.2_OSE/configure.libpath	2009-01-21 16:07:11.000000000 +0100
+++ VirtualBox-2.1.2_OSE/configure	2009-01-22 05:54:25.000000000 +0100
@@ -85,7 +85,7 @@
 LIBPTHREAD="-lpthread"
 LIBCAP="-lcap"
 GSOAP=""
-LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
+LIBX11="-L/usr/X11R6/${LIBPATH_LIB:-lib} -L/usr/local/lib -lXext -lX11"
 INCX11="/usr/local/include"
 LIBXCURSOR="-lXcursor"
 INCZ=""
@@ -1215,7 +1215,7 @@
       echo "compiling the following source file:" >> $LOG
       cat .tmp_src.cc >> $LOG
       echo "using the following command line:" >> $LOG
-      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD" >> $LOG
+      echo "$CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/${LIBPATH_LIB:-lib} -lqt-mt $LIBPTHREAD" >> $LOG
       $CXX -O -Wall -o .tmp_out .tmp_src.cc -I$q/include -L$q/$l -lqt-mt $LIBPTHREAD >> $LOG 2>&1
       if [ $? -eq 0 ]; then
         if test_execute; then
@@ -2013,6 +2013,11 @@
   cnf_append "VBOX_HEADLESS" "1"
 fi
 
+# extra path overrides
+if test -n "$LIBPATH_LIB"; then
+  cnf_append "LIBPATH_LIB" "$LIBPATH_LIB"
+fi
+
 if [ "$OS" = "darwin" ]; then
   # On Darwin we want to build against Qt4 only. WITH_QT4 is enabled by
   # default so disable Qt3. --disable-qt disables both Qt3 and Qt4 GUI now,
--- VirtualBox-2.1.2/kBuild/sdks/LIBSDL.kmk.libpath	2008-12-13 23:00:26.000000000 +0100
+++ VirtualBox-2.1.2/kBuild/sdks/LIBSDL.kmk	2008-12-17 17:36:50.000000000 +0100
@@ -60,18 +60,12 @@ ifndef PATH_SDK_LIBSDL
    # Search in the typical unix places.
    ifeq ($(filter-out %64,$(KBUILD_TARGET_ARCH)),)
     PATH_SDK_LIBSDL := $(firstword $(wildcard \
-	/lib64/libSDL.* \
-	/lib/libSDL.* \
-	/usr/lib64/libSDL.* \
-	/usr/lib/libSDL.* \
-	/usr/local/lib64/libSDL.* \
-	/usr/local/lib/libSDL.* \
-	/opt/lib64/libSDL.* \
-	/opt/lib/libSDL.* \
-	/opt/local/lib64/libSDL.* \
-	/opt/local/lib/libSDL.* \
-	/sw/lib64/libSDL.* \
-	/sw/lib/libSDL.* \
+ 	/$(LIBPATH_LIB)/libSDL.* \
+ 	/usr/$(LIBPATH_LIB)/libSDL.* \
+ 	/usr/local/$(LIBPATH_LIB)/libSDL.* \
+ 	/opt/$(LIBPATH_LIB)/libSDL.* \
+ 	/opt/local/$(LIBPATH_LIB)/libSDL.* \
+ 	/sw/$(LIBPATH_LIB)/libSDL.* \
 	) )
    else
     PATH_SDK_LIBSDL := $(firstword $(wildcard \
@@ -192,5 +186,5 @@ else # ASSUMES Unix like system
  SDK_LIBSDL_LIBS ?= \
 	$(LIB_SDK_LIBSDL_SDL)
  SDK_LIBSDL_LIBPATH ?= \
- 	$(PATH_SDK_LIBSDL)/lib
+ 	$(PATH_SDK_LIBSDL)/$(LIBPATH_LIB)
 endif

Places

File VirtualBox-2.1.2-libpath.patch of Package virtualbox-ose (Revision 2bb763839c50d07ffa8a4b929b074f95)

Places