[glibc] 01/01: debian/rules: only build -dev multilib packages in stage1. Closes: #881454, #881646.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch glibc-2.25
in repository glibc.
commit aee4e1c502b484768b1c7b79a36f9296da93e57a
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Nov 14 23:17:43 2017 +0100
debian/rules: only build -dev multilib packages in stage1. Closes: #881454, #881646.
---
debian/changelog | 2 ++
debian/rules | 6 ++++++
debian/sysdeps/amd64.mk | 4 ++--
debian/sysdeps/armel.mk | 2 +-
debian/sysdeps/armhf.mk | 2 +-
debian/sysdeps/i386.mk | 4 ++--
debian/sysdeps/kfreebsd-amd64.mk | 2 +-
debian/sysdeps/mips.mk | 4 ++--
debian/sysdeps/mips64.mk | 4 ++--
debian/sysdeps/mips64el.mk | 4 ++--
debian/sysdeps/mipsel.mk | 4 ++--
debian/sysdeps/mipsn32.mk | 4 ++--
debian/sysdeps/mipsn32el.mk | 4 ++--
debian/sysdeps/powerpc.mk | 2 +-
debian/sysdeps/ppc64.mk | 2 +-
debian/sysdeps/s390x.mk | 2 +-
debian/sysdeps/sparc.mk | 2 +-
debian/sysdeps/sparc64.mk | 2 +-
debian/sysdeps/x32.mk | 4 ++--
19 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8d266c..1c21d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ glibc (2.25-0experimental4) UNRELEASED; urgency=medium
Closes: #881455, #881636.
* debian/rules, debian/sysdeps/*.mk: skip the multilib pass for the nobiarch
profile (in addition to skipping the package creation).
+ * debian/rules: only build -dev multilib packages in stage1. Closes:
+ #881454, #881646.
-- Aurelien Jarno <aurel32@debian.org> Sun, 27 Aug 2017 01:51:15 +0200
diff --git a/debian/rules b/debian/rules
index 6e0393c..62109c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,6 +163,12 @@ standard-add-ons = libidn,
-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk
-include debian/sysdeps/$(DEB_HOST_ARCH).mk
+ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
+DEB_ARCH_REGULAR_PACKAGES += $(foreach p,$(DEB_ARCH_MULTILIB_PACKAGES), $(if $(findstring -dev,$(p)), $(p)))
+else
+DEB_ARCH_REGULAR_PACKAGES += $(DEB_ARCH_MULTILIB_PACKAGES)
+endif
+
# Don't run dh_strip on this package
NOSTRIP_$(libc)-dbg = 1
diff --git a/debian/sysdeps/amd64.mk b/debian/sysdeps/amd64.mk
index 90ee877..e6ab4d4 100644
--- a/debian/sysdeps/amd64.mk
+++ b/debian/sysdeps/amd64.mk
@@ -11,7 +11,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (i386) alternative library
GLIBC_PASSES += i386
-DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386
+DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
i386_configure_target = i686-linux-gnu
i386_CC = $(CC) -m32 -march=pentium4 -mtune=generic
@@ -44,7 +44,7 @@ endef
# build x32 ABI alternative library
GLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_configure_target = x86_64-linux-gnux32
x32_CC = $(CC) -mx32
diff --git a/debian/sysdeps/armel.mk b/debian/sysdeps/armel.mk
index 8c7d7fa..9e6e97d 100644
--- a/debian/sysdeps/armel.mk
+++ b/debian/sysdeps/armel.mk
@@ -6,7 +6,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build hard-float (armhf) alternative library
#GLIBC_PASSES += armhf
-#DEB_ARCH_REGULAR_PACKAGES += libc6-armhf libc6-dev-armhf
+#DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf
#armhf_configure_target = arm-linux-gnueabihf
#armhf_CC = $(CC) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
#armhf_CXX = $(CXX) -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard
diff --git a/debian/sysdeps/armhf.mk b/debian/sysdeps/armhf.mk
index 19947f1..a3437d0 100644
--- a/debian/sysdeps/armhf.mk
+++ b/debian/sysdeps/armhf.mk
@@ -17,7 +17,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build soft-float (armel) alternative library
#GLIBC_PASSES += armel
-#DEB_ARCH_REGULAR_PACKAGES += libc6-armel libc6-dev-armel
+#DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel
#armel_configure_target = arm-linux-gnueabi
#armel_CC = $(CC) -mfloat-abi=soft
#armel_CXX = $(CXX) -mfloat-abi=soft
diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk
index e868f84..bd8d6f6 100644
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@ -32,7 +32,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit (amd64) alternative library
GLIBC_PASSES += amd64
-DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
amd64_configure_target = x86_64-linux-gnu
# __x86_64__ is defined here because Makeconfig uses -undef and the
@@ -69,7 +69,7 @@ endef
# build x32 ABI alternative library
GLIBC_PASSES += x32
-DEB_ARCH_REGULAR_PACKAGES += libc6-x32 libc6-dev-x32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver))
x32_configure_target = x86_64-linux-gnux32
x32_CC = $(CC) -mx32
diff --git a/debian/sysdeps/kfreebsd-amd64.mk b/debian/sysdeps/kfreebsd-amd64.mk
index ea360fe..e7519bf 100644
--- a/debian/sysdeps/kfreebsd-amd64.mk
+++ b/debian/sysdeps/kfreebsd-amd64.mk
@@ -4,7 +4,7 @@ GLIBC_PASSES += i386
# multilib flavours
ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
-DEB_ARCH_REGULAR_PACKAGES += libc0.1-i386 libc0.1-dev-i386
+DEB_ARCH_MULTILIB_PACKAGES += libc0.1-i386 libc0.1-dev-i386
libc0.1-i386_shlib_dep = libc0.1-i386 (>= $(shlib_dep_ver))
i386_add-ons = $(libc_add-ons)
diff --git a/debian/sysdeps/mips.mk b/debian/sysdeps/mips.mk
index 737db9d..28ac1fd 100644
--- a/debian/sysdeps/mips.mk
+++ b/debian/sysdeps/mips.mk
@@ -6,7 +6,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_configure_target = mips64-linux-gnuabin32
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
@@ -17,7 +17,7 @@ mipsn32_libdir = /usr/lib32
# build 64-bit alternative library
GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_configure_target = mips64-linux-gnuabi64
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
diff --git a/debian/sysdeps/mips64.mk b/debian/sysdeps/mips64.mk
index 0391564..5f3f079 100644
--- a/debian/sysdeps/mips64.mk
+++ b/debian/sysdeps/mips64.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_configure_target = mips64-linux-gnuabin32
mipsn32_CC = $(CC) -mabi=n32
@@ -20,7 +20,7 @@ mipsn32_libdir = /usr/lib32
# build 32-bit (o32) alternative library
GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mips-linux-gnu
mips32_CC = $(CC) -mabi=32
diff --git a/debian/sysdeps/mips64el.mk b/debian/sysdeps/mips64el.mk
index 01984fb..ffb7bd8 100644
--- a/debian/sysdeps/mips64el.mk
+++ b/debian/sysdeps/mips64el.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_configure_target = mips64el-linux-gnuabin32
mipsn32_CC = $(CC) -mabi=n32
@@ -20,7 +20,7 @@ mipsn32_libdir = /usr/lib32
# build 32-bit (o32) alternative library
GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mipsel-linux-gnu
mips32_CC = $(CC) -mabi=32
diff --git a/debian/sysdeps/mipsel.mk b/debian/sysdeps/mipsel.mk
index 1e8f48e..ec21e47 100644
--- a/debian/sysdeps/mipsel.mk
+++ b/debian/sysdeps/mipsel.mk
@@ -6,7 +6,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (n32) alternative library
GLIBC_PASSES += mipsn32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
libc6-mipsn32_shlib_dep = libc6-mipsn32 (>= $(shlib_dep_ver))
mipsn32_configure_target = mips64el-linux-gnuabin32
mipsn32_CC = $(CC) -mabi=n32
@@ -17,7 +17,7 @@ mipsn32_libdir = /usr/lib32
# build 64-bit alternative library
GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_configure_target = mips64el-linux-gnuabi64
mips64_CC = $(CC) -mabi=64
diff --git a/debian/sysdeps/mipsn32.mk b/debian/sysdeps/mipsn32.mk
index d30639a..50bce13 100644
--- a/debian/sysdeps/mipsn32.mk
+++ b/debian/sysdeps/mipsn32.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit alternative library
GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_configure_target = mips64-linux-gnuabi64
mips64_extra_cflags = -mno-plt
@@ -21,7 +21,7 @@ mips64_libdir = /usr/lib64
# build 32-bit (o32) alternative library
GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mips-linux-gnu
mips32_extra_cflags = -mno-plt
diff --git a/debian/sysdeps/mipsn32el.mk b/debian/sysdeps/mipsn32el.mk
index 1ca131d..79585e7 100644
--- a/debian/sysdeps/mipsn32el.mk
+++ b/debian/sysdeps/mipsn32el.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit alternative library
GLIBC_PASSES += mips64
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
libc6-mips64_shlib_dep = libc6-mips64 (>= $(shlib_dep_ver))
mips64_configure_target = mips64el-linux-gnuabi64
mips64_CC = $(CC) -mabi=64
@@ -20,7 +20,7 @@ mips64_libdir = /usr/lib64
# build 32-bit (o32) alternative library
GLIBC_PASSES += mips32
-DEB_ARCH_REGULAR_PACKAGES += libc6-mips32 libc6-dev-mips32
+DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
libc6-mips32_shlib_dep = libc6-mips32 (>= $(shlib_dep_ver))
mips32_configure_target = mipsel-linux-gnu
mips32_CC = $(CC) -mabi=32
diff --git a/debian/sysdeps/powerpc.mk b/debian/sysdeps/powerpc.mk
index e7c5d9b..cca0fd8 100644
--- a/debian/sysdeps/powerpc.mk
+++ b/debian/sysdeps/powerpc.mk
@@ -6,7 +6,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit (ppc64) alternative library
GLIBC_PASSES += ppc64
-DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
ppc64_CXX = $(CXX) -m64
diff --git a/debian/sysdeps/ppc64.mk b/debian/sysdeps/ppc64.mk
index cfb9bfd..f3528d4 100644
--- a/debian/sysdeps/ppc64.mk
+++ b/debian/sysdeps/ppc64.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (powerpc) alternative library
GLIBC_PASSES += powerpc
-DEB_ARCH_REGULAR_PACKAGES += libc6-powerpc libc6-dev-powerpc
+DEB_ARCH_MULTILIB_PACKAGES += libc6-powerpc libc6-dev-powerpc
libc6-powerpc_shlib_dep = libc6-powerpc (>= $(shlib_dep_ver))
powerpc_configure_target = powerpc-linux-gnu
powerpc_CC = $(CC) -m32
diff --git a/debian/sysdeps/s390x.mk b/debian/sysdeps/s390x.mk
index ecc87d4..8452b6e 100644
--- a/debian/sysdeps/s390x.mk
+++ b/debian/sysdeps/s390x.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (s390) alternative library
GLIBC_PASSES += s390
-DEB_ARCH_REGULAR_PACKAGES += libc6-s390 libc6-dev-s390
+DEB_ARCH_MULTILIB_PACKAGES += libc6-s390 libc6-dev-s390
libc6-s390_shlib_dep = libc6-s390 (>= $(shlib_dep_ver))
s390_configure_target = s390-linux-gnu
s390_CC = $(CC) -m31
diff --git a/debian/sysdeps/sparc.mk b/debian/sysdeps/sparc.mk
index 0fb2420..80f1ffe 100644
--- a/debian/sysdeps/sparc.mk
+++ b/debian/sysdeps/sparc.mk
@@ -9,7 +9,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc64 libc6-dev-sparc64
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_configure_target=sparc64-linux-gnu
sparc64_CC = $(CC) -m64
diff --git a/debian/sysdeps/sparc64.mk b/debian/sysdeps/sparc64.mk
index bc90d77..15d07f4 100644
--- a/debian/sysdeps/sparc64.mk
+++ b/debian/sysdeps/sparc64.mk
@@ -10,7 +10,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 32-bit (sparc) alternative library
GLIBC_PASSES += sparc
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparc libc6-dev-sparc
+DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc libc6-dev-sparc
libc6-sparc_shlib_dep = libc6-sparc (>= $(shlib_dep_ver))
sparc_configure_target=sparcv9-linux-gnu
sparc_CC = $(CC) -m32
diff --git a/debian/sysdeps/x32.mk b/debian/sysdeps/x32.mk
index 4c05b81..fa3b926 100644
--- a/debian/sysdeps/x32.mk
+++ b/debian/sysdeps/x32.mk
@@ -10,7 +10,7 @@ ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
# build 64-bit (amd64) alternative library
GLIBC_PASSES += amd64
-DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64
+DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver))
amd64_configure_target = x86_64-linux-gnu
amd64_CC = $(CC) -m64
@@ -40,7 +40,7 @@ endef
# build 32-bit (i386) alternative library
GLIBC_PASSES += i386
-DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386
+DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver))
i386_configure_target = i686-linux-gnu
i386_CC = $(CC) -m32 -march=pentium4 -mtune=generic
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: