Author: sthibault
Date: 2013-01-28 21:26:41 +0000 (Mon, 28 Jan 2013)
New Revision: 5469

Modified:
   glibc-package/branches/eglibc-2.17/debian/changelog
   glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk
Log:
debian/rules.d/build.mk: When threads is no, disable nscd in all passes.

Modified: glibc-package/branches/eglibc-2.17/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-28 15:00:59 UTC 
(rev 5468)
+++ glibc-package/branches/eglibc-2.17/debian/changelog 2013-01-28 21:26:41 UTC 
(rev 5469)
@@ -1,5 +1,6 @@
 eglibc (2.17-0experimental1) UNRELEASED; urgency=low
 
+  [ Adam Conrad ]
   * Rebase kfreebsd patches missed in the previous upload due to quilt:
     - debian/patches/kfreebsd/local-undef-glibc.diff: Unfuzz.
     - debian/patches/kfreebsd/local-use-thr-primitives.diff: Unfuzz.
@@ -10,6 +11,9 @@
     upstream removal of TLS configure options, enable unconditionally.
   * Update debian/patches/kfreebsd/local-sysdeps.diff to revision 4353.
 
+  [ Pino Toscano ]
+  * debian/rules.d/build.mk: When threads is no, disable nscd in all passes.
+
  -- Adam Conrad <adcon...@0c3.net>  Mon, 28 Jan 2013 02:05:01 -0700
 
 eglibc (2.17-0experimental0) experimental; urgency=low

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-28 
15:00:59 UTC (rev 5468)
+++ glibc-package/branches/eglibc-2.17/debian/rules.d/build.mk  2013-01-28 
21:26:41 UTC (rev 5469)
@@ -20,10 +20,6 @@
     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)
@@ -89,6 +85,7 @@
                --enable-obsolete-rpc \
                --with-pkgversion="Debian EGLIBC $(DEB_VERSION)" \
                --with-bugurl="http://www.debian.org/Bugs/"; \
+               $(if $(filter $(threads),no),--disable-nscd) \
                $(call xx,with_headers) $(call xx,extra_config_options))
        touch $@
 


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tzwdy-0006eq...@vasks.debian.org

Reply via email to