From 58ffd6770498b98adee67b1bb3f7bdcf5a670980 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 10 Jan 2026 11:24:10 +0100 Subject: [PATCH] packaging: adjust pkg-config files after the rust-monocrate changes Since lix-doc is no longer a separate library, the pkg-config files were broken for static builds. Adjust them to refer to the new monocrate library instead. Actually, since the monocrate library is static in all cases it needs to be linked explicitly even when everything else is linked dynamically. I assume this only doesn't break the dynamic nix-eval-jobs because it doesn't actually use anything from it. Change-Id: Icf29938688f4fa87425ff346a3105ef56a6a6964 --- lix/libcmd/lix-cmd.pc.in | 2 +- lix/libcmd/meson.build | 1 - lix/lix-base.pc.in | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lix/libcmd/lix-cmd.pc.in b/lix/libcmd/lix-cmd.pc.in index 262a5c9d0..30b3ca0a8 100644 --- a/lix/libcmd/lix-cmd.pc.in +++ b/lix/libcmd/lix-cmd.pc.in @@ -7,4 +7,4 @@ Description: Lix Package Manager (libcmd) Version: @PACKAGE_VERSION@ Requires: lix-base lix-util lix-store Requires.private: lix-fetchers lix-expr lix-main @BOEHM_IF_FOUND@ libeditline lowdown ncurses -Libs: -L${libdir} @LIBLIX_DOC_IF_STATIC@ -llixcmd +Libs: -L${libdir} -llixcmd diff --git a/lix/libcmd/meson.build b/lix/libcmd/meson.build index e76faed89..957756e2c 100644 --- a/lix/libcmd/meson.build +++ b/lix/libcmd/meson.build @@ -94,6 +94,5 @@ configure_file( 'includedir' : includedir, 'PACKAGE_VERSION' : meson.project_version(), 'BOEHM_IF_FOUND' : boehm.found() ? 'bdw-gc' : '', - 'LIBLIX_DOC_IF_STATIC' : is_static ? '-llix_doc' : '', }, ) diff --git a/lix/lix-base.pc.in b/lix/lix-base.pc.in index 3e8422770..9b3470ab2 100644 --- a/lix/lix-base.pc.in +++ b/lix/lix-base.pc.in @@ -7,3 +7,4 @@ Description: Lix Package Manager (base include dir) Version: @PACKAGE_VERSION@ Requires: kj-async Cflags: -I${includedir} +Libs: -L${libdir} -lrust_monocrate