diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
| commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
| tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/MesaLib | |
| parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
| parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/MesaLib')
| -rw-r--r-- | package/MesaLib/Makefile | 10 | ||||
| -rw-r--r-- | package/MesaLib/patches/patch-configs_default | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 430142eaa..6e752a8da 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -21,7 +21,7 @@ PKGSC_GLXINFO:= x11/apps PKGSD_GLXGEARS:= Nice little OpenGL demo application PKGSC_GLXGEARS:= x11/apps -PKG_TARGET_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el +PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} @@ -31,7 +31,7 @@ $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D $(eval $(call PKG_template,GLXINFO,glxinfo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXINFO},${PKGSC_GLXINFO})) $(eval $(call PKG_template,GLXGEARS,glxgears,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLXGEARS},${PKGSC_GLXGEARS})) -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif @@ -42,7 +42,7 @@ CONFIGURE_ARGS+= --disable-static \ --with-dri-drivers=${DRI_DRIVERS},swrast \ --with-demos=xdemos -XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_TOOLS}/bin/glslcompile +XAKE_FLAGS+= HOST_CC=${HOSTCC} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -55,7 +55,7 @@ post-extract: ${MAKE} -C ${WRKBUILD}/src/glsl ${MAKE} -C ${WRKBUILD}/src/glsl/apps ${CP} ${WRKBUILD}/src/glsl/apps/compile \ - ${STAGING_TOOLS}/bin/glslcompile + ${STAGING_HOST_DIR}/bin/glslcompile ${MAKE} -C ${WRKBUILD}/src/glsl clean pre-configure: @@ -66,7 +66,7 @@ post-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib -ifeq (${ADK_HARDWARE_IBM_X40},y) +ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ endif diff --git a/package/MesaLib/patches/patch-configs_default b/package/MesaLib/patches/patch-configs_default index e1fb0b669..f954d9831 100644 --- a/package/MesaLib/patches/patch-configs_default +++ b/package/MesaLib/patches/patch-configs_default @@ -5,7 +5,7 @@ # Misc tools and flags SHELL = /bin/sh -MKLIB = $(SHELL) $(TOP)/bin/mklib -+MKLIB = env RANLIB=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ranlib AR=/Volumes/adk/openadk/cross_x86_glibc/host/bin/i686-openadk-linux-gnu-ar $(SHELL) $(TOP)/bin/mklib ++MKLIB = env RANLIB=$(RANLIB) AR=$(AR) $(SHELL) $(TOP)/bin/mklib MKLIB_OPTIONS = MKDEP = makedepend MKDEP_OPTIONS = -fdepend |