r714 - x86/trunk/packages/xfsprogs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Sep 19 19:35:24 PDT 2005


Author: jhuntwork
Date: 2005-09-19 20:35:24 -0600 (Mon, 19 Sep 2005)
New Revision: 714

Added:
   x86/trunk/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
Modified:
   x86/trunk/packages/xfsprogs/Makefile
Log:
Fixed xfsprogs instructions

Modified: x86/trunk/packages/xfsprogs/Makefile
===================================================================
--- x86/trunk/packages/xfsprogs/Makefile	2005-09-20 02:07:35 UTC (rev 713)
+++ x86/trunk/packages/xfsprogs/Makefile	2005-09-20 02:35:24 UTC (rev 714)
@@ -22,20 +22,12 @@
 	@$(std_build)
 
 compile-stage2:
-	@$(call echo_message, Configuring)
-#==============================================================================
-# Configure commands below \/
-#==============================================================================
-	@./configure --prefix=/usr > ../$(DIR)-$@.log 2>&1
-#
-#==Status Messages===========================================
-#
-	@$(OK)
 	@$(call echo_message, Making)
 #==============================================================================
 # Make commands below \/
 #==============================================================================
-	@make $(PM) >>../$(DIR)-$@.log 2>&1
+	@patch -Np1 -i ../$(DIR)-fix_compile-1.patch
+	@make >../$(DIR)-$@.log 2>&1
 #
 #==Status Messages===========================================
 #

Added: x86/trunk/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch
===================================================================
--- x86/trunk/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch	2005-09-20 02:07:35 UTC (rev 713)
+++ x86/trunk/packages/xfsprogs/xfsprogs-2.6.36-fix_compile-1.patch	2005-09-20 02:35:24 UTC (rev 714)
@@ -0,0 +1,18 @@
+Submitted By: Jeremy Huntwork <jhuntwork at linuxfromscratch dot org>
+Date: 2005-01-21
+Initial Package Version: 2.6.25
+Upstream Status: Not submitted [Test version]
+Description: Allows xfsprogs to compile cleanly with gcc-3.4.3
+
+diff -Naur xfsprogs-2.6.25.orig/libxfs/xfs_bmap.c xfsprogs-2.6.25/libxfs/xfs_bmap.c
+--- xfsprogs-2.6.25.orig/libxfs/xfs_bmap.c	2004-10-13 00:26:05.000000000 +0000
++++ xfsprogs-2.6.25/libxfs/xfs_bmap.c	2005-01-21 21:30:08.530616880 +0000
+@@ -196,8 +196,6 @@
+ 	}
+ done:
+ #ifdef DEBUG
+-	if (!error)
+-		xfs_bmap_check_leaf_extents(*curp, ip, whichfork);
+ #endif
+ 	*logflagsp = logflags;
+ 	return error;




More information about the livecd mailing list