]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
package/quota: fix static build with e2fsprogs
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 14 Aug 2016 13:28:01 +0000 (15:28 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Tue, 16 Aug 2016 06:13:21 +0000 (08:13 +0200)
quota does not use pkg-config to find e2fsprogs libs, so it misses out
on the fact that it may require -pthread when doing static links.

Fix that by manually adding -pthread in case of the static build (of
course, only if the toolchain has threads).

Fixes:
    http://autobuild.buildroot.org/results/733/733145e94d7c4f3b11e867c60a1e8f8e049a3ce0/
    http://autobuild.buildroot.org/results/666/6666f7c07339830fb45a5decb8825560ee432ce5/
    http://autobuild.buildroot.org/results/f5b/f5b1d57bd26adaf125555b97ff1eb9faf223a293/
    [...]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/quota/quota.mk

index c30a2bd85e8dccb882afe9347a8a333436887fbf..a1e343a388e55fd7e47f5bf50fe579da78150e25 100644 (file)
@@ -21,6 +21,11 @@ endif
 ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
 QUOTA_DEPENDENCIES += e2fsprogs
 QUOTA_CONF_OPTS += --enable-ext2direct
+# quote does not use pkg-config to find e2fsprogs, so it does not know it
+# may require -pthreads in case of static build
+ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
+QUOTA_LIBS += -pthread
+endif
 else
 QUOTA_CONF_OPTS += --disable-ext2direct
 endif