Removed libuser from installation system.

diff --git a/lfs/libuser b/lfs/libuser
index 8ab44e2cdc27852948f8322ee19cdb02ba0116de..24b3c1ea5614da4de6a6ac1d9840598928c22c88 100644 (file)
--- 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)