[glibc] 01/01: 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.
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 721c4ad51a6e6aa74fbd91a620282dc7213ed6d7
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue Nov 14 22:06:49 2017 +0100
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/changelog | 3 +++
debian/sysdeps/alpha.mk | 2 ++
debian/sysdeps/hurd-i386.mk | 2 +-
debian/sysdeps/i386.mk | 2 ++
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 40e4bd1..9324ad5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,9 @@ glibc (2.25-0experimental4) UNRELEASED; urgency=medium
Closes: #881147.
* debian/debhelper.in/libc.postinst, script.in/nsscheck.sh: check for
postgresql in NSS check. Closes: #710275.
+ * 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.
-- Aurelien Jarno <aurel32@debian.org> Sun, 27 Aug 2017 01:51:15 +0200
diff --git a/debian/sysdeps/alpha.mk b/debian/sysdeps/alpha.mk
index 223b097..b88d7ce 100644
--- a/debian/sysdeps/alpha.mk
+++ b/debian/sysdeps/alpha.mk
@@ -1,6 +1,7 @@
# configuration options for all flavours
libc = libc6.1
+ifeq (,$(filter stage1 stage2, $(DEB_BUILD_PROFILES)))
# build an ev67 optimized library
GLIBC_PASSES += alphaev67
DEB_ARCH_REGULAR_PACKAGES += libc6.1-alphaev67
@@ -8,3 +9,4 @@ alphaev67_configure_target = alphaev67-linux-gnu
alphaev67_CC = $(CC) -mcpu=ev67 -mtune=ev67
alphaev67_CXX = $(CXX) -mcpu=ev67 -mtune=ev67
alphaev67_slibdir = /lib/$(DEB_HOST_MULTIARCH)/ev67
+endif
diff --git a/debian/sysdeps/hurd-i386.mk b/debian/sysdeps/hurd-i386.mk
index 81ce1c7..c1472d8 100644
--- a/debian/sysdeps/hurd-i386.mk
+++ b/debian/sysdeps/hurd-i386.mk
@@ -1,3 +1,4 @@
+ifeq (,$(filter stage1 stage2, $(DEB_BUILD_PROFILES)))
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
@@ -6,7 +7,6 @@ xen_extra_cflags = -mno-tls-direct-seg-refs
xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
xen_add-ons = $(libc_add-ons)
-ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
define libc0.3-dev_extra_pkg_install
mkdir -p debian/libc0.3-dev/$(libdir)/xen
cp -af debian/tmp-xen/$(libdir)/*.a \
diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk
index 1c87ec2..87b6fbf 100644
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@ -2,6 +2,7 @@
extra_config_options = --enable-multi-arch
MIN_KERNEL_SUPPORTED := 2.6.32
+ifeq (,$(filter stage1 stage2, $(DEB_BUILD_PROFILES)))
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
@@ -18,6 +19,7 @@ echo '# search in nosegneg subdirectories and to match this extra hwcap bit' >>
echo '# in the ld.so.cache file.' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
echo 'hwcap 1 nosegneg' >> debian/libc6-xen/etc/ld.so.conf.d/libc6-xen.conf
endef
+endif
# build 64-bit (amd64) alternative library
GLIBC_MULTILIB_PASSES += amd64
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: