diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-13 12:20:17 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-05-13 12:20:17 +0000 |
| commit | fa5df1fabdce3c0c93a54ecafed554036aea9e87 (patch) | |
| tree | 9f8874105aef565c11cc9c3a217ed58c9dcd9036 /package/e2fsprogs/patches | |
| parent | d9d36efc737c637e66e4e11a9bb210309d02e468 (diff) | |
package/e2fsprogs: disable building of internal lib{blkid,uuid}
Also remove an empty patch.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31702 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/e2fsprogs/patches')
| -rw-r--r-- | package/e2fsprogs/patches/001-link-against-libuuid.patch | 38 | ||||
| -rw-r--r-- | package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch | 0 |
2 files changed, 38 insertions, 0 deletions
diff --git a/package/e2fsprogs/patches/001-link-against-libuuid.patch b/package/e2fsprogs/patches/001-link-against-libuuid.patch new file mode 100644 index 0000000000..4b4220c552 --- /dev/null +++ b/package/e2fsprogs/patches/001-link-against-libuuid.patch @@ -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 index e69de29bb2..0000000000 --- a/package/e2fsprogs/patches/100_add_missing_libpthread_for_blkid.patch +++ /dev/null |