Bug#360498: gcc-4.1: FTBFS (ppc64): ppc64-biarch.dpatch does not apply cleanly
Package: gcc-4.1
Version: 4.1.0-1
Severity: normal
Tags: patch
When building 'gcc-4.1' on ppc64/unstable,
I get the following error:
if [ -x debian/patches/ppc64-biarch.dpatch ]; then true; else chmod +x debian/patches/ppc64-biarch.dpatch; fi
if [ -f stamps/02-patch-stamp-ppc64-biarch ]; then \
echo "ppc64-biarch patches already applied."; exit 1; \
fi
DEB_VERSION='4.1.0-1'; export DEB_VERSION; \
debian/patches/ppc64-biarch.dpatch -patch -d /gcc-4.1-4.1.0/src
patching file gcc/config/rs6000/t-linux64
Hunk #1 succeeded at 6 with fuzz 2 (offset -2 lines).
Hunk #2 FAILED at 32.
1 out of 2 hunks FAILED -- saving rejects to file gcc/config/rs6000/t-linux64.rej
patching file libjava/configure.host
Hunk #1 succeeded at 138 with fuzz 1 (offset 15 lines).
patching file config-ml.in
Hunk #1 succeeded at 432 (offset 32 lines).
make: *** [stamps/02-patch-stamp-ppc64-biarch] Error 1
With the attached patch 'gcc-4.1' can be compiled on ppc64.
The patch changes ppc64-biarch.dpatch so that it applies cleanly to
the gcc-4.1 sources.
The patch also adds libssp and libffi to the 32-bit libraries
which are created during the build.
Regards
Andreas Jochens
diff -urN ../tmp-orig/gcc-4.1-4.1.0/debian/patches/ppc64-biarch.dpatch ./debian/patches/ppc64-biarch.dpatch
--- ../tmp-orig/gcc-4.1-4.1.0/debian/patches/ppc64-biarch.dpatch 2006-04-02 06:39:40.000000000 +0000
+++ ./debian/patches/ppc64-biarch.dpatch 2006-04-01 14:00:11.000000000 +0000
@@ -44,20 +44,6 @@
# We want fine grained libraries, so use the new code to build the
# floating point emulation libraries.
-@@ -37,8 +34,11 @@
- mklibgcc: bispecs
-
- bispecs: specs
-- if [ x`$(GCC_FOR_TARGET) -print-multi-os-directory` = x../lib ]; then \
-+ touch f-test.c; \
-+ $(GCC_FOR_TARGET) -c f-test.c -o f-test.o; \
-+ if [ "x`file f-test.o | grep 64-bit`" = "x" ]; then \
- sed -e '/cc1_options/{ n; s/$$/ %{m64:-mlong-double-128}/; }' < specs > $@; \
- else \
- sed -e '/cc1_options/{ n; s/$$/ %{!m32:-mlong-double-128}/; }' < specs > $@; \
-- fi
-+ fi; \
-+ rm f-test.c f-test.o;
diff -urN tmp/libjava/configure.host src/libjava/configure.host
--- tmp/libjava/configure.host 25 Nov 2004 03:46:56 -0000
+++ src/libjava/configure.host 15 Dec 2004 15:45:22 -0000
@@ -79,7 +65,7 @@
diff -urN tmp/config-ml.in src/config-ml.in
--- tmp/config-ml.in 2004-11-09 08:07:29.000000000 +0000
+++ src/config-ml.in 2004-12-12 07:12:44.631147816 +0000
-@@ -400,7 +400,47 @@
+@@ -400,7 +400,49 @@
;;
esac
;;
@@ -100,6 +86,8 @@
+ *32* ) case ${ml_realsrcdir} in
+ *"libstdc++-v3" ) multidirs="${multidirs} ${x}" ;;
+ *"libgfortran" ) multidirs="${multidirs} ${x}" ;;
++ *"libffi" ) multidirs="${multidirs} ${x}" ;;
++ *"libssp" ) multidirs="${multidirs} ${x}" ;;
+ *"libobjc" ) multidirs="${multidirs} ${x}" ;;
+ *"libiberty" ) multidirs="${multidirs} ${x}" ;;
+ *"zlib" ) multidirs="${multidirs} ${x}" ;;
Reply to: