r5459 - in glibc-package/branches/eglibc-2.17/debian: . rules.d sysdeps
Author: adconrad
Date: 2013-01-25 01:30:37 +0000 (Fri, 25 Jan 2013)
New Revision: 5459
Modified:
glibc-package/branches/eglibc-2.17/debian/changelog
glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd-i386.mk
glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd.mk
Log:
debian/{rules.d/build.mk,sysdeps/hurd*}: When the threads variable is
not set to "yes", add --disable-nscd to the main configure options.
Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-25 00:30:53 UTC (rev 5458)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-25 01:30:37 UTC (rev 5459)
@@ -67,6 +67,8 @@
libraries that are built for other machines, rather than erroring.
* debian/patches/i386/unsubmitted-quiet-ldconfig.diff: Fix ldconfig on
x86 to stop complaining so loudly about wrong-arch libraries on path.
+ * debian/{rules.d/build.mk,sysdeps/hurd*}: When the threads variable is
+ not set to "yes", add --disable-nscd to the main configure options.
[ Matthias Klose ]
* debian/{rules,rules.d/control.mk,control.in/libc}: Allow turning off
@@ -84,8 +86,6 @@
upstream.
* debian/patches/hurd-i386/local-disable-sendmmsg.diff: Drop, fixed
upstream.
- * debian/sysdeps/hurd.mk, debian/sysdeps/hurd-i386.mk: Disable nscd through
- configure option.
* debian/patches/hurd-i386/unsubmitted-pthread.diff: Drop, obsolete.
* Update expected-results-i486-gnu-libc, expected-results-i686-gnu-i386,
expected-results-i686-gnu-i686, expected-results-i686-gnu-xen.
Modified: glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk 2013-01-25 00:30:53 UTC (rev 5458)
+++ glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk 2013-01-25 01:30:37 UTC (rev 5459)
@@ -20,6 +20,10 @@
libc_extra_config_options += --with-headers=$(WITH_SYSROOT)/$(includedir)
endif
+ifneq ($(threads),yes)
+ libc_extra_config_options += --disable-nscd
+endif
+
$(patsubst %,mkbuilddir_%,$(EGLIBC_PASSES)) :: mkbuilddir_% : $(stamp)mkbuilddir_%
$(stamp)mkbuilddir_%: $(stamp)patch $(KERNEL_HEADER_DIR)
@echo Making builddir for $(curpass)
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd-i386.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd-i386.mk 2013-01-25 00:30:53 UTC (rev 5458)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd-i386.mk 2013-01-25 01:30:37 UTC (rev 5459)
@@ -6,7 +6,7 @@
i686_configure_target=i686-gnu
i686_extra_cflags = -march=i686 -mtune=generic
i686_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/cmov
-i686_extra_config_options = $(extra_config_options) --disable-nscd --disable-profile --disable-compatible-utmp
+i686_extra_config_options = $(extra_config_options) --disable-profile --disable-compatible-utmp
# 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.
@@ -16,7 +16,7 @@
xen_configure_target=i686-gnu
xen_extra_cflags = -march=i686 -mtune=generic -mno-tls-direct-seg-refs
xen_slibdir = /lib/$(DEB_HOST_MULTIARCH)/i686/nosegneg
-xen_extra_config_options = $(extra_config_options) --disable-nscd --disable-profile
+xen_extra_config_options = $(extra_config_options) --disable-profile
define libc0.3-dev_extra_pkg_install
mkdir -p debian/libc0.3-dev/$(libdir)/xen
Modified: glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd.mk 2013-01-25 00:30:53 UTC (rev 5458)
+++ glibc-package/branches/eglibc-2.17/debian/sysdeps/hurd.mk 2013-01-25 01:30:37 UTC (rev 5459)
@@ -17,7 +17,7 @@
true
endef
-libc_extra_config_options := $(extra_config_options) --disable-nscd
+libc_extra_config_options := $(extra_config_options)
libc_add-ons = libpthread $(add-ons)
Reply to: