Bug#707766: gcc-4.8: FTBFS on m68k: needs patch unfuzzing
Source: gcc-4.8
Version: 4.8.0-6
Severity: important
Tags: patch
Hi,
src:gcc-4.8 FTBFS on m68k because it fails to apply patches:
[…]
Applying patch gcc-d-lang.diff
patching file src/gcc/d/lang-specs.h
patching file src/gcc/d/lang.opt
Applying patch m68k-ada.diff
patching file src/gcc/ada/gcc-interface/Makefile.in
Hunk #1 FAILED at 1871.
1 out of 1 hunk FAILED -- rejects in file src/gcc/ada/gcc-interface/Makefile.in
patching file src/gcc/ada/s-memory.adb
patching file src/gcc/ada/s-memory.ads
patching file src/gcc/ada/system-linux-m68k.ads
Patch m68k-ada.diff does not apply (enforce with -f)
make: *** [stamps/02-patch-stamp] Error 1
I’ve noticed the same on i386 when running the following command:
debian/rules GCC_TARGET=m68k patch
(I expect the same patches to be applied for a cross-compiler to
Linux/m68k like for a native compiler on Linux/m68k.)
I’ve refreshed the patch in question and attached the result, but
I noticed that many patches apply only with offset or even quite
some fuzz (and, huh, quilt is colourful now!). I suggest that you
unfuzz all patches and then test, for every Debian architecture,
that they apply (like above), before the next upload.
Thanks!
bye,
//mirabilos
--
Sometimes they [people] care too much: pretty printers [and syntax highligh-
ting, d.A.] mechanically produce pretty output that accentuates irrelevant
detail in the program, which is as sensible as putting all the prepositions
in English text in bold font. -- Rob Pike in "Notes on Programming in C"
--- gcc-4.8-4.8.0/debian/patches/m68k-ada.diff
+++ gcc-4.8-4.8.0/debian/patches/m68k-ada.diff
@@ -11,14 +11,13 @@
Add Gnat_Malloc -> __gnat_malloc export.
* s-memory.ads: Remove Alloc -> __gnat_malloc export.
-Index: gcc-4.6-4.6.3/src/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- gcc-4.6-4.6.3.orig/src/gcc/ada/gcc-interface/Makefile.in 2012-03-04 16:06:01.000000000 +0000
-+++ gcc-4.6-4.6.3/src/gcc/ada/gcc-interface/Makefile.in 2012-03-04 16:06:49.000000000 +0000
-@@ -1871,6 +1871,34 @@
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -1919,6 +1919,35 @@ ifeq ($(strip $(filter-out arm%-linux,$(
LIBRARY_VERSION := $(LIB_VERSION)
endif
++# m68k Linux
+ifeq ($(strip $(filter-out m68k% linux%,$(arch) $(osys))),)
+ LIBGNAT_TARGET_PAIRS = \
+ a-intnam.ads<a-intnam-linux.ads \
@@ -47,14 +46,12 @@
+ LIBRARY_VERSION := $(LIB_VERSION)
+endif
+
+ # Sparc Linux
ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
LIBGNAT_TARGET_PAIRS_COMMON = \
- a-intnam.ads<a-intnam-linux.ads \
-Index: gcc-4.6-4.6.3/src/gcc/ada/s-memory.adb
-===================================================================
---- gcc-4.6-4.6.3.orig/src/gcc/ada/s-memory.adb 2012-03-04 16:06:01.000000000 +0000
-+++ gcc-4.6-4.6.3/src/gcc/ada/s-memory.adb 2012-03-04 16:06:49.000000000 +0000
-@@ -47,6 +47,7 @@
+--- a/src/gcc/ada/s-memory.adb
++++ b/src/gcc/ada/s-memory.adb
+@@ -47,6 +47,7 @@ with Ada.Exceptions;
with System.Soft_Links;
with System.Parameters;
with System.CRTL;
@@ -62,7 +59,7 @@
package body System.Memory is
-@@ -100,6 +101,22 @@
+@@ -100,6 +101,22 @@ package body System.Memory is
return Result;
end Alloc;
@@ -85,11 +82,9 @@
----------
-- Free --
----------
-Index: gcc-4.6-4.6.3/src/gcc/ada/s-memory.ads
-===================================================================
---- gcc-4.6-4.6.3.orig/src/gcc/ada/s-memory.ads 2012-03-04 16:06:01.000000000 +0000
-+++ gcc-4.6-4.6.3/src/gcc/ada/s-memory.ads 2012-03-04 16:06:49.000000000 +0000
-@@ -100,7 +100,6 @@
+--- a/src/gcc/ada/s-memory.ads
++++ b/src/gcc/ada/s-memory.ads
+@@ -100,7 +100,6 @@ private
-- The following names are used from the generated compiler code
@@ -97,10 +92,8 @@
pragma Export (C, Free, "__gnat_free");
pragma Export (C, Realloc, "__gnat_realloc");
-Index: gcc-4.6-4.6.3/src/gcc/ada/system-linux-m68k.ads
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4.6-4.6.3/src/gcc/ada/system-linux-m68k.ads 2012-03-04 16:06:49.000000000 +0000
+--- /dev/null
++++ b/src/gcc/ada/system-linux-m68k.ads
@@ -0,0 +1,153 @@
+------------------------------------------------------------------------------
+-- --
Reply to: