From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 26 Aug 2008 18:40:51 +0000 (+0200)
Subject: Removed libuser from installation system.
X-Git-Tag: v3.0-alpha1~733^2~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d164576ff927d8a5c0b3380fd8a088372b99d1a;p=ipfire-3.x.git

Removed libuser from installation system.
---

diff --git a/lfs/libuser b/lfs/libuser
index 8ab44e2cd..24b3c1ea5 100644
--- a/lfs/libuser
+++ b/lfs/libuser
@@ -33,11 +33,6 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
-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
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -58,8 +53,6 @@ $(objects) :
 $(TARGET) : 
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-
-ifeq "$(STAGE)" "$(SNAME)"
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \
@@ -68,35 +61,5 @@ ifeq "$(STAGE)" "$(SNAME)"
 	cd $(DIR_APP) && sed -e "s/^SUBDIRS = .*/SUBDIRS = po/" -i Makefile
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
-endif
-
-ifeq "$(STAGE)" "installer"
-	cd $(DIR_APP) && \
-		LIBS="$(GLIB_LIBS) -lglib-2.0 -lgobject-2.0 -lgmodule-2.0" \
-		LDFLAGS="-L$(INSTALLER_DIR)/lib -L$(INSTALLER_DIR)/usr/lib" \
-		GLIB_CFLAGS="-I$(INSTALLER_DIR)/usr/include/glib-2.0 -I$(INSTALLER_DIR)/usr/lib/glib-2.0/include" \
-		GLIB_LIBS="$(GLIB_LIBS)" \
-		GOBJECT_CFLAGS="-I$(INSTALLER_DIR)/usr/include/glib-2.0 -I$(INSTALLER_DIR)/usr/lib/glib-2.0/include" \
-		GOBJECT_LIBS="$(INSTALLER_DIR)/usr/lib/libglib-2.0.so $(INSTALLER_DIR)/usr/lib/libgobject-2.0.so" \
-		GMODULE_CFLAGS="-I$(INSTALLER_DIR)/usr/include/glib-2.0 -I$(INSTALLER_DIR)/usr/lib/glib-2.0/include" \
-		GMODULE_LIBS="$(INSTALLER_DIR)/usr/lib/libglib-2.0.so $(INSTALLER_DIR)/usr/lib/libgmodule-2.0.so" \
-		./configure \
-			--host=$(UCLIBC_TARGET) \
-			--prefix=/usr \
-			--sysconfdir=/etc \
-			--disable-rpath
-	cd $(DIR_APP) && sed -e "s/^SUBDIRS = .*/SUBDIRS = po/" -i Makefile
-	cd $(DIR_APP) && sed -e "s/^#include <execinfo.h>//" -i lib/error.c
-	cd $(DIR_APP) && sed -e "s@/lib@$(INSTALLER_DIR)/lib@g" \
-						 -e "s@/usr/lib@$(INSTALLER_DIR)/usr/lib@g" -i libtool
-	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-	cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
-
-	echo -n > $(INSTALLER_DIR)/etc/libuser.conf
-
-	# Check if the python module works
-	chroot $(INSTALLER_DIR) python -c "import libuser"
-endif
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)