diff --git a/static_lib.patch b/static_lib.patch index 9b5d507..d196cb1 100644 --- a/static_lib.patch +++ b/static_lib.patch @@ -1,3 +1,24 @@ +From: Stefan Schubert +From: Jan Engelhardt +Date: 2024-04-15T13:34:15Z + +[Original description: Added "Requires.private: libeconf" in order to +build with static libeconf.a.] + +This patch addresses a build failure in libblkid-using programs when +one attempts to static-link the program: + +$ g++ blkid_get_cache.cpp -static `pkg-config blkid --cflags --libs --static` +ld: libblkid.a(la-config.o): in function `blkid_read_config': +libblkid/src/config.c:160:(.text+0x150): undefined reference to `econf_readFile' +ld: libblkid/src/config.c:241:(.text+0x1a1): undefined reference to `econf_freeFile' + +The patch is not upstreamable in this form, as the presence of the +Requires.private line needs to be conditionalized upon +``HAVE_LIBECONF`` (cf. meson.build/configure.ac). + +[Description updated; --jengelh] + diff -ur org/libblkid/blkid.pc.in patch/libblkid/blkid.pc.in --- org/libblkid/blkid.pc.in 2024-01-31 11:02:15.460811568 +0100 +++ patch/libblkid/blkid.pc.in 2024-04-15 15:19:34.288703597 +0200 diff --git a/util-linux.changes b/util-linux.changes index a4a3622..5bca087 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Mon Apr 15 13:27:41 UTC 2024 - Stefan Schubert -- Added "Requires.private: libeconf" in order to build with static - libeconf.a . +- Added static_lib.patch to resolve build failure when using + libblkid.pc in --static mode ------------------------------------------------------------------- Mon Apr 8 08:37:09 UTC 2024 - Thorsten Kukuk