diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-21 08:43:04 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-21 08:43:04 +0200 |
| commit | 5743830844e6ce6a633205ad22218034c787f9fb (patch) | |
| tree | e41414446756fae4d530d5d8bb0677be73aaa56b /package/e2fsprogs | |
| parent | 71c5a81c96873c056cb2c54580e3ba2db528ca8a (diff) | |
e2fsprogs: fix linking against librt
Our previous patch to link against librt to access clock_gettime() was
merged upstreamed... but it lacked a crucial part which makes the whole
thing useless: $(CLOCK_GETTIME_LIB) is always empty from a make point of
view.
This commit adds a patch to e2fsprogs to fix the problem.
Fixes:
http://autobuild.buildroot.net/results/41ea60bebfc741604a5499df74363b498ad77a48/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/e2fsprogs')
| -rw-r--r-- | package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch b/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch new file mode 100644 index 000000000..bd86c4e21 --- /dev/null +++ b/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch @@ -0,0 +1,35 @@ +From b5baf15b36107925186d89af9097b4b8e2d7cad6 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Wed, 21 Sep 2016 08:38:21 +0200 +Subject: [PATCH] MCONFIG.in: handle CLOCK_GETTIME_LIB + +Commit 62bc243f1bfe623312a350e4cd0d2e17a69aac45 ("fuse2fs: might need +librt") added a check for the clock_gettime() to verify whether linking +with the librt library is needed or not to use this function. + +However, this commit forgot the change in MCONFIG.in that allows to +define the make variable CLOCK_GETTIME_LIB from the CLOCK_GETTIME_LIB +variable substituted by the configure script. Due to this, from a make +perspective $(CLOCK_GETTIME_LIB) is always empty, and we get link +failure on platforms where clock_gettime() is available in librt. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + MCONFIG.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/MCONFIG.in b/MCONFIG.in +index e82963d..9ba9ce2 100644 +--- a/MCONFIG.in ++++ b/MCONFIG.in +@@ -125,6 +125,7 @@ LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@ + LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) + LIBINTL = @LIBINTL@ + SYSLIBS = @LIBS@ ++CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@ + DEPLIBSS = $(LIB)/libss@LIB_EXT@ + DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ + DEPLIBUUID = @DEPLIBUUID@ +-- +2.7.4 + |