mesa - Move library dependencies from RDEPENDS to DEPENDS.

     - Update build config instead of using environment to override toolchain vars.
     - mklib patch for understanding -Wl linker flags.
     - mesa depends upon makedepend-native.

4 files changed, 39 insertions, 4 deletions

diff --git a/packages/mesa/files/.mtn2git_empty b/packages/mesa/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mesa/files/.mtn2git_empty
diff --git a/packages/mesa/files/mklib-rpath-link.patch b/packages/mesa/files/mklib-rpath-link.patch
new file mode 100644
index 0000000000..07361f531a
--- /dev/null
+++ b/packages/mesa/files/mklib-rpath-link.patch
@@ -0,0 +1,20 @@
+--- Mesa/bin/mklib.orig	2006-06-04 20:56:22.000000000 -0600
++++ Mesa/bin/mklib	2006-06-04 20:57:04.000000000 -0600
+@@ -98,6 +98,9 @@
+ 	-L*)
+ 	    DEPS="$DEPS $1"
+ 	    ;;
++	-Wl*)
++	    DEPS="$DEPS $1"
++	    ;;
+ 	'-cplusplus')
+ 	    CPLUSPLUS=1
+ 	    ;;
+--- Mesa/configs/default.orig	2006-06-04 21:01:47.000000000 -0600
++++ Mesa/configs/default	2006-06-04 21:01:16.000000000 -0600
+@@ -71,4 +71,4 @@
+ GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
+ GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+ GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
+-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
++APP_LIB_DEPS = -L$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/packages/mesa/mesa_6.0.1.bb b/packages/mesa/mesa_6.0.1.bb
index 7c2e7ca627..be63a32190 100644
--- a/packages/mesa/mesa_6.0.1.bb
+++ b/packages/mesa/mesa_6.0.1.bb
@@ -6,6 +6,7 @@ S = "${WORKDIR}/Mesa-${PV}"
 LICENSE = "LGPL"
 # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
 CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
+DEPENDS = "makedepend-native"
 
 do_compile() {
 	oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb
index 788b8d3cef..164f62648f 100644
--- a/packages/mesa/mesa_6.4.1+cvs20060101.bb
+++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb
@@ -3,19 +3,33 @@ SECTION = "unknown"
 SRCDATE = "20060101"
 PV = "6.4.1+cvs${SRCDATE}"
 
-SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE}"
+SRC_URI = "${FREEDESKTOP_CVS}/mesa;module=Mesa;method=pserver;date=${SRCDATE} \
+	file://mklib-rpath-link.patch;patch=1"
 S = "${WORKDIR}/Mesa"
 
 LICENSE = "LGPL"
 
-RDEPENDS = "expat libx11 libxext libxxf86vm libxi libxmu libice"
-DEPENDS = "xf86vidmodeproto glproto"
+RDEPENDS = "expat" 
+DEPENDS = "makedepend-native xf86vidmodeproto glproto libx11 libxext libxxf86vm libxi libxmu libice"
 
 # gcc-3.4 blows up in gtktext with -frename-registers on arm-linux
 CXXFLAGS := "${@'${CXXFLAGS}'.replace('-frename-registers', '')}"
 
+do_configure() {
+	cd configs
+
+	ln -sf linux current
+	sed -e "s%CC *= *.*%CC = ${CC}%" -i current
+	sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
+	sed -e "s%LD *= *.*%LD = ${LD}%" -i current
+	sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current
+	sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current
+	sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current
+	echo "SRC_DIRS = mesa glu glut/glx" >> current
+}
+
 do_compile() {
-	oe_runmake linux CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LD="${LD}" LDFLAGS="${LDFLAGS}"
+	oe_runmake default
 }
 
 do_install() {