package/e2fsprogs: disable building of internal lib{blkid,uuid}
authorGabor Juhos <juhosg@openwrt.org>
Sun, 13 May 2012 12:20:17 +0000 (12:20 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sun, 13 May 2012 12:20:17 +0000 (12:20 +0000)
Also remove an empty patch.

SVN-Revision: 31702

package/e2fsprogs/Makefile
package/e2fsprogs/patches/001-link-against-libuuid.patch [new file with mode: 0644]
package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch [deleted file]

index 6b281c0..e58d26a 100644 (file)
@@ -34,8 +34,8 @@ $(call Package/e2fsprogs/Default)
 endef
 
 define Package/e2fsprogs/description
 endef
 
 define Package/e2fsprogs/description
- This package contains essential ext2 filesystem utilities which consists of 
- e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2 
+ This package contains essential ext2 filesystem utilities which consists of
+ e2fsck, mke2fs, debugfs, dumpe2fs, tune2fs, and most of the other core ext2
  filesystem utilities.
 endef
 
  filesystem utilities.
 endef
 
@@ -83,6 +83,9 @@ TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
        --enable-elf-shlibs     \
 
 CONFIGURE_ARGS += \
        --enable-elf-shlibs     \
+       --disable-libuuid       \
+       --disable-libblkid      \
+       --disable-uuidd         \
        --disable-tls           \
        --disable-nls           \
        --disable-rpath
        --disable-tls           \
        --disable-nls           \
        --disable-rpath
diff --git a/package/e2fsprogs/patches/001-link-against-libuuid.patch b/package/e2fsprogs/patches/001-link-against-libuuid.patch
new file mode 100644 (file)
index 0000000..4b4220c
--- /dev/null
@@ -0,0 +1,38 @@
+--- a/configure
++++ b/configure
+@@ -5014,7 +5014,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lblkid $LIBBLKID $LIBS"
++LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -146,10 +146,10 @@ partinfo: partinfo.o
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+-e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
++e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS)
+       $(E) "  LD $@"
+       $(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+-              $(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
++              $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
+ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
+               $(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
+@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
+               $(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
+               $(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
+-fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
++fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
+       $(E) "  LD $@"
+-      $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
++      $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
+ fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
+       $(E) "  LD $@"
diff --git a/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch b/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch
deleted file mode 100644 (file)
index e69de29..0000000