Bug#644439: Bootstrap stage1 cross-compiler depends on nonexistent libgcc
Source: gcc-4.6
Version: 4.6.1-13
Followup-For: Bug #644439
Oops, when I attached the patch I nabbed the wrong one from my
directory.
The first hunk (rules.conf) of the attached patch is the same as the
original except without the whitespace-reindent, as it makes the the
patch easier to read.
The second hunk (rules.defs) is necessary to prevent with_libgcc from
getting unconditionally enabled even when DEB_STAGE=stage1. This makes
the with_libgcc part look exactly like all the other with_common_libs
shared library conditionals, so it seems obviously correct to me.
Please let me know if you have any questions, comments, or critiques.
Thanks!
Cheers,
Kyle Moffett
diff -ru gcc-4.6-4.6.1.orig/debian/rules.conf gcc-4.6-4.6.1/debian/rules.conf
--- gcc-4.6-4.6.1.orig/debian/rules.conf 2011-10-05 18:21:18.000000000 -0400
+++ gcc-4.6-4.6.1/debian/rules.conf 2011-10-05 18:26:02.000000000 -0400
@@ -483,6 +483,7 @@
DEB_LIBGCC_VERSION := $(DEB_EVERSION)
endif
+ifeq ($(with_libgcc),yes)
LIBGCC_DEP := libgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION))
LIBGCC_BIARCH_DEP :=
ifeq ($(biarch64),yes)
@@ -504,6 +505,7 @@
ifeq ($(biarchsf),yes)
LIBGCC_BIARCH_DEP := libsfgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION))
endif
+endif
GNAT_VERSION := $(BASE_VERSION)
diff -ru gcc-4.6-4.6.1.orig/debian/rules.defs gcc-4.6-4.6.1/debian/rules.defs
--- gcc-4.6-4.6.1.orig/debian/rules.defs 2011-10-05 18:21:18.000000000 -0400
+++ gcc-4.6-4.6.1/debian/rules.defs 2011-10-05 18:17:31.000000000 -0400
@@ -878,6 +878,11 @@
#endif
endif
+ # Shared libgcc --------------------
+ ifeq ($(with_libgcc),$(with_common_libs),yes-yes)
+ with_shared_libgcc := yes
+ endif
+
# fixincludes -------
ifneq ($(DEB_CROSS),yes)
ifeq ($(with_common_pkgs),yes)
@@ -885,12 +890,6 @@
endif
endif
- # Shared libgcc --------------------
- ifeq ($(with_common_libs),yes)
- with_libgcc := yes
- with_shared_libgcc := yes
- endif
-
# libgcc-math --------------------
with_libgmath := no
ifneq (,$(findstring i486,$(DEB_TARGET_ARCH)))
Reply to: