Package: libgcc-s1 Version: 13.2.0-8 Tags: patch User: helm...@debian.org Usertags: dep17
Hi Matthias, for finalizing the /usr-merge transition via DEP17, we want to move all aliased files to /usr. I'm attaching a patch that implements this for libgcc_s.so.1 which is the only file from the gcc-13 source package affected (+ multilibs). Since this change must not affect bookworm and earlier, I've implemented it in a backports-compatible way. Helmut
--- a/debian/rules2 +++ b/debian/rules2 @@ -971,17 +971,20 @@ endif # PFL is the installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds -ifeq ($(DEB_CROSS),yes) - PFL = $(PF)/$(DEB_TARGET_GNU_TYPE) +PFL = $(PF) +# RPF is the base prefix or installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds +# DEP17: move to /usr in trixie and noble +ifneq (,$(filter $(distrelease),jessie stretch buster bullseye bookworm precise trusty xenial bionic focal groovy hirsute impish jammy kinetic lunar mantic)) + RPF = else - PFL = $(PF) + RPF = $(PF) endif -# RPF is the base prefix or installation prefix with DEB_TARGET_GNU_TYPE attached for cross builds ifeq ($(DEB_CROSS),yes) +ifneq ($(DEB_STAGE),rtlibs) + PFL = $(PF)/$(DEB_TARGET_GNU_TYPE) RPF = $(PF)/$(DEB_TARGET_GNU_TYPE) -else - RPF = +endif endif ifeq ($(with_multiarch_lib),yes) @@ -1053,8 +1056,6 @@ endif ifeq ($(DEB_STAGE)-$(DEB_CROSS),rtlibs-yes) - PFL = $(PF) - RPF = libdir = lib/$(DEB_TARGET_MULTIARCH) usr_lib = $(PF)/lib/$(DEB_TARGET_MULTIARCH) endif