From 7415dcccfed3ef8018cbc37acb2cc031c6912368 Mon Sep 17 00:00:00 2001 From: Noah Wager Date: Fri, 19 Jul 2024 00:24:00 +0200 Subject: [PATCH] UBUNTU: [Packaging] Check do_lib_rust before linking Rust lib files BugLink: https://bugs.launchpad.net/bugs/2072592 Packages with falsy do_lib_rust still try to symlink the lib-rust package even though do_lib_rust prevents it from being generated. This results in a bad symlink in the headers (rust -> ../linux-lib-rust). It should check do_lib_rust before trying to link that directory. Signed-off-by: Noah Wager Acked-by: Juerg Haefliger Acked-by: Agathe Porte Signed-off-by: Stefan Bader Signed-off-by: Roxana Nicolescu --- debian/rules.d/2-binary-arch.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 986a18d7abac..89d1eb769ed9 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -485,11 +485,13 @@ endif # Strip .so files (e.g., rust/libmacros.so) to reduce size even more find $(hdrdir) -name libmacros.so -exec strip -s {} \; +ifeq ($(do_lib_rust),true) # Generate Rust lib files install -d -m755 $(rustdir) mv $(hdrdir)/rust $(rustdir) # Generate symlink for Rust lib directory in headers $(SHELL) $(DROOT)/scripts/link-lib-rust "$(hdrdir)" "$(indeppkg)" "$*" +endif ifneq ($(do_full_build),false) # Clean out this flavours build directory.