Skip to contentSkip to conversation

e2fsprogs: add packageconfig for -file-

PATCH In review Randy MacLeod 2 participants 2 messages Sep 19, 2016

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 e2fsprogs: add packageconfig for -file-

Without a packageconfig dependency for the file utility, there's a rare compile faiure caused by a race where the magic.h header file is not found:

../../../git/lib/support/plausible.c:33:19: fatal error: magic.h: No such file or directory

This file, plausible.c, is part of libsupport.a which is used by many binaries produced by the e2fsprogs package. plausible.c attempts to dynamically load libmagic.so if the e2fsprogs configure detects that magic was available. Adding the packageconfig will eliminate the compile-time as well as the possible configure-time race condition.

---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb +2 -1
index f4855bc..0d7a42b 100644
@@ -22,7 +22,8 @@ EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
 
 EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "file"
+PACKAGECONFIG[file] = ',,file'
 PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse'
 
 do_configure_prepend () {
Signature · 1 line
1.9.1
#1 lore raw

meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ · line 26

Quoted 3 lines · Randy MacLeod
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb +2 -0
+PACKAGECONFIG ??= "file"
+PACKAGECONFIG[file] = ',,file'

This still has the non-determinism problem if file is disabled in PACKAGECONFIG.

If the configure.ac doesn't have options but is doing standard AC_CHECK_HEADERS or similar then you can preseed the autoconf cache values, grepping oe-core or ac_cv_ will find plenty of prior art.

Ross