[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#783731: patch application fails for gcc-5



Package: cross-gcc-dev
Version: 17
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Patch application fails with gcc-5. The attached patch fixes that. No
provisions are made as to whether the resulting source tree can be
built.

Helmut
diff -Nru cross-gcc-17/debian/changelog cross-gcc-17+nmu1/debian/changelog
--- cross-gcc-17/debian/changelog	2015-04-26 05:17:35.000000000 +0200
+++ cross-gcc-17+nmu1/debian/changelog	2015-04-29 16:58:26.000000000 +0200
@@ -1,3 +1,10 @@
+cross-gcc (17+nmu1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix patch application for gcc-5. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Wed, 29 Apr 2015 16:58:16 +0200
+
 cross-gcc (17) experimental; urgency=medium
 
   * rules.generic now specifies bash as the SHELL (Closes: #780583)
diff -Nru cross-gcc-17/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch cross-gcc-17+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch
--- cross-gcc-17/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch	2015-04-26 02:54:06.000000000 +0200
+++ cross-gcc-17+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch	2015-04-29 16:58:03.000000000 +0200
@@ -511,9 +511,9 @@
 --- a/debian/rules.defs
 +++ b/debian/rules.defs
 @@ -177,6 +177,9 @@ else
-   ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
      # cross compiler, sets WITH_SYSROOT on it's own
      DEB_CROSS = yes
+     build_type = build-cross
 +    ifeq ($(with_deps_on_target_arch_pkgs),yes)
 +      with_sysroot = /
 +    endif

Reply to: