mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-03 02:02:47 +02:00
fa5df1fabd
Also remove an empty patch. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31702 3c298f89-4303-0410-b956-a3cf2f4a3e73
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
--- 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 $@"
|