From 14d9e94315cd8144ac72d368c45e70869a66799c Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 9 Jun 2016 07:47:03 -0300 Subject: [PATCH] fuse2fs: might need librt It uses clock_gettime() which in older glibc versions is in librt. Signed-off-by: Gustavo Zacarias [yann.morin.1998@free.fr: properly expand it in the Makefile] Signed-off-by: "Yann E. MORIN" --- Patch status: sent to linux-ext4 ML configure.ac | 5 +++++ misc/Makefile.in | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 67d7231..a387dfd 100644 --- a/configure.ac +++ b/configure.ac @@ -1162,6 +1162,11 @@ if test "$ac_cv_func_dlopen" = yes ; then fi AC_SUBST(MAGIC_LIB) dnl +dnl Check to see if librt is required for clock_gettime() (glibc < 2.17) +dnl +AC_CHECK_LIB(rt, clock_gettime, [CLOCK_GETTIME_LIB=-lrt]) +AC_SUBST(CLOCK_GETTIME_LIB) +dnl dnl Check to see if the FUSE library is -lfuse or -losxfuse dnl FUSE_CMT= diff --git a/misc/Makefile.in b/misc/Makefile.in index 43e3c7e..070a6e3 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -387,7 +387,8 @@ fuse2fs: $(FUSE2FS_OBJS) $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) \ $(LIBEXT2FS) $(E) " LD $@" $(Q) $(CC) $(ALL_LDFLAGS) -o fuse2fs $(FUSE2FS_OBJS) $(LIBS) \ - $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) + $(LIBFUSE) $(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL) \ + $(CLOCK_GETTIME_LIB) journal.o: $(srcdir)/../debugfs/journal.c $(E) " CC $@" diff --git a/misc/Makefile.in b/misc/Makefile.in index 43e3c7e..070a6e3 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -32,6 +32,8 @@ @FUSE_CMT@FUSE_PROG= fuse2fs +CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@ + SPROGS= mke2fs badblocks tune2fs dumpe2fs $(BLKID_PROG) logsave \ $(E2IMAGE_PROG) @FSCK_PROG@ e2undo USPROGS= mklost+found filefrag e2freefrag $(UUIDD_PROG) \ -- 2.7.3