r1045 - in trunk: . scripts/patches scripts/scripts/target-scripts

ryan at linuxfromscratch.org ryan at linuxfromscratch.org
Thu Jan 12 00:57:25 PST 2006


Author: ryan
Date: 2006-01-12 01:57:23 -0700 (Thu, 12 Jan 2006)
New Revision: 1045

Added:
   trunk/scripts/patches/util-linux-2.12r-gcc4_fixes-1.patch
Modified:
   trunk/
   trunk/scripts/scripts/target-scripts/target-util-linux.sh
Log:
 r1081 at rei:  lfs | 2006-01-12 19:16:25 +1100
 Update for util-linux-2.12r



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1080
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564
   + 27a90bee-6a05-0410-9baa-d6d48c78a963:/local:705
27a90bee-6a05-0410-9baa-d6d48c78a963:/trunk:1081
c4644617-e5f8-0310-a1f2-9ce34ac0f9cb:/cross-lfs:564

Added: trunk/scripts/patches/util-linux-2.12r-gcc4_fixes-1.patch
===================================================================
--- trunk/scripts/patches/util-linux-2.12r-gcc4_fixes-1.patch	2006-01-12 08:57:04 UTC (rev 1044)
+++ trunk/scripts/patches/util-linux-2.12r-gcc4_fixes-1.patch	2006-01-12 08:57:23 UTC (rev 1045)
@@ -0,0 +1,26 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-08-28
+Initial Package Version: 2.12q
+Origin: Joe Ciccone 
+Upstream Status: Sent
+Description: Fixes GCC4 Compile Issues
+ 
+diff -Naur util-linux-2.12q.orig/mount/umount.c util-linux-2.12q/mount/umount.c
+--- util-linux-2.12q.orig/mount/umount.c	2004-12-20 22:03:45.000000000 +0000
++++ util-linux-2.12q/mount/umount.c	2005-08-29 04:11:27.000000000 +0000
+@@ -40,13 +40,13 @@
+ #include <linux/unistd.h>
+ #ifdef __NR_umount2
+ 
+-static int umount2(const char *path, int flags);
++int umount2(const char *path, int flags);
+ 
+ _syscall2(int, umount2, const char *, path, int, flags);
+ 
+ #else /* __NR_umount2 */
+ 
+-static int
++int
+ umount2(const char *path, int flags) {
+ 	fprintf(stderr, _("umount: compiled without support for -f\n"));
+ 	errno = ENOSYS;

Modified: trunk/scripts/scripts/target-scripts/target-util-linux.sh
===================================================================
--- trunk/scripts/scripts/target-scripts/target-util-linux.sh	2006-01-12 08:57:04 UTC (rev 1044)
+++ trunk/scripts/scripts/target-scripts/target-util-linux.sh	2006-01-12 08:57:23 UTC (rev 1045)
@@ -33,11 +33,14 @@
          ;;
       esac
    ;;
-   2.12[k-q] )
+   2.12[k-r] )
       # fix cramfs, this fix will need to be tracked for later versions...
       apply_patch util-linux-2.12q-cramfs-1
       # fix sfdisk for mips n32/64 as n32/64 uses lseek, not llseek
       apply_patch util-linux-2.12q-sfdisk_use_lseek_for_mips64-1
+      case ${GCC_VER} in
+         4.* ) apply_patch util-linux-2.12r-gcc4_fixes-1 ;;
+      esac
    ;;
 esac
 




More information about the cross-lfs mailing list