diff options
| author | Karel Zak | 2019-01-22 12:33:19 +0100 |
|---|---|---|
| committer | Karel Zak | 2019-01-22 12:33:19 +0100 |
| commit | c2435b946f574880201cb41d989d8d63d4bbf87d (patch) | |
| tree | 575d06df11b0e1ff28a0a337ad32440b62b5bac9 /libblkid/src/Makemodule.am | |
| parent | setarch: don't return address of automatic variable (diff) | |
| download | kernel-qcow2-util-linux-c2435b946f574880201cb41d989d8d63d4bbf87d.tar.gz kernel-qcow2-util-linux-c2435b946f574880201cb41d989d8d63d4bbf87d.tar.xz kernel-qcow2-util-linux-c2435b946f574880201cb41d989d8d63d4bbf87d.zip | |
libblkid: remove dependence on libuuid
Currently we use libuuid to print UUID only. This code is possible to replace
by one snprintf(). It seems better to duplicate this one snprintf than force
all distros to keep libuuid together with libblkid.
Note, this scenario has been already supported on --disable-libuuid.
Reported-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libblkid/src/Makemodule.am')
| -rw-r--r-- | libblkid/src/Makemodule.am | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 0ecb5579e..c5d9426b1 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -126,11 +126,6 @@ libblkid_la_CFLAGS = \ -I$(ul_libblkid_incdir) \ -I$(top_srcdir)/libblkid/src -if BUILD_LIBUUID -libblkid_la_LIBADD += libuuid.la -libblkid_la_CFLAGS += -I$(ul_libuuid_incdir) -endif - libblkid_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT libblkid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym @@ -157,12 +152,6 @@ check_PROGRAMS += \ blkid_tests_cflags = -DTEST_PROGRAM $(libblkid_la_CFLAGS) blkid_tests_ldflags = blkid_tests_ldadd = libblkid.la - -if BUILD_LIBUUID -blkid_tests_ldflags += libuuid.la -blkid_tests_ldadd += $(LDADD) -endif - blkid_tests_ldflags += -static test_blkid_cache_SOURCES = libblkid/src/cache.c |