Bug#774010: fix patches for with_deps_on_target_arch_pkgs=yes DEB_STAGE=stage2
On Sat, Dec 27, 2014 at 10:31:43PM -0800, Dima Kogan wrote:
> Hi. Thanks for this, but there's no patch attached. When you do send the
> patch, I intend to apply it when making builds for doko's next release
> (4.9.2-11), whenever that happens. Would that be ok with you?
Sorry, attached now. Apply whenever you see fit. There is no need to do
an extra upload just for this patch.
Helmut
Subject: fix with_deps_on_target_arch_pkgs=yes DEB_STAGE=stage2 build
In stage2 $addons would unconditionally contain gccxbase, but the actual build
would attempt to create gcc-4.9-base:$DEB_TARGET_ARCH which is not listed in
d/control, because gccbase was missing from $addons. When building
with_deps_on_target_arch_pkgs=yes, $addons must contain gccbase rather than
gccxbase.
Index: gcc-4.9-4.9.2/debian/rules.conf
===================================================================
--- gcc-4.9-4.9.2.orig/debian/rules.conf 2014-12-25 14:01:56.725573014 +0100
+++ gcc-4.9-4.9.2/debian/rules.conf 2014-12-25 14:09:24.645573443 +0100
@@ -654,7 +654,12 @@
addons += $(if $(findstring armel,$(biarchhfarchs)),armml)
addons += $(if $(findstring armhf,$(biarchsfarchs)),armml)
ifeq ($(DEB_STAGE),stage2)
- addons += libgcc gccxbase
+ addons += libgcc
+ ifeq ($(with_deps_on_target_arch_pkgs),yes)
+ addons += gccbase
+ else
+ addons += gccxbase
+ endif
ifeq ($(multilib),yes)
addons += lib32gcc lib64gcc libn32gcc
addons += $(if $(findstring amd64,$(biarchx32archs)),libx32gcc)
Reply to: