Control: reassign -1 src:gcc-16
On Thu, May 20, 2021 at 03:07:58PM +0200, Helmut Grohne wrote:
> I noticed that building a stage1 cross compiler does not issue exactly
> the right Build-Depends. rebootstrap has traditionally ignored gcc's
> Build-Depends and just installed what it thinks was right, but maybe
> that's not the best of solutions.
>
> In particular, gcc Build-Depends on a pile of glibc stuff, which is
> quite obviously unavailable when building stage1. I'm attaching a patch
> that drops these unused dependencies. Please consider applying it.
You asked me to rebase this patch onto a higher gcc version. With much
delay, I did. In doing so, I also ran into a couple of minor issues also
fixed in this rebase. Can we get this into gcc-16 now?
Helmut
diff -Nru gcc-16-16-20260425/debian/control.m4
gcc-16-16-20260425/debian/control.m4
--- gcc-16-16-20260425/debian/control.m4 2026-04-24 17:33:28.000000000
+0200
+++ gcc-16-16-20260425/debian/control.m4 2026-05-04 10:46:09.000000000
+0200
@@ -64,7 +64,7 @@
LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP
linux-libc-dev [m68k],
dwz, LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTO_BUILD_DEP
- SOURCE_BUILD_DEP CROSS_BUILD_DEP
+ SOURCE_BUILD_DEP CROSS_BUILD_DEP dnl
ISL_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP,
libzstd-dev, zlib1g-dev, BINUTILS_BUILD_DEP,
gawk, lzma, xz-utils, patchutils,
diff -Nru gcc-16-16-20260425/debian/rules.conf
gcc-16-16-20260425/debian/rules.conf
--- gcc-16-16-20260425/debian/rules.conf 2026-03-18 11:01:54.000000000
+0100
+++ gcc-16-16-20260425/debian/rules.conf 2026-05-04 10:46:09.000000000
+0200
@@ -331,7 +331,9 @@
LIBC_DEV_DEP := $(LIBC_DEV_DEP)$(LS)$(AQ) (>= $(libc_dev_ver))
ifneq (,$(filter $(build_type), build-native cross-build-native))
- LIBC_DBG_DEP = libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-amd64 hurd-i386]
| libc6-dbg,
+ ifneq ($(DEB_STAGE),stage1)
+ LIBC_DBG_DEP = libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-amd64
hurd-i386] | libc6-dbg,
+ endif
endif
# TODO: make this automatic, there must be a better way to define LIBC_DEP.
@@ -383,6 +385,11 @@
endif
endif
+ifeq ($(DEB_STAGE),stage1)
+ LIBC_BUILD_DEP :=
+ LIBC_BIARCH_BUILD_DEP :=
+endif
+
# needed for the include/asm symlink to run the testsuite for
# non default multilibs
ifneq (,$(multilib_archs))
@@ -390,8 +397,12 @@
endif
LIBUNWIND_DEV_DEP := libunwind8-dev$(LS)$(AQ)
-LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP) [ia64],
-LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS) [ia64],
+LIBUNWIND_BUILD_DEP :=
+LIBATOMIC_OPS_BUILD_DEP :=
+ifneq ($(DEB_STAGE),stage1)
+ LIBUNWIND_BUILD_DEP += $(LIBUNWIND_DEV_DEP) [ia64],
+ LIBATOMIC_OPS_BUILD_DEP += libatomic-ops-dev$(LS) [ia64],
+endif
ifneq ($(DEB_TARGET_ARCH),ia64)
LIBUNWIND_DEV_DEP := # nothing
else ifneq (,$(filter $(DEB_STAGE),stage1 stage2))
@@ -536,7 +547,7 @@
GO_BUILD_DEP := netbase,
-RS_BUILD_DEP := cargo [$(rs_no_archs)],
+RS_BUILD_DEP := cargo $(if $(rs_no_archs),[$(rs_no_archs)]),
# try to build with itself, or with the last version
# require at least GCC 11 for the bootstrap, anything else is untested
@@ -580,6 +591,9 @@
ifneq (,$(findstring cross-build-,$(build_type)))
CROSS_BUILD_DEP += zlib1g-dev$(cross_lib_arch), libmpfr-dev$(cross_lib_arch),
endif
+ifeq ($(DEB_STAGE),stage1)
+ CROSS_BUILD_DEP :=
+endif
SOURCE_BUILD_DEP :=
ifeq (,$(findstring gcc,$(PKGSOURCE)))
SOURCE_BUILD_DEP := gcc-$(BASE_VERSION)-source (>= $(GCC_SOURCE_VERSION)),
gcc-$(BASE_VERSION)-source (<< $(NEXT_GCC_SOURCE_VERSION)),
