Author: aurel32
Date: 2009-03-01 13:39:45 +0000 (Sun, 01 Mar 2009)
New Revision: 3348
Added:
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-cross-zic.diff
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-nss-nsswitch.diff
Modified:
glibc-package/branches/eglibc-2.9/debian/changelog
glibc-package/branches/eglibc-2.9/debian/patches/series
Log:
- Add any/submitted-cross-zic.diff to fix biarch builds.
- Add any/submitted-nss-nsswitch.diff to fix linuxthreads builds.
Modified: glibc-package/branches/eglibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/changelog 2009-03-01 12:53:51 UTC
(rev 3347)
+++ glibc-package/branches/eglibc-2.9/debian/changelog 2009-03-01 13:39:45 UTC
(rev 3348)
@@ -7,6 +7,8 @@
- Update any/cvs-bz9697-posix-regcomp.diff.
- Drop any/local-makeconfig.diff.
- Drop any/submitted-getcwd-sys_param_h.diff (merged in eglibc).
+ - Add any/submitted-cross-zic.diff to fix biarch builds.
+ - Add any/submitted-nss-nsswitch.diff to fix linuxthreads builds.
- More tests of flavour/biarch builds are run, update the expected
testsuite results accordingly.
Added:
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-cross-zic.diff
===================================================================
---
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-cross-zic.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-cross-zic.diff
2009-03-01 13:39:45 UTC (rev 3348)
@@ -0,0 +1,27 @@
+2009-03-01 Aurelien Jarno <aurel...@aurel32.net>
+
+ * timezone/Makefile: Call cross-zic directly instead of using
+ the target ld.so while generating testdata.
+
+Index: timezone/Makefile
+===================================================================
+--- a/timezone/Makefile (revision 8009)
++++ b/timezone/Makefile (working copy)
+@@ -202,10 +202,17 @@
+ # Don't add leapseconds here since test-tz made checks that work only without
+ # leapseconds.
+ testdata = $(objpfx)testdata
++ifeq (no,$(cross-compiling))
+ define build-testdata
+ GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \
+ $(built-program-cmd) -d $(testdata) -y ./yearistype $<
+ endef
++else
++define build-testdata
++LANGUAGE=C LC_ALL=C \
++ $(objpfx)cross-zic -d $(testdata) -y ./yearistype $<
++endef
++endif
+
+ $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
+ $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
Added:
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-nss-nsswitch.diff
===================================================================
---
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-nss-nsswitch.diff
(rev 0)
+++
glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-nss-nsswitch.diff
2009-03-01 13:39:45 UTC (rev 3348)
@@ -0,0 +1,18 @@
+2009-03-01 Aurelien Jarno <aurel...@aurel32.net>
+
+ * nss/nsswitch.c (lock_nsswitch, unlock_nsswitch): use braces
+ instead of brackets.
+
+--- a/nss/nsswitch.c (revision 8009)
++++ b/nss/nsswitch.c (working copy)
+@@ -84,8 +84,8 @@
+
+ __libc_lock_define_initialized (static, lock)
+
+-#define lock_nsswitch (__libc_lock_lock (lock))
+-#define unlock_nsswitch (__libc_lock_unlock (lock))
++#define lock_nsswitch {__libc_lock_lock (lock)}
++#define unlock_nsswitch {__libc_lock_unlock (lock)}
+
+ #if !defined DO_STATIC_NSS || defined SHARED
+ /* String with revision number of the shared object files. */
Modified: glibc-package/branches/eglibc-2.9/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.9/debian/patches/series 2009-03-01
12:53:51 UTC (rev 3347)
+++ glibc-package/branches/eglibc-2.9/debian/patches/series 2009-03-01
13:39:45 UTC (rev 3348)
@@ -186,3 +186,5 @@
any/local-bashisms.diff
any/submitted-futex_robust_pi.diff
any/cvs-bz7058-nss_nss-nis.diff
+any/submitted-cross-zic.diff
+any/submitted-nss-nsswitch.diff
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
