diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:25:35 +0200 |
| commit | 98b7adfbd06f0f6bd99ca4805ca34250ee027fa1 (patch) | |
| tree | a68345ba8ba7ee532e4b7426cadad31d7add24c0 /package/MesaLib/Makefile | |
| parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
| parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/MesaLib/Makefile')
| -rw-r--r-- | package/MesaLib/Makefile | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 008c4eb4f..e69d274cf 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= MesaLib PKG_VERSION:= 8.0.5 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= cda5d101f43b8784fa60bdeaca4056f2 PKG_DESCR:= MESA library PKG_SECTION:= libs @@ -15,10 +15,7 @@ PKG_BUILDDEP+= dri2proto glproto expat libXext PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ PKG_NEED_CXX:= 1 - -PKG_SUBPKGS:= MESALIB MESALIB_DEV -PKGSD_MESALIB_DEV:= MESA headers -PKGSC_MESALIB_DEV:= devel +PKG_OPTS:= dev PKG_ARCH_DEPENDS:= x86 x86_64 mips mipsel mips64 mips64el arm @@ -26,8 +23,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,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) XAKE_FLAGS+= GCC_HONOUR_COPTS=s @@ -76,12 +72,4 @@ ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) ${IDIR_MESALIB}/usr/lib/dri/ endif -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 |