]> git.pld-linux.org Git - packages/e2fsprogs.git/blob - e2fsprogs-diet.patch
- hack around chicken-egg problem with libuuid and libblkid to allow
[packages/e2fsprogs.git] / e2fsprogs-diet.patch
1 diff -ur e2fsprogs-1.41.3/configure.in e2fsprogs-1.41.3-diet/configure.in
2 --- e2fsprogs-1.41.3/configure.in       2009-03-17 22:03:38.000000000 +0100
3 +++ e2fsprogs-1.41.3-diet/configure.in  2009-03-17 22:01:22.000000000 +0100
4 @@ -701,7 +701,7 @@
5         [#include <sys/types.h>
6          #include <sys/socket.h>])
7  dnl
8 -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)
9 +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)
10  dnl
11  dnl Check to see if -lsocket is required (solaris) to make something
12  dnl that uses socket() to compile; this is needed for the UUID library
13 diff -ur e2fsprogs-1.41.3/misc/util.c e2fsprogs-1.41.3-diet/misc/util.c
14 --- e2fsprogs-1.41.3/misc/util.c        2008-10-07 16:22:39.000000000 +0200
15 +++ e2fsprogs-1.41.3-diet/misc/util.c   2009-03-17 22:01:31.000000000 +0100
16 @@ -79,7 +79,7 @@
17  void check_plausibility(const char *device)
18  {
19         int val;
20 -#ifdef HAVE_OPEN64
21 +#ifdef HAVE_STAT64
22         struct stat64 s;
23  
24         val = stat64(device, &s);
25 --- e2fsprogs-1.41.5/MCONFIG.in~        2009-04-22 13:49:25.000000000 +0200
26 +++ e2fsprogs-1.41.5/MCONFIG.in 2009-05-20 15:22:35.879974273 +0200
27 @@ -79,7 +79,7 @@
28  LIBINTL = @LIBINTL@
29  DEPLIBSS = $(LIB)/libss@LIB_EXT@
30  DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
31 -DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
32 +DEPLIBBLKID = @DEPLIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIB)/libuuid@LIB_EXT@
33  
34  STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@ @DLOPEN_LIB@
35  STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@ @SEM_INIT_LIB@
36 @@ -89,7 +89,7 @@
37  STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
38  DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
39  DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
40 -DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(STATIC_LIBUUID)
41 +DEPSTATIC_LIBBLKID = @DEPSTATIC_LIBBLKID@ $(LIB)/libuuid@STATIC_LIB_EXT@
42  
43  PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@ @DLOPEN_LIB@
44  PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@ @SEM_INIT_LIB@
45 @@ -98,7 +98,7 @@
46  PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
47  PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
48  DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
49 -DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
50 +DEPPROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(LIB)/libuuid@PROFILED_LIB_EXT@
51  
52  # An include directive pointing to a directory holding enough linux-like
53  # include files to satisfy some programs here
This page took 0.029518 seconds and 3 git commands to generate.