[glibc] 01/01: debian/rules, debian/sysdeps/*.mk: skip the multilib pass for the nobiarch profile (in addition to skipping the package creation).
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 7b0509a01820d80c7db0b1cb77d775107b89d97c
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Nov 14 22:38:41 2017 +0100
debian/rules, debian/sysdeps/*.mk: skip the multilib pass for the nobiarch profile (in addition to skipping the package creation).
---
debian/changelog | 2 ++
debian/rules | 5 -----
debian/sysdeps/amd64.mk | 13 +++++++++----
debian/sysdeps/armel.mk | 9 +++++++--
debian/sysdeps/armhf.mk | 9 +++++++--
debian/sysdeps/i386.mk | 13 +++++++++----
debian/sysdeps/kfreebsd-amd64.mk | 9 +++++++--
debian/sysdeps/mips.mk | 13 +++++++++----
debian/sysdeps/mips64.mk | 13 +++++++++----
debian/sysdeps/mips64el.mk | 13 +++++++++----
debian/sysdeps/mipsel.mk | 13 +++++++++----
debian/sysdeps/mipsn32.mk | 13 +++++++++----
debian/sysdeps/mipsn32el.mk | 13 +++++++++----
debian/sysdeps/powerpc.mk | 8 ++++++--
debian/sysdeps/ppc64.mk | 9 +++++++--
debian/sysdeps/s390x.mk | 9 +++++++--
debian/sysdeps/sparc.mk | 9 +++++++--
debian/sysdeps/sparc64.mk | 9 +++++++--
debian/sysdeps/x32.mk | 13 +++++++++----
19 files changed, 138 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9324ad5..c8d266c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ glibc (2.25-0experimental4) UNRELEASED; urgency=medium
* debian/sysdeps/{alpha,hurd-i386,i386}.mk: do not build optimized libraries
libc6.1-alphaev67, libc6-xen and libc0.3-xen during stage 1 and stage 2.
Closes: #881455, #881636.
+ * debian/rules, debian/sysdeps/*.mk: skip the multilib pass for the nobiarch
+ profile (in addition to skipping the package creation).
-- Aurelien Jarno <aurel32@debian.org> Sun, 27 Aug 2017 01:51:15 +0200
diff --git a/debian/rules b/debian/rules
index a7a6ed1..6e0393c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -163,11 +163,6 @@ standard-add-ons = libidn,
-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk
-include debian/sysdeps/$(DEB_HOST_ARCH).mk
-ifeq ($(filter nobiarch,$(DEB_BUILD_PROFILES)),)
-GLIBC_PASSES += $(GLIBC_MULTILIB_PASSES)
-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 235e552..90ee877 100644
--- a/debian/sysdeps/amd64.mk
+++ b/debian/sysdeps/amd64.mk
@@ -6,9 +6,12 @@ MIN_KERNEL_SUPPORTED := 2.6.32
libc_mvec = yes
libc_rtlddir = /lib64
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (i386) alternative library
-GLIBC_MULTILIB_PASSES += i386
-DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
+GLIBC_PASSES += i386
+DEB_ARCH_REGULAR_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
@@ -40,8 +43,8 @@ ln -sf /lib32/ld-linux.so.2 debian/libc6-i386/lib
endef
# build x32 ABI alternative library
-GLIBC_MULTILIB_PASSES += x32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
+GLIBC_PASSES += x32
+DEB_ARCH_REGULAR_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
@@ -58,3 +61,5 @@ cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
debian/libc6-dev-x32/usr/include/x86_64-linux-gnu/gnu/
endef
+
+endif # multilib
diff --git a/debian/sysdeps/armel.mk b/debian/sysdeps/armel.mk
index 9d92496..8c7d7fa 100644
--- a/debian/sysdeps/armel.mk
+++ b/debian/sysdeps/armel.mk
@@ -1,9 +1,12 @@
# configuration options for all flavours
extra_config_options = --enable-multi-arch
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build hard-float (armhf) alternative library
-#GLIBC_MULTILIB_PASSES += armhf
-#DEB_ARCH_MULTILIB_PACKAGES += libc6-armhf libc6-dev-armhf
+#GLIBC_PASSES += armhf
+#DEB_ARCH_REGULAR_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
@@ -33,3 +36,5 @@ extra_config_options = --enable-multi-arch
#ln -sf $(armhf_slibdir)/ld-linux-armhf.so.3 debian/libc6-armhf/lib
#ln -sf ld-linux-armhf.so.3 debian/libc6-armhf$(armhf_slibdir)/ld-linux.so.3
#endef
+
+endif # multilib
diff --git a/debian/sysdeps/armhf.mk b/debian/sysdeps/armhf.mk
index c39d7e1..19947f1 100644
--- a/debian/sysdeps/armhf.mk
+++ b/debian/sysdeps/armhf.mk
@@ -12,9 +12,12 @@ mkdir -p debian/libc6-udeb/lib/arm-linux-gnueabihf
ln -sf /lib/ld-linux-armhf.so.3 debian/libc6-udeb/lib/arm-linux-gnueabihf/ld-linux.so.3
endef
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build soft-float (armel) alternative library
-#GLIBC_MULTILIB_PASSES += armel
-#DEB_ARCH_MULTILIB_PACKAGES += libc6-armel libc6-dev-armel
+#GLIBC_PASSES += armel
+#DEB_ARCH_REGULAR_PACKAGES += libc6-armel libc6-dev-armel
#armel_configure_target = arm-linux-gnueabi
#armel_CC = $(CC) -mfloat-abi=soft
#armel_CXX = $(CXX) -mfloat-abi=soft
@@ -43,3 +46,5 @@ endef
#mkdir -p debian/libc6-armel/lib
#ln -sf $(armel_slibdir)/ld-linux.so.3 debian/libc6-armel/lib
#endef
+
+endif # multilib
diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk
index b2357dc..e868f84 100644
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@ -27,9 +27,12 @@ cp -af debian/tmp-xen/$(libdir)/*.a \
endef
endif
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit (amd64) alternative library
-GLIBC_MULTILIB_PASSES += amd64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
+GLIBC_PASSES += amd64
+DEB_ARCH_REGULAR_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
@@ -65,8 +68,8 @@ done
endef
# build x32 ABI alternative library
-GLIBC_MULTILIB_PASSES += x32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32
+GLIBC_PASSES += x32
+DEB_ARCH_REGULAR_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
@@ -83,3 +86,5 @@ cp -a debian/tmp-x32/usr/include/gnu/stubs-x32.h \
debian/libc6-dev-x32/usr/include/i386-linux-gnu/gnu
endef
+
+endif # multilib
diff --git a/debian/sysdeps/kfreebsd-amd64.mk b/debian/sysdeps/kfreebsd-amd64.mk
index 2f1c652..ea360fe 100644
--- a/debian/sysdeps/kfreebsd-amd64.mk
+++ b/debian/sysdeps/kfreebsd-amd64.mk
@@ -1,6 +1,10 @@
# build 32-bit (i386) alternative library
-GLIBC_MULTILIB_PASSES += i386
-DEB_ARCH_MULTILIB_PACKAGES += libc0.1-i386 libc0.1-dev-i386
+GLIBC_PASSES += i386
+
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
+DEB_ARCH_REGULAR_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)
@@ -36,3 +40,4 @@ mkdir -p debian/libc0.1-i386/lib
ln -sf /lib32/ld.so.1 debian/libc0.1-i386/lib
endef
+endif # multilib
diff --git a/debian/sysdeps/mips.mk b/debian/sysdeps/mips.mk
index 350ca49..737db9d 100644
--- a/debian/sysdeps/mips.mk
+++ b/debian/sysdeps/mips.mk
@@ -1,9 +1,12 @@
# configuration options for all flavours
extra_cflags = -mno-plt
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (n32) alternative library
-GLIBC_MULTILIB_PASSES += mipsn32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_PASSES += mipsn32
+DEB_ARCH_REGULAR_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
mipsn32_configure_target = mips64-linux-gnuabin32
mipsn32_CC = $(CC) -mabi=n32
mipsn32_CXX = $(CXX) -mabi=n32
@@ -13,8 +16,8 @@ mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
# build 64-bit alternative library
-GLIBC_MULTILIB_PASSES += mips64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_PASSES += mips64
+DEB_ARCH_REGULAR_PACKAGES += libc6-mips64 libc6-dev-mips64
mips64_configure_target = mips64-linux-gnuabi64
mips64_CC = $(CC) -mabi=64
mips64_CXX = $(CXX) -mabi=64
@@ -53,3 +56,5 @@ endef
define mipsn32_extra_install
cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
endef
+
+endif # multilib
diff --git a/debian/sysdeps/mips64.mk b/debian/sysdeps/mips64.mk
index ce80a62..0391564 100644
--- a/debian/sysdeps/mips64.mk
+++ b/debian/sysdeps/mips64.mk
@@ -4,9 +4,12 @@ extra_cflags = -mno-plt
# main library
libc_rtlddir = /lib64
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (n32) alternative library
-GLIBC_MULTILIB_PASSES += mipsn32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_PASSES += mipsn32
+DEB_ARCH_REGULAR_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
@@ -16,8 +19,8 @@ mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
# build 32-bit (o32) alternative library
-GLIBC_MULTILIB_PASSES += mips32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_PASSES += mips32
+DEB_ARCH_REGULAR_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
@@ -57,3 +60,5 @@ define libc6-mips32_extra_pkg_install
mkdir -p debian/libc6-mips32/lib
ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/mips64el.mk b/debian/sysdeps/mips64el.mk
index 5c15546..01984fb 100644
--- a/debian/sysdeps/mips64el.mk
+++ b/debian/sysdeps/mips64el.mk
@@ -4,9 +4,12 @@ extra_cflags = -mno-plt
# main library
libc_rtlddir = /lib64
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (n32) alternative library
-GLIBC_MULTILIB_PASSES += mipsn32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_PASSES += mipsn32
+DEB_ARCH_REGULAR_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
@@ -16,8 +19,8 @@ mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
# build 32-bit (o32) alternative library
-GLIBC_MULTILIB_PASSES += mips32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_PASSES += mips32
+DEB_ARCH_REGULAR_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
@@ -57,3 +60,5 @@ define libc6-mips32_extra_pkg_install
mkdir -p debian/libc6-mips32/lib
ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/mipsel.mk b/debian/sysdeps/mipsel.mk
index 8571734..1e8f48e 100644
--- a/debian/sysdeps/mipsel.mk
+++ b/debian/sysdeps/mipsel.mk
@@ -1,9 +1,12 @@
# configuration options for all flavours
extra_cflags = -mno-plt
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (n32) alternative library
-GLIBC_MULTILIB_PASSES += mipsn32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mipsn32 libc6-dev-mipsn32
+GLIBC_PASSES += mipsn32
+DEB_ARCH_REGULAR_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
@@ -13,8 +16,8 @@ mipsn32_slibdir = /lib32
mipsn32_libdir = /usr/lib32
# build 64-bit alternative library
-GLIBC_MULTILIB_PASSES += mips64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_PASSES += mips64
+DEB_ARCH_REGULAR_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
@@ -53,3 +56,5 @@ endef
define mipsn32_extra_install
cp debian/tmp-mipsn32/usr/bin/ldd debian/tmp-libc/usr/bin
endef
+
+endif # multilib
diff --git a/debian/sysdeps/mipsn32.mk b/debian/sysdeps/mipsn32.mk
index 7807b22..d30639a 100644
--- a/debian/sysdeps/mipsn32.mk
+++ b/debian/sysdeps/mipsn32.mk
@@ -4,9 +4,12 @@ extra_cflags = -mno-plt
# main library
libc_rtlddir = /lib32
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit alternative library
-GLIBC_MULTILIB_PASSES += mips64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_PASSES += mips64
+DEB_ARCH_REGULAR_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
@@ -17,8 +20,8 @@ mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
# build 32-bit (o32) alternative library
-GLIBC_MULTILIB_PASSES += mips32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_PASSES += mips32
+DEB_ARCH_REGULAR_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
@@ -59,3 +62,5 @@ define libc6-mips32_extra_pkg_install
mkdir -p debian/libc6-mips32/lib
ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/mipsn32el.mk b/debian/sysdeps/mipsn32el.mk
index b3fe92f..1ca131d 100644
--- a/debian/sysdeps/mipsn32el.mk
+++ b/debian/sysdeps/mipsn32el.mk
@@ -4,9 +4,12 @@ extra_cflags = -mno-plt
# main library
libc_rtlddir = /lib32
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit alternative library
-GLIBC_MULTILIB_PASSES += mips64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips64 libc6-dev-mips64
+GLIBC_PASSES += mips64
+DEB_ARCH_REGULAR_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
@@ -16,8 +19,8 @@ mips64_slibdir = /lib64
mips64_libdir = /usr/lib64
# build 32-bit (o32) alternative library
-GLIBC_MULTILIB_PASSES += mips32
-DEB_ARCH_MULTILIB_PACKAGES += libc6-mips32 libc6-dev-mips32
+GLIBC_PASSES += mips32
+DEB_ARCH_REGULAR_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
@@ -57,3 +60,5 @@ define libc6-mips32_extra_pkg_install
mkdir -p debian/libc6-mips32/lib
ln -sf /libo32/ld.so.1 debian/libc6-mips32/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/powerpc.mk b/debian/sysdeps/powerpc.mk
index f90bb2e..e7c5d9b 100644
--- a/debian/sysdeps/powerpc.mk
+++ b/debian/sysdeps/powerpc.mk
@@ -1,9 +1,12 @@
# configuration options for all flavours
extra_config_options = --enable-multi-arch --enable-lock-elision
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit (ppc64) alternative library
-GLIBC_MULTILIB_PASSES += ppc64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-ppc64 libc6-dev-ppc64
+GLIBC_PASSES += ppc64
+DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
ppc64_configure_target = powerpc64-linux-gnu
ppc64_CC = $(CC) -m64
ppc64_CXX = $(CXX) -m64
@@ -30,3 +33,4 @@ done
endef
+endif # multilib
diff --git a/debian/sysdeps/ppc64.mk b/debian/sysdeps/ppc64.mk
index 9a322cc..cfb9bfd 100644
--- a/debian/sysdeps/ppc64.mk
+++ b/debian/sysdeps/ppc64.mk
@@ -4,9 +4,12 @@ extra_config_options = --enable-multi-arch --enable-lock-elision
# main library
libc_rtlddir = /lib64
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (powerpc) alternative library
-GLIBC_MULTILIB_PASSES += powerpc
-DEB_ARCH_MULTILIB_PACKAGES += libc6-powerpc libc6-dev-powerpc
+GLIBC_PASSES += powerpc
+DEB_ARCH_REGULAR_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
@@ -37,3 +40,5 @@ define libc6-powerpc_extra_pkg_install
mkdir -p debian/$(curpass)/lib
ln -s /lib32/ld.so.1 debian/$(curpass)/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/s390x.mk b/debian/sysdeps/s390x.mk
index 12b3e8c..ecc87d4 100644
--- a/debian/sysdeps/s390x.mk
+++ b/debian/sysdeps/s390x.mk
@@ -4,9 +4,12 @@ extra_config_options = --enable-multi-arch --enable-lock-elision
# main library
libc_rtlddir = /lib
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (s390) alternative library
-GLIBC_MULTILIB_PASSES += s390
-DEB_ARCH_MULTILIB_PACKAGES += libc6-s390 libc6-dev-s390
+GLIBC_PASSES += s390
+DEB_ARCH_REGULAR_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
@@ -36,3 +39,5 @@ define libc6-s390_extra_pkg_install
mkdir -p debian/$(curpass)/lib
ln -s /lib32/ld.so.1 debian/$(curpass)/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/sparc.mk b/debian/sysdeps/sparc.mk
index f88747a..0fb2420 100644
--- a/debian/sysdeps/sparc.mk
+++ b/debian/sysdeps/sparc.mk
@@ -4,9 +4,12 @@ extra_config_options = --disable-multi-arch
# main library
libc_configure_target=sparcv9-linux-gnu
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit (sparc64) alternative library
-GLIBC_MULTILIB_PASSES += sparc64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc64 libc6-dev-sparc64
+GLIBC_PASSES += sparc64
+DEB_ARCH_REGULAR_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
@@ -32,3 +35,5 @@ for i in `ls debian/tmp-libc/usr/include/sparc-linux-gnu/sys` ; do \
done
endef
+
+endif # multilib
diff --git a/debian/sysdeps/sparc64.mk b/debian/sysdeps/sparc64.mk
index 3af602f..bc90d77 100644
--- a/debian/sysdeps/sparc64.mk
+++ b/debian/sysdeps/sparc64.mk
@@ -5,9 +5,12 @@ extra_cflags = -mcpu=ultrasparc
# main library
libc_rtlddir = /lib64
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 32-bit (sparc) alternative library
-GLIBC_MULTILIB_PASSES += sparc
-DEB_ARCH_MULTILIB_PACKAGES += libc6-sparc libc6-dev-sparc
+GLIBC_PASSES += sparc
+DEB_ARCH_REGULAR_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
@@ -38,3 +41,5 @@ define libc6-sparc_extra_pkg_install
mkdir -p debian/$(curpass)/lib
ln -s /lib32/ld-linux.so.2 debian/$(curpass)/lib
endef
+
+endif # multilib
diff --git a/debian/sysdeps/x32.mk b/debian/sysdeps/x32.mk
index f7ab194..4c05b81 100644
--- a/debian/sysdeps/x32.mk
+++ b/debian/sysdeps/x32.mk
@@ -5,9 +5,12 @@ extra_config_options = --enable-multi-arch
libc_mvec = yes
libc_rtlddir = /libx32
+# multilib flavours
+ifeq (,$(filter nobiarch, $(DEB_BUILD_PROFILES)))
+
# build 64-bit (amd64) alternative library
-GLIBC_MULTILIB_PASSES += amd64
-DEB_ARCH_MULTILIB_PACKAGES += libc6-amd64 libc6-dev-amd64
+GLIBC_PASSES += amd64
+DEB_ARCH_REGULAR_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
@@ -36,8 +39,8 @@ done
endef
# build 32-bit (i386) alternative library
-GLIBC_MULTILIB_PASSES += i386
-DEB_ARCH_MULTILIB_PACKAGES += libc6-i386 libc6-dev-i386
+GLIBC_PASSES += i386
+DEB_ARCH_REGULAR_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
@@ -58,3 +61,5 @@ define libc6-i386_extra_pkg_install
mkdir -p debian/libc6-i386/lib
ln -sf /lib32/ld-linux.so.2 debian/libc6-i386/lib
endef
+
+endif # multilib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: