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

Bug#782071: marked as done (gcc-5 patches no longer apply at all)

Your message dated Fri, 24 Apr 2015 00:34:59 -0700
with message-id <878udi0yi0.fsf@secretsauce.net>
and subject line patches applied
has caused the Debian Bug report #782071,
regarding gcc-5 patches no longer apply at all
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
782071: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782071
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: cross-gcc-dev
Version: 13
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

The gcc-5 patch set no longer applies at all. The cxx_inc_dir make
variable was removed entirely, thus hunk that changes it no longer
applies. It can simply be dropped.

Helmut

diff -Nru cross-gcc-13/debian/changelog cross-gcc-13+nmu1/debian/changelog
--- cross-gcc-13/debian/changelog	2015-01-28 07:18:12.000000000 +0100
+++ cross-gcc-13+nmu1/debian/changelog	2015-04-07 13:12:26.000000000 +0200
@@ -1,3 +1,10 @@
+cross-gcc (13+nmu1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix gcc-5 patches to apply against 5-20150404. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 07 Apr 2015 13:11:36 +0200
+
 cross-gcc (13) unstable; urgency=medium
 
   * Supporting multiple gcc trees at the same time. Currently 4.9 and 5
diff -Nru cross-gcc-13/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch cross-gcc-13+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch
--- cross-gcc-13/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch	2015-01-28 07:18:12.000000000 +0100
+++ cross-gcc-13+nmu1/patches/gcc-5/0004-reverted-removal-of-with_deps_on_target_arch_pkgs-in.patch	2015-04-07 13:11:17.000000000 +0200
@@ -712,19 +712,6 @@
    endif
  else
    usr_lib = $(PFL)/$(libdir)
-@@ -921,7 +942,11 @@ ifneq ($(DEB_CROSS),yes)
-     cxx_inc_dir	= $(PF)/include/c++/$(GCC_VERSION)
-   endif
- else
--  cxx_inc_dir	= $(PF)/$(TARGET_ALIAS)/include/c++/$(GCC_VERSION)
-+  ifeq ($(with_deps_on_target_arch_pkgs),yes)
-+    cxx_inc_dir	= $(PF)/include/c++/$(BASE_VERSION)
-+  else
-+    cxx_inc_dir	= $(PF)/$(TARGET_ALIAS)/include/c++/$(GCC_VERSION)
-+  endif
- endif
- 
- # FIXME: MULTIARCH_DIRNAME needed for g++-multiarch-incdir.diff
 @@ -1750,8 +1775,13 @@ ifneq ($(DEB_CROSS),yes)
    p_lgcc = libgcc$(GCC_SONAME)
  else

--- End Message ---
--- Begin Message --- 
Fixed in cross-gcc-dev=15

--- End Message ---
Reply to: