From patchwork Thu Jun 9 11:03:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 632722 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rQMqf45lCz9sDX for ; Thu, 9 Jun 2016 21:03:42 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zacarias.com.ar header.i=@zacarias.com.ar header.b=dP8cFCWm; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1A3FD31D45; Thu, 9 Jun 2016 11:03:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7snohOlUJRcR; Thu, 9 Jun 2016 11:03:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 40723316BB; Thu, 9 Jun 2016 11:03:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 87A641C0FD2 for ; Thu, 9 Jun 2016 11:03:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 85A4E86C23 for ; Thu, 9 Jun 2016 11:03:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ekB9fmKuo5vF for ; Thu, 9 Jun 2016 11:03:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [176.9.42.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id D418A884A1 for ; Thu, 9 Jun 2016 11:03:19 +0000 (UTC) Received: from asgard (cpe-186-22-138-122.telecentro-reversos.com.ar [186.22.138.122] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.15.1/8.15.1) with ESMTPSA id u59B3Du7004005 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 9 Jun 2016 11:03:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1465470197; bh=HG3InYq92rZL3kv53/y124hmGOH62yohZGFjYp3MxDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dP8cFCWm5NASa2GnkmL2LFMjSfEHhFTCwPdIcvlAqPBeJDCmr5Uzqfgb8yXIG9Qfu hMhtSqYZhGdq5aPX203vQVSPK53bMmP1NB2yjRFy2ZdaU+wt9orruhw+XE/Fk3HPta Qez+7n/EdoK6Sm6P2mNbfKGqFpWxMyIifrCm7PzQ= Received: by asgard (sSMTP sendmail emulation); Thu, 09 Jun 2016 08:03:12 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 9 Jun 2016 08:03:07 -0300 Message-Id: <1465470187-2185-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1465470187-2185-1-git-send-email-gustavo@zacarias.com.ar> References: <1465470187-2185-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.99 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/2] e2fsprogs: fix build failure with old glibc versions X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In old (< 2.17) glibc versions clock_gettime() resides in librt, however there's no check for this, so add a patch to fix it. Fixes: http://autobuild.buildroot.net/results/25c/25c042d2862affebf552ed24bc2a58e0c484226f/ Signed-off-by: Gustavo Zacarias --- .../e2fsprogs/0002-fuse2fs-might-need-librt.patch | 48 ++++++++++++++++++++++ package/e2fsprogs/e2fsprogs.mk | 4 ++ 2 files changed, 52 insertions(+) create mode 100644 package/e2fsprogs/0002-fuse2fs-might-need-librt.patch diff --git a/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch b/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch new file mode 100644 index 0000000..42a7fbd --- /dev/null +++ b/package/e2fsprogs/0002-fuse2fs-might-need-librt.patch @@ -0,0 +1,48 @@ +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 +--- +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 $@" +-- +2.7.3 + diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk index 17ac011..548c91d 100644 --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@ -12,6 +12,10 @@ E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h li E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-libs E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux +# For 0002-fuse2fs-might-need-librt.patch +# host-gettext for the gettext macro file needed at autoreconf time +E2FSPROGS_AUTORECONF = YES +E2FSPROGS_DEPENDENCIES += host-gettext # e4defrag doesn't build on older systems like RHEL5.x, and we don't # need it on the host anyway.