summaryrefslogtreecommitdiff
path: root/package/MesaLib/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-12-05 10:49:13 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-12-05 10:49:13 +0100
commit26d79f5e76b17c978ee4b21e17464ea9ea2e0203 (patch)
treedd856982dccb6e46240112775ade21247d627c6a /package/MesaLib/Makefile
parent9037fba3edd4bffd403b342a1487d9bf59f25830 (diff)
parent4c93c2e27f98e0c00a101bc8b7df20b12d82f8b9 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/MesaLib/Makefile')
-rw-r--r--package/MesaLib/Makefile13
1 files changed, 8 insertions, 5 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile
index 000c3c9e5..430142eaa 100644
--- a/package/MesaLib/Makefile
+++ b/package/MesaLib/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= MesaLib
PKG_VERSION:= 7.8.2
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= c89b63d253605ed40e8ac370d25a833c
PKG_DESCR:= MESA library
PKG_SECTION:= libs
@@ -21,7 +21,6 @@ PKGSC_GLXINFO:= x11/apps
PKGSD_GLXGEARS:= Nice little OpenGL demo application
PKGSC_GLXGEARS:= x11/apps
-PKG_HOST_DEPENDS:= !cygwin !darwin
PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el
WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION}
@@ -43,9 +42,9 @@ CONFIGURE_ARGS+= --disable-static \
--with-dri-drivers=${DRI_DRIVERS},swrast \
--with-demos=xdemos
-XAKE_FLAGS+= HOST_CC=${HOSTCC}
+XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_TOOLS}/bin/glslcompile
-pre-configure:
+post-extract:
(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
./configure \
--disable-static \
@@ -56,9 +55,13 @@ pre-configure:
${MAKE} -C ${WRKBUILD}/src/glsl
${MAKE} -C ${WRKBUILD}/src/glsl/apps
${CP} ${WRKBUILD}/src/glsl/apps/compile \
- ${STAGING_TOOLS}/bin
+ ${STAGING_TOOLS}/bin/glslcompile
${MAKE} -C ${WRKBUILD}/src/glsl clean
+pre-configure:
+ $(SED) "s#@@RANLIB@@#${TARGET_CROSS}ranlib#" ${WRKBUILD}/configs/default
+ $(SED) "s#@@AR@@#${TARGET_CROSS}ar#" ${WRKBUILD}/configs/default
+
post-install:
$(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri
$(CP) $(WRKINST)/usr/lib/libGL*.so* \