From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 May 2009 13:07:31 +0000 (+0200)
Subject: Finally, updated util-linux-ng to 2.15.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f4319d936d653b847274b50ac04fcf006d81119;p=ipfire-3.x.git

Finally, updated util-linux-ng to 2.15.

Added some patches that fix the lack of the PIE code.
The rest of the patches fixes build error.
---

diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng
index 85d1d06ee..25c6f942e 100644
--- a/lfs/util-linux-ng
+++ b/lfs/util-linux-ng
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = util-linux-ng
-PKG_VER    = 2.14.2
+PKG_VER    = 2.15
 
 THISAPP    = $(PKG_NAME)-$(PKG_VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -44,7 +44,10 @@ CFLAGS    += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE)
+objects = $(DL_FILE) \
+	$(THISAPP)-compile_fix-1.patch \
+	$(THISAPP)-blkid_detection-1.patch \
+	$(THISAPP)-pic-fix-1.patch
 
 download: $(objects)
 
@@ -67,9 +70,11 @@ $(OBJECT): $(objects)
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-compile_fix-1.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-blkid_detection-1.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-pic-fix-1.patch
+
 ifeq "$(STAGE)" "toolchain"
-	# There's a bug with this version of Util-linux-ng and the E2fsprogs version
-	# we installed, so -luuid needs to be added.
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \