Control: tags -1 + patch This patch seems to be sufficient to fix the issue in gcc-4.8; it should be fairly clear how to do the same for the others:
Attachment:
pgpQQBJMsQU9Y.pgp
Description: PGP signature
diff -u gcc-4.8-4.8.1/debian/control.m4 gcc-4.8-4.8.1/debian/control.m4
--- gcc-4.8-4.8.1/debian/control.m4
+++ gcc-4.8-4.8.1/debian/control.m4
@@ -811,7 +811,7 @@
Priority: ifdef(`TARGET',`extra',`PRI(optional)')
Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libdevdep(stdc++`'PV-dev,,=), ${shlibs:Depends}, ${misc:Depends}
Provides: c++-compiler`'TS`'ifdef(`TARGET)',`',`, c++abi2-dev')
-Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libdbgdep(stdc++CXX_SO`'PV-dbg,)
+Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), libdbgdep(stdc++CXX_SO-dbg,)
BUILT_USING`'dnl
Description: GNU C++ compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
@@ -3550,17 +3550,18 @@
environment.
')`'dnl
-Package: libstdc++CXX_SO`'PV-dbg`'LS
+ifenabled(`libcxx',`
+Package: libstdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`dnl
ifdef(`MULTIARCH', `Multi-Arch: same',`dnl')
-Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl
+Provides: libstdc++'CXX_SO`-dbg-armel [armel], libstdc++'CXX_SO`-dbg-armhf [armhf]dnl
')
Recommends: libdevdep(stdc++`'PV-dev,)
-Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS, libstdc++6-4.2-dbg`'LS, libstdc++6-4.3-dbg`'LS, libstdc++6-4.4-dbg`'LS, libstdc++6-4.5-dbg`'LS, libstdc++6-4.6-dbg`'LS, libstdc++6-4.7-dbg`'LS
+Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS, libstdc++6-4.2-dbg`'LS, libstdc++6-4.3-dbg`'LS, libstdc++6-4.4-dbg`'LS, libstdc++6-4.5-dbg`'LS, libstdc++6-4.6-dbg`'LS, libstdc++6-4.7-dbg`'LS, libstdc++6-4.8-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3570,6 +3571,7 @@
This package contains files for TARGET architecture, for use in cross-compile
environment.
')`'dnl
+')`'dnl libcxx
Package: lib32stdc++`'PV-dev`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch32_archs')
@@ -3590,14 +3592,15 @@
environment.
')`'dnl
-Package: lib32stdc++CXX_SO`'PV-dbg`'LS
+ifenabled(`lib32cxx',`
+Package: lib32stdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch32_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,32), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,32,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-Conflicts: lib32stdc++6-dbg`'LS, lib32stdc++6-4.0-dbg`'LS, lib32stdc++6-4.1-dbg`'LS, lib32stdc++6-4.2-dbg`'LS, lib32stdc++6-4.3-dbg`'LS, lib32stdc++6-4.4-dbg`'LS, lib32stdc++6-4.5-dbg`'LS, lib32stdc++6-4.6-dbg`'LS, lib32stdc++6-4.7-dbg`'LS,
+Conflicts: lib32stdc++6-dbg`'LS, lib32stdc++6-4.0-dbg`'LS, lib32stdc++6-4.1-dbg`'LS, lib32stdc++6-4.2-dbg`'LS, lib32stdc++6-4.3-dbg`'LS, lib32stdc++6-4.4-dbg`'LS, lib32stdc++6-4.5-dbg`'LS, lib32stdc++6-4.6-dbg`'LS, lib32stdc++6-4.7-dbg`'LS, lib32stdc++6-4.8-dbg`'LS,
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3607,6 +3610,7 @@
This package contains files for TARGET architecture, for use in cross-compile
environment.
')`'dnl
+')`'dnl lib32cxx
Package: lib64stdc++`'PV-dev`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
@@ -3627,14 +3631,15 @@
environment.
')`'dnl
-Package: lib64stdc++CXX_SO`'PV-dbg`'LS
+ifenabled(`lib64cxx',`
+Package: lib64stdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarch64_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,64), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,64,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-Conflicts: lib64stdc++6-dbg`'LS, lib64stdc++6-4.0-dbg`'LS, lib64stdc++6-4.1-dbg`'LS, lib64stdc++6-4.2-dbg`'LS, lib64stdc++6-4.3-dbg`'LS, lib64stdc++6-4.4-dbg`'LS, lib64stdc++6-4.5-dbg`'LS, lib64stdc++6-4.6-dbg`'LS, lib64stdc++6-4.7-dbg`'LS
+Conflicts: lib64stdc++6-dbg`'LS, lib64stdc++6-4.0-dbg`'LS, lib64stdc++6-4.1-dbg`'LS, lib64stdc++6-4.2-dbg`'LS, lib64stdc++6-4.3-dbg`'LS, lib64stdc++6-4.4-dbg`'LS, lib64stdc++6-4.5-dbg`'LS, lib64stdc++6-4.6-dbg`'LS, lib64stdc++6-4.7-dbg`'LS, lib64stdc++6-4.8-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3644,6 +3649,7 @@
This package contains files for TARGET architecture, for use in cross-compile
environment.
')`'dnl
+')`'dnl lib64cxx
Package: libn32stdc++`'PV-dev`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
@@ -3664,14 +3670,15 @@
environment.
')`'dnl
-Package: libn32stdc++CXX_SO`'PV-dbg`'LS
+ifenabled(`libn32cxx',`
+Package: libn32stdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchn32_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,n32), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,n32,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libn32stdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-Conflicts: libn32stdc++6-dbg`'LS, libn32stdc++6-4.0-dbg`'LS, libn32stdc++6-4.1-dbg`'LS, libn32stdc++6-4.2-dbg`'LS, libn32stdc++6-4.3-dbg`'LS, libn32stdc++6-4.4-dbg`'LS, libn32stdc++6-4.5-dbg`'LS, libn32stdc++6-4.6-dbg`'LS, libn32stdc++6-4.7-dbg`'LS
+Conflicts: libn32stdc++6-dbg`'LS, libn32stdc++6-4.0-dbg`'LS, libn32stdc++6-4.1-dbg`'LS, libn32stdc++6-4.2-dbg`'LS, libn32stdc++6-4.3-dbg`'LS, libn32stdc++6-4.4-dbg`'LS, libn32stdc++6-4.5-dbg`'LS, libn32stdc++6-4.6-dbg`'LS, libn32stdc++6-4.7-dbg`'LS, libn32stdc++6-4.8-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3681,6 +3688,7 @@
This package contains files for TARGET architecture, for use in cross-compile
environment.
')`'dnl
+')`'dnl libn32cxx
ifenabled(`x32dev',`
Package: libx32stdc++`'PV-dev`'LS
@@ -3704,14 +3712,14 @@
')`'dnl x32dev
ifenabled(`libx32dbgcxx',`
-Package: libx32stdc++CXX_SO`'PV-dbg`'LS
+Package: libx32stdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,x32), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,x32,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libx32stdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-Conflicts: libx32stdc++6-dbg`'LS, libx32stdc++6-4.6-dbg`'LS, libx32stdc++6-4.7-dbg`'LS
+Conflicts: libx32stdc++6-dbg`'LS, libx32stdc++6-4.6-dbg`'LS, libx32stdc++6-4.7-dbg`'LS, libx32stdc++6-4.8-dbg`'LS,
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3743,14 +3751,14 @@
environment.
')`'dnl
-Package: libhfstdc++CXX_SO`'PV-dbg`'LS
+Package: libhfstdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchhf_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,hf), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,hf,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-ifdef(`TARGET',`dnl',`Conflicts: libhfstdc++6-dbg`'LS, libhfstdc++6-4.3-dbg`'LS, libhfstdc++6-4.4-dbg`'LS, libhfstdc++6-4.5-dbg`'LS, libhfstdc++6-4.6-dbg`'LS, libhfstdc++6-4.7-dbg`'LS, libstdc++'CXX_SO`-armhf [biarchhf_archs]')
+ifdef(`TARGET',`dnl',`Conflicts: libhfstdc++6-dbg`'LS, libhfstdc++6-4.3-dbg`'LS, libhfstdc++6-4.4-dbg`'LS, libhfstdc++6-4.5-dbg`'LS, libhfstdc++6-4.6-dbg`'LS, libhfstdc++6-4.7-dbg`'LS, libhfstdc++6-4.8-dbg`'LS, libstdc++'CXX_SO`-armhf [biarchhf_archs]')
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -3782,14 +3790,14 @@
environment.
')`'dnl
-Package: libsfstdc++CXX_SO`'PV-dbg`'LS
+Package: libsfstdc++CXX_SO-dbg`'LS
Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchsf_archs')
Section: debug
Priority: extra
Depends: BASEDEP, libdep(stdc++CXX_SO,sf), libdevdep(stdc++`'PV-dev,), libdbgdep(gcc`'GCC_SO-dbg,sf,>=,${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-ifdef(`TARGET',`dnl',`Conflicts: libsfstdc++6-dbg`'LS, libsfstdc++6-4.3-dbg`'LS, libsfstdc++6-4.4-dbg`'LS, libsfstdc++6-4.5-dbg`'LS, libsfstdc++6-4.6-dbg`'LS, libsfstdc++6-4.7-dbg`'LS, libstdc++'CXX_SO`-armel [biarchsf_archs]')
+ifdef(`TARGET',`dnl',`Conflicts: libsfstdc++6-dbg`'LS, libsfstdc++6-4.3-dbg`'LS, libsfstdc++6-4.4-dbg`'LS, libsfstdc++6-4.5-dbg`'LS, libsfstdc++6-4.6-dbg`'LS, libsfstdc++6-4.7-dbg`'LS, libsfstdc++6-4.8-dbg`'LS, libstdc++'CXX_SO`-armel [biarchsf_archs]')
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
diff -u gcc-4.8-4.8.1/debian/rules.conf gcc-4.8-4.8.1/debian/rules.conf
--- gcc-4.8-4.8.1/debian/rules.conf
+++ gcc-4.8-4.8.1/debian/rules.conf
@@ -33,7 +33,7 @@
_lib_name = $(subst $(SPACE),, \
lib$(2)$(1) \
$(if $(filter dev,$(3)),,$(call _soname,$(1))) \
- $(if $(or $(filter $(3),dev),$(and $(filter $(3),dbg),$(filter $(1),stdc++))),-$(BASE_VERSION)) \
+ $(if $(filter $(3),dev),-$(BASE_VERSION)) \
$(if $(3),-$(3))$(LS)$(AQ))
# $(call _lib_vers,<ext>,<vers>)
_lib_vers = ($(if $(filter $(1),dev),=,>=) $(2))
diff -u gcc-4.8-4.8.1/debian/rules.d/binary-libstdcxx.mk gcc-4.8-4.8.1/debian/rules.d/binary-libstdcxx.mk
--- gcc-4.8-4.8.1/debian/rules.d/binary-libstdcxx.mk
+++ gcc-4.8-4.8.1/debian/rules.d/binary-libstdcxx.mk
@@ -75,13 +75,13 @@
p_libsf = libsfstdc++$(CXX_SONAME)$(cross_lib_arch)
p_dev = libstdc++$(libstdc_ext)-dev$(cross_lib_arch)
p_pic = libstdc++$(libstdc_ext)-pic$(cross_lib_arch)
-p_dbg = libstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbg64 = lib64stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbg32 = lib32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbgn32= libn32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbgx32= libx32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbghf = libhfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
-p_dbgsf = libsfstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
+p_dbg = libstdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbg64 = lib64stdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbg32 = lib32stdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbgn32= libn32stdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbgx32= libx32stdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbghf = libhfstdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
+p_dbgsf = libsfstdc++$(CXX_SONAME)-dbg$(cross_lib_arch)
p_libd = libstdc++$(libstdc_ext)-doc
d_lib = debian/$(p_lib)
@@ -192,7 +192,7 @@
debian/dh_doclink -p$(p_l) $(p_base)
debian/dh_rmemptydirs -p$(p_l)
- dh_strip -p$(p_l) --dbg-package=$(1)-$(BASE_VERSION)-dbg$(cross_lib_arch)
+ dh_strip -p$(p_l) --dbg-package=$(1)-dbg$(cross_lib_arch)
dh_compress -p$(p_l)
dh_fixperms -p$(p_l)
@@ -292,7 +292,7 @@
endef
do_libstdcxx = $(call __do_libstdcxx,lib$(1)stdc++$(CXX_SONAME),$(1))
-do_libstdcxx_dbg = $(call __do_libstdcxx_dbg,lib$(1)stdc++$(CXX_SONAME)$(libstdc_ext),$(1))
+do_libstdcxx_dbg = $(call __do_libstdcxx_dbg,lib$(1)stdc++$(CXX_SONAME),$(1))
do_libstdcxx_dev = $(call __do_libstdcxx_dev,lib$(1)stdc++-$(BASE_VERSION)-dev,$(1))
# ----------------------------------------------------------------------
-- Hi! I'm a .signature virus! Copy me into your ~/.signature to help me spread!