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/pango/Makefile | |
parent | 09d28322f4828a387eeee03d303c833eab8828c5 (diff) | |
parent | 32a82e38679501da738199135b35f93ddc8aca0a (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/pango/Makefile')
-rw-r--r-- | package/pango/Makefile | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/package/pango/Makefile b/package/pango/Makefile index aae4d4dd4..b89fc7f18 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pango PKG_VERSION:= 1.28.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 22ad1c8d3fda7e73b0798035f3dd96bc PKG_DESCR:= pango library PKG_SECTION:= libs @@ -13,21 +13,19 @@ PKG_BUILDDEP:= libXft glib cairo libstdcxx fontconfig PKG_URL:= http://www.pango.org/ PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.28/} PKG_NEED_CXX:= 1 +PKG_OPTS:= dev -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +PKG_ARCH_DEPENDS:= !m68k -PKG_SUBPKGS:= PANGO PANGO_DEV -PKGSC_PANGO_DEV:= devel -PKGSD_PANGO_DEV:= pango headers +#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz ifeq ($(ADK_STATIC),y) -PKG_OPTS:= libonly +PKG_OPTS+= libonly endif include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,PANGO,pango,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -$(eval $(call PKG_template,PANGO_DEV,pango-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_PANGO_DEV},${PKGSC_PANGO_DEV},${PKG_OPTS})) TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib64 -L$(STAGING_DIR)/usr/lib32 @@ -41,12 +39,4 @@ pango-install: $(CP) $(WRKINST)/usr/lib/pango/1.6.0/modules/*.so \ $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules -pango-dev-install: - $(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/include - ${CP} $(WRKINST)/usr/include/* \ - $(IDIR_PANGO_DEV)/usr/include - $(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/lib/pkgconfig - ${CP} $(WRKINST)/usr/lib/pkgconfig/*.pc \ - $(IDIR_PANGO_DEV)/usr/lib/pkgconfig - include ${TOPDIR}/mk/pkg-bottom.mk |