projects / packages / e2fsprogs.git / blame
| Commit | Line | Data |
|---|---|---|
| 7a46adf3 JB |
1 | --- e2fsprogs-1.41.13/configure.in.orig 2010-12-15 17:40:23.706122774 +0100 |
| 2 | +++ e2fsprogs-1.41.13/configure.in 2010-12-15 17:43:42.738121936 +0100 | |
| 3 | @@ -441,7 +441,7 @@ | |
| 4 | [LIBUUID=`$PKG_CONFIG --libs uuid`; | |
| 5 | STATIC_LIBUUID=`$PKG_CONFIG --static --libs uuid`], | |
| 6 | [AC_MSG_ERROR([external uuid library not found])], | |
| 7 | - [$LIBUUID]) | |
| 8 | + [$LIBUUID_LIBADD]) | |
| 9 | UUID_CMT=# | |
| 10 | AC_MSG_RESULT([Disabling private uuid library]) | |
| 11 | else | |
| 12 | @@ -492,7 +492,7 @@ | |
| 13 | [LIBBLKID=`$PKG_CONFIG --libs blkid`; | |
| 14 | STATIC_LIBBLKID=`$PKG_CONFIG --static --libs blkid`], | |
| 15 | [AC_MSG_ERROR([external blkid library not found])], | |
| 16 | - [$LIBBLKID]) | |
| 17 | + [$LIBBLKID_LIBADD]) | |
| 18 | BLKID_CMT=# | |
| 19 | AC_MSG_RESULT([Disabling private blkid library]) | |
| 20 | else | |
| 21 | @@ -853,7 +853,7 @@ | |
| 6b6821b9 JB |
22 | AC_SEARCH_LIBS([blkid_probe_all], [blkid]) |
| 23 | fi | |
| 72e64e7c | 24 | dnl |
| 7a46adf3 JB |
25 | -AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology mbstowcs) |
| 26 | +AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 stat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit blkid_probe_get_topology mbstowcs) | |
| 72e64e7c JR |
27 | dnl |
| 28 | dnl Check to see if -lsocket is required (solaris) to make something | |
| 29 | dnl that uses socket() to compile; this is needed for the UUID library | |
| 30 | diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c | |
| 31 | --- e2fsprogs-1.41.3/misc/util.c 2008-10-07 16:22:39.000000000 +0200 | |
| 32 | +++ e2fsprogs-1.41.3-diet/misc/util.c 2009-03-17 22:01:31.000000000 +0100 | |
| 33 | @@ -79,7 +79,7 @@ | |
| 34 | void check_plausibility(const char *device) | |
| 35 | { | |
| 36 | int val; | |
| 37 | -#ifdef HAVE_OPEN64 | |
| 38 | +#ifdef HAVE_STAT64 | |
| 39 | struct stat64 s; | |
| 40 | ||
| 41 | val = stat64(device, &s); | |
| 281f11a9 | 42 | |
| 6b6821b9 JB |
43 | --- e2fsprogs-1.41.11/misc/mke2fs.c.orig 2010-03-15 05:13:56.000000000 +0100 |
| 44 | +++ e2fsprogs-1.41.11/misc/mke2fs.c 2010-05-09 20:44:41.178938422 +0200 | |
| 45 | @@ -1927,7 +1927,7 @@ | |
| 46 | int ret; | |
| 47 | int blocksize; | |
| 48 | __u64 blocks; | |
| 49 | - __uint64_t range[2]; | |
| 50 | + uint64_t range[2]; | |
| 51 | ||
| 52 | blocks = fs->super->s_blocks_count; | |
| 53 | blocksize = EXT2_BLOCK_SIZE(fs->super); |