| 1 |
From 6ce941ea0ce50e4729b06e6ddd212f34f1e4d0d5 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Frederic Crozat <fcrozat@mandriva.com> |
| 3 |
Date: Wed, 8 Apr 2009 17:57:58 +0200 |
| 4 |
Subject: [PATCH] libpath |
| 5 |
|
| 6 |
--- VirtualBox-3.2.0_OSE/configure.orig 2010-05-05 14:15:09.000000000 +0300 |
| 7 |
+++ VirtualBox-3.2.0_OSE/configure 2010-05-22 08:37:03.621391093 +0300 |
| 8 |
@@ -112,7 +112,7 @@ |
| 9 |
GSOAP="" |
| 10 |
GSOAP_IMPORT="" |
| 11 |
INCX11="/usr/local/include" |
| 12 |
-LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11" |
| 13 |
+LIBX11="-L/usr/X11R6/{$LIBPATH_LIB:-lib} -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11" |
| 14 |
LIBXCURSOR="-lXcursor" |
| 15 |
LIBXMU="-lXmu" |
| 16 |
LIBXINERAMA="-lXinerama" |
| 17 |
@@ -2382,6 +2382,11 @@ |
| 18 |
cnf_append "VBOX_HEADLESS" "1" |
| 19 |
fi |
| 20 |
|
| 21 |
+# extra path overrides |
| 22 |
+if test -n "$LIBPATH_LIB"; then |
| 23 |
+ cnf_append "LIBPATH_LIB" "$LIBPATH_LIB" |
| 24 |
+fi |
| 25 |
+ |
| 26 |
# emit disable directives corresponding to any --disable-xxx options. |
| 27 |
if [ $WITH_OPENGL -eq 0 ]; then |
| 28 |
cnf_append "VBOX_WITH_CROGL" "" |
| 29 |
--- VirtualBox-3.2.0_OSE/kBuild/sdks/LIBSDL.kmk.orig 2009-03-13 12:40:35.000000000 +0200 |
| 30 |
+++ VirtualBox-3.2.0_OSE/kBuild/sdks/LIBSDL.kmk 2010-05-22 08:47:25.917391023 +0300 |
| 31 |
@@ -60,18 +60,12 @@ |
| 32 |
# Search in the typical unix places. |
| 33 |
ifeq ($(filter-out %64,$(KBUILD_TARGET_ARCH)),) |
| 34 |
PATH_SDK_LIBSDL := $(firstword $(wildcard \ |
| 35 |
- /lib64/libSDL.* \ |
| 36 |
- /lib/libSDL.* \ |
| 37 |
- /usr/lib64/libSDL.* \ |
| 38 |
- /usr/lib/libSDL.* \ |
| 39 |
- /usr/local/lib64/libSDL.* \ |
| 40 |
- /usr/local/lib/libSDL.* \ |
| 41 |
- /opt/lib64/libSDL.* \ |
| 42 |
- /opt/lib/libSDL.* \ |
| 43 |
- /opt/local/lib64/libSDL.* \ |
| 44 |
- /opt/local/lib/libSDL.* \ |
| 45 |
- /sw/lib64/libSDL.* \ |
| 46 |
- /sw/lib/libSDL.* \ |
| 47 |
+ /$(LIBPATH_LIB)/libSDL.* \ |
| 48 |
+ /usr/$(LIBPATH_LIB)/libSDL.* \ |
| 49 |
+ /usr/local/$(LIBPATH_LIB)/libSDL.* \ |
| 50 |
+ /opt/$(LIBPATH_LIB)/libSDL.* \ |
| 51 |
+ /opt/local/$(LIBPATH_LIB)/libSDL.* \ |
| 52 |
+ /sw/$(LIBPATH_LIB)/libSDL.* \ |
| 53 |
) ) |
| 54 |
else |
| 55 |
PATH_SDK_LIBSDL := $(firstword $(wildcard \ |
| 56 |
@@ -192,5 +186,5 @@ |
| 57 |
SDK_LIBSDL_LIBS ?= \ |
| 58 |
$(LIB_SDK_LIBSDL_SDL) |
| 59 |
SDK_LIBSDL_LIBPATH ?= \ |
| 60 |
- $(PATH_SDK_LIBSDL)/lib |
| 61 |
+ $(PATH_SDK_LIBSDL)/$(LIBPATH_LIB) |
| 62 |
endif |
Parent Directory
| 
Revision Log