diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 14:21:25 +0100 |
| commit | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (patch) | |
| tree | 8d0d6a6026aa6c0a7b5bbd777ef9ed65f916fa78 /package/MesaLib | |
| parent | 1dbfbd6e0c5c2738f2f8d3b9b8ff0a3a9dc4e529 (diff) | |
| parent | 67cb0759e674470fa53fd3711d8460fd4a12c1a3 (diff) | |
resolve xterm Makefile conflict
Diffstat (limited to 'package/MesaLib')
| -rw-r--r-- | package/MesaLib/Makefile | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 97ee10c19..3ad50203f 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -16,7 +16,9 @@ PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.2/ PKG_NEED_CXX:= 1 -PKG_SUBPKGS:= MESALIB GLXINFO GLXGEARS +PKG_SUBPKGS:= MESALIB MESALIB_DEV GLXINFO GLXGEARS +PKGSD_MESALIB_DEV:= MESA headers +PKGSC_MESALIB_DEV:= devel PKGSD_GLXINFO:= Display various GLX information PKGSC_GLXINFO:= x11/apps PKGSD_GLXGEARS:= Nice little OpenGL demo application @@ -29,6 +31,7 @@ WRKDIST= ${WRKDIR}/Mesa-${PKG_VERSION} include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,MESALIB_DEV,mesalib-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MESALIB_DEV},${PKGSC_MESALIB_DEV})) $(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})) @@ -44,6 +47,9 @@ CONFIGURE_ARGS+= --disable-static \ --with-demos=xdemos XAKE_FLAGS+= HOST_CC=${CC_FOR_BUILD} GLSL_CL=${STAGING_HOST_DIR}/bin/glslcompile +ifeq ($(ADK_NATIVE),y) +XAKE_FLAGS+= RANLIB=ranlib AR=ar +endif post-extract: (cd ${WRKBUILD}; rm -rf config.{cache,status}; \ @@ -59,25 +65,33 @@ post-extract: ${STAGING_HOST_DIR}/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: +mesalib-install: $(INSTALL_DIR) $(IDIR_MESALIB)/usr/lib/dri $(CP) $(WRKINST)/usr/lib/libGL*.so* \ $(IDIR_MESALIB)/usr/lib + ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ + ${IDIR_MESALIB}/usr/lib/dri/ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${CP} $(WRKINST)/usr/lib/dri/i915_dri.so \ ${IDIR_MESALIB}/usr/lib/dri/ endif - ${CP} $(WRKINST)/usr/lib/dri/swrast_dri.so \ - ${IDIR_MESALIB}/usr/lib/dri/ + +glxinfo-install: ${INSTALL_DIR} ${IDIR_GLXINFO}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxinfo \ ${IDIR_GLXINFO}/usr/bin/ + +glxgears-install: ${INSTALL_DIR} ${IDIR_GLXGEARS}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/progs/xdemos/glxgears \ ${IDIR_GLXGEARS}/usr/bin/ +mesalib-dev-install: + $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/include + ${CP} ${WRKINST}/usr/include/* \ + $(IDIR_MESALIB_DEV)/usr/include + $(INSTALL_DIR) $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig + ${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \ + $(IDIR_MESALIB_DEV)/usr/lib/pkgconfig + include ${TOPDIR}/mk/pkg-bottom.mk |