Bug#861737: gcc-7 fails to build gnat on KFreeBSD
Package: src:gcc-7
Followup-For: Bug #861737
Control: tags -1 + patch
Hello.
The system.ads symbolic link targets system-freebsd-x86.ads,
which does not exist anymore.
The attached patch targets system-freebsd.ads, like in other stanzas.
diff --git a/debian/patches/ada-system-freebsd-rename.diff b/debian/patches/ada-system-freebsd-rename.diff
new file mode 100644
index 0000000..375b15c
--- /dev/null
+++ b/debian/patches/ada-system-freebsd-rename.diff
@@ -0,0 +1,35 @@
+Description: link system.ads to system-freebsd.ads on hurd and *freebsd
+ system-freebsd-x86.ads does not exist anymore.
+Author: Nicolas Boulenguez <nicolas@debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861735
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=861737
+
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -1424,7 +1424,7 @@
+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+ $(ATOMICS_TARGET_PAIRS) \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-freebsd-x86.ads
++ system.ads<system-freebsd.ads
+
+ TOOLS_TARGET_PAIRS = \
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+@@ -1454,7 +1454,7 @@
+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+ $(ATOMICS_TARGET_PAIRS) \
+ $(X86_TARGET_PAIRS) \
+- system.ads<system-freebsd-x86.ads
++ system.ads<system-freebsd.ads
+
+ TOOLS_TARGET_PAIRS = \
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
+@@ -1482,7 +1482,7 @@
+ s-taprop.adb<s-taprop-posix.adb \
+ s-taspri.ads<s-taspri-posix.ads \
+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+- system.ads<system-freebsd-x86.ads
++ system.ads<system-freebsd.ads
+
+ TOOLS_TARGET_PAIRS = \
+ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \
diff --git a/debian/rules.patch b/debian/rules.patch
index 27ed527..1fb7582 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -231,6 +231,7 @@ debian_patches += gcc-ice-apport
debian_patches += skip-bootstrap-multilib
debian_patches += libffi-ro-eh_frame_sect
debian_patches += libffi-mips
+debian_patches += ada-system-freebsd-rename
debian_patches += ada-kfreebsd
debian_patches += ada-drop-termio-h
Reply to: