Bug#881455: glibc: don't build hardware enhancement library packages when stage1
Package: src:glibc
Version: 2.24-17
hardware enhancement library packages like xen on i386/hurd-i386,
and alphpaev67 on alpha, are not needed for stage1
They are also marked as
Build-Profiles: <!stage1>
So we need to remove them.
--
YunQiang Su
diff --git a/debian/sysdeps/alpha.mk b/debian/sysdeps/alpha.mk
index 223b097..cf8a263 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,$(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..0fccd01 100644
--- a/debian/sysdeps/hurd-i386.mk
+++ b/debian/sysdeps/hurd-i386.mk
@@ -1,3 +1,4 @@
+ifeq ($(filter stage1,$(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..003f1d6 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,$(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
Reply to: