[uClibc-cvs] svn commit: trunk/buildroot/package: e2fsprogs netkitbase util-linux

Tue May 3 04:21:21 UTC 2005

Author: sjhill
Date: 2005-05-02 22:21:20 -0600 (Mon, 02 May 2005)
New Revision: 10235

Log:
Add patches for GCC-4.x so that packages will build properly.


Added:
   trunk/buildroot/package/e2fsprogs/e2fsprogs-gcc4.patch
   trunk/buildroot/package/netkitbase/netkitbase-gcc4.patch
   trunk/buildroot/package/util-linux/util-linux-gcc4.patch

Modified:
   trunk/buildroot/package/e2fsprogs/e2fsprogs.mk
   trunk/buildroot/package/netkitbase/netkitbase.mk


Changeset:
Added: trunk/buildroot/package/e2fsprogs/e2fsprogs-gcc4.patch
===================================================================

--- trunk/buildroot/package/e2fsprogs/e2fsprogs-gcc4.patch	2005-05-03 03:33:23 UTC (rev 10234)
+++ trunk/buildroot/package/e2fsprogs/e2fsprogs-gcc4.patch	2005-05-03 04:21:20 UTC (rev 10235)
@@ -0,0 +1,16 @@
+diff -urN e2fsprogs-1.35/configure e2fsprogs-1.35-patched/configure
+--- e2fsprogs-1.35/configure	2004-02-23 22:10:41.000000000 -0600
++++ e2fsprogs-1.35-patched/configure	2005-05-02 22:44:39.475979235 -0500
+@@ -5879,12 +5879,6 @@
+ 
+ fi
+ echo "$ac_t""$ac_cv_type_intptr_t" 1>&6
+-if test $ac_cv_type_intptr_t = no; then
+-  cat >> confdefs.h <<\EOF
+-#define intptr_t long
+-EOF
+-
+-fi
+ 
+ echo $ac_n "checking whether struct stat has a st_flags field""... $ac_c" 1>&6
+ echo "configure:5891: checking whether struct stat has a st_flags field" >&5

Modified: trunk/buildroot/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- trunk/buildroot/package/e2fsprogs/e2fsprogs.mk	2005-05-03 03:33:23 UTC (rev 10234)
+++ trunk/buildroot/package/e2fsprogs/e2fsprogs.mk	2005-05-03 04:21:20 UTC (rev 10235)
@@ -18,6 +18,7 @@
 
 $(E2FSPROGS_DIR)/.unpacked: $(DL_DIR)/$(E2FSPROGS_SOURCE)
 	$(E2FSPROGS_CAT) $(DL_DIR)/$(E2FSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(E2FSPROGS_DIR) package/e2fsprogs/ e2fsprogs*.patch
 	touch $(E2FSPROGS_DIR)/.unpacked
 
 $(E2FSPROGS_DIR)/.configured: $(E2FSPROGS_DIR)/.unpacked

Added: trunk/buildroot/package/netkitbase/netkitbase-gcc4.patch
===================================================================
--- trunk/buildroot/package/netkitbase/netkitbase-gcc4.patch	2005-05-03 03:33:23 UTC (rev 10234)
+++ trunk/buildroot/package/netkitbase/netkitbase-gcc4.patch	2005-05-03 04:21:20 UTC (rev 10235)
@@ -0,0 +1,12 @@
+diff -ur netkit-base-0.17/inetd/servtab.c netkit-base-0.17-patched/inetd/servtab.c
+--- netkit-base-0.17/inetd/servtab.c	2000-07-22 15:20:50.000000000 -0500
++++ netkit-base-0.17-patched/inetd/servtab.c	2005-04-30 21:23:52.649630720 -0500
+@@ -771,7 +771,7 @@
+ 			return;
+ 		}
+ 		
+-#define SWAP(type, a, b) {type c=(type)a; (type)a=(type)b; (type)b=(type)c;}
++#define SWAP(type, a, b) {type c=(type)a; a=(type)b; b=(type)c;}
+ 
+ 		/*
+ 		 * sep->se_wait may be holding the pid of a daemon

Modified: trunk/buildroot/package/netkitbase/netkitbase.mk
===================================================================
--- trunk/buildroot/package/netkitbase/netkitbase.mk	2005-05-03 03:33:23 UTC (rev 10234)
+++ trunk/buildroot/package/netkitbase/netkitbase.mk	2005-05-03 04:21:20 UTC (rev 10235)
@@ -21,6 +21,7 @@
 	$(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure
 	# don't try to run cross compiled binaries while configuring things
 	$(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
+	toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase*.patch
 	touch $(NETKITBASE_DIR)/.unpacked
 
 $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked

Added: trunk/buildroot/package/util-linux/util-linux-gcc4.patch
===================================================================
--- trunk/buildroot/package/util-linux/util-linux-gcc4.patch	2005-05-03 03:33:23 UTC (rev 10234)
+++ trunk/buildroot/package/util-linux/util-linux-gcc4.patch	2005-05-03 04:21:20 UTC (rev 10235)
@@ -0,0 +1,57 @@
+diff -urN util-linux-2.12/disk-utils/mkfs.minix.c util-linux-2.12-patched/disk-utils/mkfs.minix.c
+--- util-linux-2.12/disk-utils/mkfs.minix.c	2005-04-30 21:38:42.924938555 -0500
++++ util-linux-2.12-patched/disk-utils/mkfs.minix.c	2005-04-30 21:40:36.283237704 -0500
+@@ -124,17 +124,17 @@
+ static char super_block_buffer[BLOCK_SIZE];
+ static char boot_block_buffer[512];
+ #define Super (*(struct minix_super_block *)super_block_buffer)
+-#define INODES ((unsigned long)Super.s_ninodes)
++#define INODES (Super.s_ninodes)
+ #ifdef HAVE_MINIX2
+-#define ZONES ((unsigned long)(version2 ? Super.s_zones : Super.s_nzones))
++#define ZONES ((version2 ? Super.s_zones : Super.s_nzones))
+ #else
+-#define ZONES ((unsigned long)(Super.s_nzones))
++#define ZONES (Super.s_nzones)
+ #endif
+-#define IMAPS ((unsigned long)Super.s_imap_blocks)
+-#define ZMAPS ((unsigned long)Super.s_zmap_blocks)
+-#define FIRSTZONE ((unsigned long)Super.s_firstdatazone)
+-#define ZONESIZE ((unsigned long)Super.s_log_zone_size)
+-#define MAXSIZE ((unsigned long)Super.s_max_size)
++#define IMAPS (Super.s_imap_blocks)
++#define ZMAPS (Super.s_zmap_blocks)
++#define FIRSTZONE (Super.s_firstdatazone)
++#define ZONESIZE (Super.s_log_zone_size)
++#define MAXSIZE (Super.s_max_size)
+ #define MAGIC (Super.s_magic)
+ #define NORM_FIRSTZONE (2+IMAPS+ZMAPS+INODE_BLOCKS)
+ 
+@@ -436,7 +436,10 @@
+ 	MAGIC = magic;
+ 	ZONESIZE = 0;
+ 	MAXSIZE = version2 ? 0x7fffffff : (7+512+512*512)*1024;
+-	ZONES = BLOCKS;
++	if (version2)
++		Super.s_zones = BLOCKS;
++	else
++		Super.s_nzones = BLOCKS;
+ 
+ /* some magic nrs: 1 inode / 3 blocks */
+ 	if ( req_nr_inodes == 0 ) 
+@@ -478,11 +481,11 @@
+ 	if (!inode_buffer)
+ 		die(_("unable to allocate buffer for inodes"));
+ 	memset(inode_buffer,0,INODE_BUFFER_SIZE);
+-	printf(_("%ld inodes\n"),INODES);
+-	printf(_("%ld blocks\n"),ZONES);
+-	printf(_("Firstdatazone=%ld (%ld)\n"),FIRSTZONE,NORM_FIRSTZONE);
++	printf(_("%ld inodes\n"),(unsigned long)INODES);
++	printf(_("%ld blocks\n"),(unsigned long)ZONES);
++	printf(_("Firstdatazone=%ld (%ld)\n"),(unsigned long)FIRSTZONE,(unsigned long)NORM_FIRSTZONE);
+ 	printf(_("Zonesize=%d\n"),BLOCK_SIZE<<ZONESIZE);
+-	printf(_("Maxsize=%ld\n\n"),MAXSIZE);
++	printf(_("Maxsize=%ld\n\n"),(unsigned long)MAXSIZE);
+ }
+ 
+ /*


