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

Removed xfsprogs from installation system.
---

diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index 121d63d57..9184a8a52 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -37,8 +37,7 @@ TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-	$(THISAPP)-build-1.patch
+objects = $(DL_FILE)
 
 install: $(TARGET)
 
@@ -54,42 +53,11 @@ $(objects) :
 $(TARGET) : 
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-ifeq "$(STAGE)" "$(SNAME)"
 	cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
 		LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes" #$(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	chmod -v 755 /lib/libhandle.so*
 	rm -f /lib/libhandle.{a,la,so}
 	ln -svf ../../lib/libhandle.so.1 /usr/lib/libhandle.so
-endif
-
-ifeq "$(STAGE)" "installer"
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-build-1.patch
-	cd $(DIR_APP) && sed -e "s/^AC_PACKAGE_NEED_LIO_LISTIO//" -i configure.in
-	cd $(DIR_APP) && autoconf
-	cd $(DIR_APP) && $(U_TOOLS) \
-		LIBTOOL="$$(which libtool) --tag=CC" \
-		INSTALL_USER=root \
-		INSTALL_GROUP=root \
-		./configure \
-			--host=$(UCLIBC_TARGET) \
-			--target=$(UCLIBC_TARGET) \
-			--prefix=/usr \
-			--exec-prefix=/ \
-			--libdir=/usr/lib \
-			--enable-readline=yes \
-			--disable-rpath
-	cd $(DIR_APP) && sed -e "s/@librt@/-lrt/" -i include/builddefs
-	cd $(DIR_APP) && \
-		PATH=$(UCLIBC_DIR)/$(UCLIBC_TARGET)/bin:$(PATH) \
-			make DEBUG=-DNDEBUG #$(PARALLELISMFLAGS)
-	exit 1
-	cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
-	chmod -v 755 $(INSTALLER_DIR)/lib/libhandle.so*
-	rm -f $(INSTALLER_DIR)/lib/libhandle.{a,la,so}
-	ln -svf ../../lib/libhandle.so.1 $(INSTALLER_DIR)/usr/lib/libhandle.so
-endif
-
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)