r5909 - in glibc-package/branches/eglibc-2.18/debian: . rules.d sysdeps
Author: adconrad
Date: 2014-01-10 22:29:48 +0000 (Fri, 10 Jan 2014)
New Revision: 5909
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd.mk
glibc-package/branches/eglibc-2.18/debian/sysdeps/linux.mk
Log:
debian/rules.d/build.mk, debian/sysdeps/{hurd,linux,kfreebsd}.mk: Make
pt_chown keyed off a new variable that we can use to enable or disable
it per kernel type rather than just the primary libc (Closes: #734607)
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-10 17:50:59 UTC (rev 5908)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-10 22:29:48 UTC (rev 5909)
@@ -16,6 +16,9 @@
Adhemerval Zanella at IBM to fix gettimeofday vDSO/IFUNC interactions.
* debian/patches/powerpc/submitted-gettimeofday-32.diff: Pull patch from
Adhemerval Zanella at IBM to fix 32-bit gettimeofday VSYSCALL lookups.
+ * debian/rules.d/build.mk, debian/sysdeps/{hurd,linux,kfreebsd}.mk: Make
+ pt_chown keyed off a new variable that we can use to enable or disable
+ it per kernel type rather than just the primary libc (Closes: #734607)
[ Aurelien Jarno ]
* debian/patches/any/cvs-vfscanf-0e+0.diff: new patch from upstream to
Modified: glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2014-01-10 17:50:59 UTC (rev 5908)
+++ glibc-package/branches/eglibc-2.18/debian/rules.d/build.mk 2014-01-10 22:29:48 UTC (rev 5909)
@@ -90,6 +90,7 @@
--enable-obsolete-rpc \
--with-pkgversion="Debian EGLIBC $(DEB_VERSION)" \
--with-bugurl="http://www.debian.org/Bugs/"; \
+ $(if $(filter $(pt_chown),yes),--enable-pt_chown) \
$(if $(filter $(threads),no),--disable-nscd) \
$(call xx,with_headers) $(call xx,extra_config_options))
touch $@
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd.mk 2014-01-10 17:50:59 UTC (rev 5908)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/hurd.mk 2014-01-10 22:29:48 UTC (rev 5909)
@@ -1,10 +1,13 @@
# This is for the GNU OS. Commonly known as the Hurd.
libc = libc0.3
+# Build and expect pt_chown on this platform
+pt_chown = yes
+
# Linuxthreads Config (we claim "no threads" as nptl keys off this)
threads = no
libc_add-ons = libpthread $(add-ons)
-libc_extra_config_options := --enable-pt_chown $(extra_config_options)
+libc_extra_config_options := $(extra_config_options)
# Glibc should really do this for us.
define libc_extra_install
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd.mk 2014-01-10 17:50:59 UTC (rev 5908)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/kfreebsd.mk 2014-01-10 22:29:48 UTC (rev 5909)
@@ -2,10 +2,13 @@
MIN_KERNEL_SUPPORTED := 8.3.0
libc = libc0.1
-# the pt_chown is mandatory for kfreebsd
+# Build and expect pt_chown on this platform
+pt_chown = yes
+
+# NPTL Config
threads = yes
libc_add-ons = ports fbtl $(add-ons)
-libc_extra_config_options = --enable-pt_chown $(extra_config_options)
+libc_extra_config_options = $(extra_config_options)
ifndef KFREEBSD_SOURCE
ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
Modified: glibc-package/branches/eglibc-2.18/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/linux.mk 2014-01-10 17:50:59 UTC (rev 5908)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/linux.mk 2014-01-10 22:29:48 UTC (rev 5909)
@@ -2,14 +2,17 @@
MIN_KERNEL_SUPPORTED := 2.6.32
libc = libc6
+# Build and expect pt_chown on this platform
+pt_chown = yes
+
# NPTL Config
threads = yes
libc_add-ons = nptl $(add-ons)
ifeq ($(DEB_BUILD_PROFILE),bootstrap)
- libc_extra_config_options = --enable-pt_chown $(extra_config_options)
+ libc_extra_config_options = $(extra_config_options)
else
- libc_extra_config_options = --enable-pt_chown --with-selinux $(extra_config_options)
+ libc_extra_config_options = --with-selinux $(extra_config_options)
endif
ifndef LINUX_SOURCE
Reply to: