Package: src:gcc-4.9 Version: 4.9.0-6 Severity: normal Tags: patch User: helm...@debian.org Usertags: rebootstrap
Hi doko, powerpcspe currently fails patch application. Relevant log: from https://jenkins.debian.net/view/rebootstrap/job/rebootstrap_powerpcspe_gcc49/3/console | Applying patch powerpc_remove_many.diff | patching file src/gcc/config/rs6000/rs6000.h | Hunk #1 succeeded at 101 (offset 3 lines). | Hunk #2 FAILED at 176. | 1 out of 2 hunks FAILED -- rejects in file src/gcc/config/rs6000/rs6000.h | Patch powerpc_remove_many.diff does not apply (enforce with -f) | debian/rules.patch:339: recipe for target 'stamps/02-patch-stamp' failed | make: *** [stamps/02-patch-stamp] Error 1 | dpkg-buildpackage: error: debian/rules control gave error exit status 2 Please consider applying the attached patch to resolve this issue. Helmut
diff -u gcc-4.9-4.9.0/debian/changelog gcc-4.9-4.9.0/debian/changelog --- gcc-4.9-4.9.0/debian/changelog +++ gcc-4.9-4.9.0/debian/changelog @@ -1,3 +1,12 @@ +gcc-4.9 (4.9.0-6.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Fix patch application for powerpcspe: Closes: #-1. + + Update context for powerpc_remove_many. + + Drop gcc-powerpcspe-ldbl-fix applied upstream. + + -- Helmut Grohne <hel...@subdivi.de> Mon, 09 Jun 2014 13:18:22 +0200 + gcc-4.9 (4.9.0-6) unstable; urgency=medium * Update to SVN 20140608 (r211353) from the gcc-4_9-branch. diff -u gcc-4.9-4.9.0/debian/patches/powerpc_remove_many.diff gcc-4.9-4.9.0/debian/patches/powerpc_remove_many.diff --- gcc-4.9-4.9.0/debian/patches/powerpc_remove_many.diff +++ gcc-4.9-4.9.0/debian/patches/powerpc_remove_many.diff @@ -23,6 +23,7 @@ %{mcpu=e500mc64: -me500mc64} \ %{maltivec: -maltivec} \ %{mvsx: -mvsx %{!maltivec: -maltivec} %{!mcpu*: %(asm_cpu_power7)}} \ + %{mpower8-vector|mcrypto|mdirect-move|mhtm: %{!mcpu*: %(asm_cpu_power8)}} \ --many" +" \ +ASM_CPU_SPU_MANY_NOT_SPE diff -u gcc-4.9-4.9.0/debian/rules.patch gcc-4.9-4.9.0/debian/rules.patch --- gcc-4.9-4.9.0/debian/rules.patch +++ gcc-4.9-4.9.0/debian/rules.patch @@ -203,7 +203,6 @@ ifeq ($(DEB_TARGET_ARCH),powerpcspe) debian_patches += powerpc_remove_many debian_patches += powerpc_nofprs - debian_patches += gcc-powerpcspe-ldbl-fix endif #debian_patches += link-libs