fix MesaLib cross-compile

4 files changed, 29 insertions, 27 deletions

diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 9d673613f..d5ce04b77 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -11,7 +11,7 @@ PKG_DESCR:=		MESA library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxdamage libxfixes libdrm
 PKG_BUILDDEP+=		libXdamage libXfixes libXxf86vm libdrm 
-PKG_BUILDDEP+=		dri2proto glproto
+PKG_BUILDDEP+=		dri2proto glproto expat
 PKG_URL:=		http://www.mesa3d.org/
 PKG_SITES:=		ftp://ftp.freedesktop.org/pub/mesa/7.8.1/
 
@@ -25,10 +25,27 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-gallium \
+			--disable-glw \
+			--with-driver=dri \
 			--without-demos
 
 XAKE_FLAGS+=		APP_CC=${HOSTCC} HOST_CC=${HOSTCC}
 
+pre-configure:
+	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
+		./configure \
+		--disable-static \
+		--disable-glw \
+		--disable-gallium \
+		--with-driver=xlib \
+		--without-demos \
+	);
+	${MAKE} -C ${WRKBUILD}/src/glsl
+	${MAKE} -C ${WRKBUILD}/src/glsl/apps
+	cp ${WRKBUILD}/src/glsl/apps/compile \
+		${STAGING_TOOLS}/bin
+	${MAKE} -C ${WRKBUILD}/src/glsl clean
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib
 	$(INSTALL_BIN) $(WRKINST)/usr/lib/libGL*.so* \
diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile b/package/MesaLib/patches/patch-src_glsl_Makefile
new file mode 100644
index 000000000..baa023db4
--- /dev/null
+++ b/package/MesaLib/patches/patch-src_glsl_Makefile
@@ -0,0 +1,11 @@
+--- Mesa-7.8.1.orig/src/glsl/Makefile	2010-04-05 01:46:26.000000000 +0200
++++ Mesa-7.8.1/src/glsl/Makefile	2010-05-21 17:17:54.621613561 +0200
+@@ -4,7 +4,7 @@ TOP = ../..
+ 
+ include $(TOP)/configs/current
+ 
+-SUBDIRS = pp cl apps
++SUBDIRS = pp cl
+ 
+ default install clean:
+ 	@for dir in $(SUBDIRS) ; do \
diff --git a/package/MesaLib/patches/patch-src_glsl_Makefile_template b/package/MesaLib/patches/patch-src_glsl_Makefile_template
deleted file mode 100644
index bcb3256d6..000000000
--- a/package/MesaLib/patches/patch-src_glsl_Makefile_template
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mesa-7.8.1.orig/src/glsl/Makefile.template	2010-04-05 01:46:26.000000000 +0200
-+++ Mesa-7.8.1/src/glsl/Makefile.template	2010-04-19 21:18:45.000000000 +0200
-@@ -44,7 +44,7 @@ install:
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
-+	$(HOST_CC) -c $(INCLUDES) $(CFLAGS) $(LIBRARY_DEFINES) $< -o $@
- 
- -include depend
- 
diff --git a/package/MesaLib/patches/patch-src_glsl_apps_Makefile b/package/MesaLib/patches/patch-src_glsl_apps_Makefile
deleted file mode 100644
index 175965dc5..000000000
--- a/package/MesaLib/patches/patch-src_glsl_apps_Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Mesa-7.8.1.orig/src/glsl/apps/Makefile	2010-04-05 01:46:26.000000000 +0200
-+++ Mesa-7.8.1/src/glsl/apps/Makefile	2010-04-19 21:20:55.000000000 +0200
-@@ -26,10 +26,10 @@ INCLUDES = -I.
- .SUFFIXES: .c
- 
- .c:
--	$(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
-+	$(APP_CC) $(HOSTCFLAGS) $< $(LIBS) -o $@
- 
- .c.o:
--	$(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-+	$(APP_CC) -c $(HOSTCFLAGS) $(DEFINES) $< -o $@
- 
- 
- ##### TARGETS #####