From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 5 Jul 2008 21:34:19 +0000 (+0000)
Subject: Updated glib to 2.16.3.
X-Git-Tag: v3.0-alpha1~898
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0d1e2c0002fddb816af5ec8d6a4b0da239abc3ab;p=ipfire-3.x.git

Updated glib to 2.16.3.
---

diff --git a/lfs/glib b/lfs/glib
index fb468d3bf..0fcd5cd9c 100644
--- a/lfs/glib
+++ b/lfs/glib
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = glib
-VER        = 2.12.12
+VER        = 2.16.3
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,13 +33,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-DBUSGLIB   = dbus-glib-0.74
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) $(DBUSGLIB).tar.gz $(DBUSGLIB)-cross-compile-1.patch
+objects = $(DL_FILE)
 
 install: $(TARGET)
 
@@ -52,39 +50,6 @@ $(objects) :
 # Installation Details
 ###############################################################################
 
-ifeq "$(STAGE)" "$(SNAME)"
-define MAKE_DBUSGLIB
-	@rm -rf $(DIR_SRC)/$(DBUSGLIB)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DBUSGLIB).tar.gz
-	cd $(DIR_SRC)/$(DBUSGLIB) && ./configure --prefix=/usr
-	cd $(DIR_SRC)/$(DBUSGLIB) && make $(PARALLELISMFLAGS)
-	cd $(DIR_SRC)/$(DBUSGLIB) && make install
-	@rm -rf $(DIR_SRC)/$(DBUSGLIB)
-endef
-endif
-
-ifeq "$(STAGE)" "installer"
-define MAKE_DBUSGLIB
-	@rm -rf $(DIR_SRC)/$(DBUSGLIB)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DBUSGLIB).tar.gz
-	cd $(DIR_SRC)/$(DBUSGLIB) && patch -Np1 -i $(DIR_PATCHES)/$(DBUSGLIB)-cross-compile-1.patch
-	cd $(DIR_SRC)/$(DBUSGLIB) && \
-		ac_cv_have_abstract_sockets=yes \
-		ac_cv_func_posix_getpwnam_r=yes \
-		have_abstract_sockets=yes \
-		DBUS_CFLAGS="-I$(INSTALLER_DIR)/usr/include/dbus-1.0 -I$(INSTALLER_DIR)/usr/lib/dbus-1.0/include" \
-		DBUS_LIBS="$(INSTALLER_DIR)/usr/lib/libdbus-1.so" \
-		DBUS_GLIB_CFLAGS="-I$(INSTALLER_DIR)/usr/include/glib-2.0 -I$(INSTALLER_DIR)/usr/lib/glib-2.0/include" \
-		DBUS_GLIB_LIBS="$(INSTALLER_DIR)/usr/lib/libglib-2.0.so $(INSTALLER_DIR)/usr/lib/libgobject-2.0.so $(INSTALLER_DIR)/usr/lib/libgmodule-2.0.so $(INSTALLER_DIR)/usr/lib/libgthread-2.0.so" \
-		./configure \
-			--prefix=/usr \
-			--host=$(UCLIBC_TARGET)
-	cd $(DIR_SRC)/$(DBUSGLIB) && make DBUS_BUS_LIBS="$(INSTALLER_DIR)/usr/lib/libexpat.so" $(PARALLELISMFLAGS)
-	cd $(DIR_SRC)/$(DBUSGLIB) && make install DESTDIR=$(INSTALLER_DIR)
-	@rm -rf $(DIR_SRC)/$(DBUSGLIB)
-endef
-endif
-
 $(TARGET) : 
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/$(DBUSGLIB) && \
@@ -166,7 +131,5 @@ ifeq "$(STAGE)" "installer"
 	cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
 endif
 
-	$(MAKE_DBUSGLIB)
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)