glib2: add dependencies to the gettext and libiconv stub host builds

[openwrt/svn-archive/archive.git] / libs / glib2 / Makefile

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 66dd11315e5267718575fa10ccb861ee83c80418..dd4ceca5e9fcb72898a011ed7a01d250be02e1b4 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -1,31 +1,36 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.18.1
-PKG_RELEASE:=4
+PKG_VERSION:=2.26.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(BUILD_DIR)/glib-$(PKG_VERSION)
-PKG_SOURCE_URL:=@GNOME/glib/2.18
-PKG_MD5SUM:=51a9a33f49a4896d4d95d8e980666b9e
+PKG_SOURCE_URL:=@GNOME/glib/2.26
+PKG_MD5SUM:=17535accceef55bcb17a74d73f9c2aef
+
 PKG_FIXUP:=libtool
+PKG_BUILD_DEPENDS:=glib2/host libpthread zlib
+HOST_BUILD_DEPENDS:=gettext/host libiconv/host
+PKG_INSTALL:=1
 
-include $(INCLUDE_DIR)/package.mk
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/glib-$(PKG_VERSION)
 
-PKG_INSTALL=1
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/glib2
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libiconv +libintl
+  DEPENDS:=$(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=glib 2.0
   URL:=http://www.gtk.org/
 endef
@@ -34,37 +39,18 @@ define Package/glib2/description
   The GLib library of C routines
 endef
 
-TARGET_CFLAGS+= \
-       $(FPIC) \
-       -I$(STAGING_DIR)/usr/lib/libiconv/include \
-       -I$(STAGING_DIR)/usr/lib/libintl/include
-
-TARGET_LDFLAGS+= \
-       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -L$(STAGING_DIR)/usr/lib/libintl/lib
-
 define Build/Configure
-       mkdir -p $(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)
-       ( cd $(PKG_BUILD_DIR); CONFIG_SITE= \
-               ./configure \
-               --target=$(GNU_HOST_NAME) \
-               --host=$(GNU_HOST_NAME) \
-               --build=$(GNU_HOST_NAME) \
-               --prefix=$(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME) \
-               --disable-shared \
-               --enable-static \
-               --enable-debug=no \
-       );
-       $(MAKE) -C $(PKG_BUILD_DIR) install clean
-
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \
                --enable-debug=no \
+               --disable-selinux \
+        --disable-fam \
+        $(if $(ICONV_FULL),--with-libiconv=gnu) \
                , \
                glib_cv_stack_grows=no \
                glib_cv_uscore=no \
-               ac_cv_path_GLIB_GENMARSHAL=$(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)/bin/glib-genmarshal \
+               ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOST)/bin/glib-genmarshal \
                ac_cv_func_mmap_fixed_mapped=yes \
        );
 endef
@@ -74,6 +60,9 @@ define Build/InstallDev
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/include/glib-2.0 \
                $(1)/usr/include/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/glib-2.0/include/*.h \
+               $(1)/usr/include/glib-2.0/
        $(CP) \
                $(PKG_INSTALL_DIR)/usr/include/gio-unix-2.0 \
                $(1)/usr/include/
@@ -96,11 +85,6 @@ define Build/InstallDev
        $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)/usr/share/aclocal/*.m4  \
                $(2)/share/aclocal/
-
-       $(INSTALL_DIR) $(2)/bin
-       $(INSTALL_BIN) \
-               $(PKG_BUILD_DIR)/build/$(GNU_HOST_NAME)/bin/* \
-               $(2)/bin
 endef
 
 define Package/glib2/install
@@ -110,5 +94,5 @@ define Package/glib2/install
                $(1)/usr/lib/
 endef
 
-
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,glib2))