Package: cross-gcc-dev
Version: 230
Tags: patch bullseye sid
Control: fixed 925950 230
When trying to apply the patched gcc-9 patches during a gcc-9 build, one
gets a patch application failure during cross-ma-install-location.diff.
It turns out that libmpx got removed in gcc-9, so it needs to be dropped
from cross-ma-install-location.diff as well. The attached patch does
just that.
It also seems like the fixed version in #925950 is not properly
recorded[1]. Using the opportunity to record the correct one.
Helmut
[1] Niels Thykier suggested that it was wrong when he closed the
relevant unblock. One can use "fixed 925950 230" or "fixed 925950
cross-gcc/230", but "fixed 925950 cross-gcc-dev/230" does not work.
You cannot fix something in a binary package.
--- a/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch
+++ b/patches/gcc-9/0004-added-multi-arch-specific-install-location-patch.patch
@@ -16,7 +16,7 @@
index 0000000..7dd01d0
--- /dev/null
+++ b/debian/patches/cross-ma-install-location.diff
-@@ -0,0 +1,357 @@
+@@ -0,0 +1,337 @@
+Index: b/src/libada/configure.ac
+===================================================================
+--- a/src/libada/configure.ac
@@ -340,26 +340,6 @@
+ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
+ ;;
+ no)
-+- if test -n "$with_cross_host" &&
-+- test x"$with_cross_host" != x"no"; then
-+- # Install a library built with a cross compiler in tooldir, not libdir.
-+- toolexecdir='$(exec_prefix)/$(target_alias)'
-+- toolexeclibdir='$(toolexecdir)/lib'
-+- else
-+- toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-+- toolexeclibdir='$(libdir)'
-+- fi
-++ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
-++ toolexeclibdir='$(libdir)'
-+ multi_os_directory=`$CC -print-multi-os-directory`
-+ case $multi_os_directory in
-+ .) ;; # Avoid trailing /.
-+--- a/src/libmpx/configure.ac
-++++ b/src/libmpx/configure.ac
-+@@ -70,15 +70,8 @@
-+ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
-+ ;;
-+ no)
+- if test -n "$with_cross_host" &&
+- test x"$with_cross_host" != x"no"; then
+- # Install a library built with a cross compiler in tooldir, not libdir.
