From c4142342ee8c3dc5ab0a1fcb64ddf4124825ab06 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 14:32:33 +0200
Subject: disable m68k builds

---
 package/pango/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'package/pango/Makefile')

diff --git a/package/pango/Makefile b/package/pango/Makefile
index aae4d4dd4..2e41b17bc 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -14,6 +14,8 @@ PKG_URL:=		http://www.pango.org/
 PKG_SITES:=		${MASTER_SITE_GNOME:=pango/1.28/}
 PKG_NEED_CXX:=		1
 
+PKG_ARCH_DEPENDS:=	!m68k
+
 #DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_SUBPKGS:=		PANGO PANGO_DEV
-- 
cgit v1.2.3


From 90d5c8b73e8d538e121275b12e714332ca785cff Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 21 Oct 2013 17:20:24 +0200
Subject: automatically create development subpackages, without user
 interaction, depend on gcc for the target, simplifies a lot of library
 packages

---
 package/pango/Makefile | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'package/pango/Makefile')

diff --git a/package/pango/Makefile b/package/pango/Makefile
index aae4d4dd4..e84d667d9 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,17 @@ 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_SUBPKGS:=		PANGO PANGO_DEV
-PKGSC_PANGO_DEV:=	devel
-PKGSD_PANGO_DEV:=	pango headers
-
 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 +37,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
-- 
cgit v1.2.3