From 0ed8c5474b6d5033fef536500cfc4d64c6debc66 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Feb 2011 13:37:24 +0100
Subject: update to latest upstream version

 * fix compile for cris architecture
 * fix compile under Cygwin. A full glib host build is
   required for glib-compile-schema and glib-genmarshal
---
 package/glib/Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'package/glib/Makefile')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 3c8045392..d3b4dbd9b 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.27.5
+PKG_VERSION:=		2.28.1
+PKG_EXTRAVER:=		2.28
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ad9c80adb624a1ffe3d9753bab8a578a
+PKG_MD5SUM:=		9f6e85e1e38490c3956f4415bcd33e6e
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libintl libiconv libpthread
 PKG_BUILDDEP:=		gettext libiconv
 PKG_URL:=		http://www.gtk.org/
-PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/2.27/
+PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
@@ -39,15 +40,9 @@ pre-configure:
 ifneq ($(OStype),Darwin)
 	(cd ${WRKBUILD}; rm -rf config.{cache,status}; \
 		./configure --prefix=$(STAGING_HOST_DIR) \
-			--with-libiconv=gnu \
-			--enable-debug=no \
-			--with-threads=posix \
 	);
-	env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}/glib
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gthread
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gio glib-compile-schemas
-	env CFLAGS="-static" LDFLAGS="-static" ${MAKE} -C ${WRKBUILD}/gobject glib-genmarshal
-	$(CP) ${WRKBUILD}/gio/glib-compile-schemas ${STAGING_HOST_DIR}/bin
+	env CFLAGS="-static" LDFLAGS="-static -liconv" ${MAKE} -C ${WRKBUILD}
+	$(CP) ${WRKBUILD}/gio/.libs/glib-compile-schemas ${STAGING_HOST_DIR}/bin
 	$(CP) ${WRKBUILD}/gobject/.libs/glib-genmarshal ${STAGING_HOST_DIR}/bin
 	${MAKE} -C ${WRKBUILD} clean
 endif
-- 
cgit v1.2.3


From 0aabef127155575e8c8d660605f9401ab15356aa Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 24 Feb 2011 17:41:36 +0100
Subject: allow native build of a lot of packages

STAGING_TARGET_DIR is used for package Makefile's for
include and library search path's. STAGING_DIR is used
for common code in mk/ or Makefile/rules.mk.
STAGING_TARGET_DIR is /usr when native builds are used.
---
 package/glib/Makefile | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'package/glib/Makefile')

diff --git a/package/glib/Makefile b/package/glib/Makefile
index 3c8045392..807303ca1 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		glib
 PKG_VERSION:=		2.27.5
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ad9c80adb624a1ffe3d9753bab8a578a
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
@@ -14,13 +14,18 @@ PKG_BUILDDEP:=		gettext libiconv
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/glib/2.27/
 
+PKG_SUBPKGS:=		GLIB GLIB_DEV
+PKGSC_GLIB_DEV:=	devel
+PKGSD_GLIB_DEV:=	glib headers
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIB,glib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,GLIB_DEV,glib-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_GLIB_DEV},${PKGSC_GLIB_DEV},${PKG_OPTS}))
 
 CONFIGURE_ARGS+=	--enable-debug=no \
 			--disable-mem-pools \
@@ -52,7 +57,7 @@ ifneq ($(OStype),Darwin)
 	${MAKE} -C ${WRKBUILD} clean
 endif
 
-post-install:
+glib-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libglib*.so* ${IDIR_GLIB}/usr/lib
@@ -60,4 +65,15 @@ post-install:
 	${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib
 
+glib-dev-install:
+	${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include
+	${CP} ${WRKINST}/usr/lib/glib-2.0/include/glibconfig.h \
+		${IDIR_GLIB_DEV}/usr/lib/glib-2.0/include
+	${CP} ${WRKINST}/usr/include/* \
+		${IDIR_GLIB_DEV}/usr/include
+	${INSTALL_DIR} ${IDIR_GLIB_DEV}/usr/lib/pkgconfig
+	${CP} ${WRKINST}/usr/lib/pkgconfig/*.pc \
+		${IDIR_GLIB_DEV}/usr/lib/pkgconfig
+
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3