r1631 - in glibc-package/branches/glibc-2.4/debian: . patches patches/mips sysdeps
Author: schizo
Date: 2006-06-07 21:46:20 +0000 (Wed, 07 Jun 2006)
New Revision: 1631
Removed:
glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
Log:
- Remove mips/local-librt.diff.
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 21:12:39 UTC (rev 1630)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 21:46:20 UTC (rev 1631)
@@ -36,6 +36,7 @@
preprocessor macros.
- debian/debhelper.in/nscd.init: partially sync nscd initscript
with upstream.
+ - Remove mips/local-librt.diff.
[ Denis Barbier ]
- Remove locale/complex-collate.diff (merged upstream).
@@ -104,7 +105,6 @@
* Update m68k/submitted-gcc34-seccomment.diff.
* Remove mips/cvs-gcc4-inline.diff (merged upstream).
* Remove mips/cvs-gcc4-sysdeps.diff (merged upstream).
- * Update mips/local-librt.diff to reflect the new port add-on.
* Update mips/submitted-msq.diff to reflect the new port add-on.
* Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
* debian/sysdeps/sparc.mk: do an NPTL pass.
Deleted: glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-06-07 21:12:39 UTC (rev 1630)
+++ glibc-package/branches/glibc-2.4/debian/patches/mips/local-librt.diff 2006-06-07 21:46:20 UTC (rev 1631)
@@ -1,113 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: clock_{get,set}time@@GLIBC_2.0 - programs in Woody need it.
-# DP: Add fix that the previous version does not provide @GLIBC_2.2 symbols.
-# DP: Related bugs: http://lists.debian.org/debian-glibc/2004/12/msg00214.html
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Guido Guenther <agx@debian.org>, GOTO Masanori <gotom@debian.org>
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: debian-specific, until etch will be released.
-# DP: Date: 2006-05-28 (updated)
-
---- ports/sysdeps/unix/sysv/linux/mips/Versions.orig Tue Sep 24 15:56:55 2002
-+++ ports/sysdeps/unix/sysv/linux/mips/Versions Tue Sep 24 15:49:27 2002
-@@ -29,3 +29,9 @@
- _test_and_set;
- }
- }
-+librt {
-+ GLIBC_2.0 {
-+ # c*
-+ clock_gettime; clock_settime;
-+ }
-+}
---- Versions.def 2004-12-21 00:37:04.000000000 +0900
-+++ Versions.def.new 2004-12-21 09:50:31.000000000 +0900
-@@ -82,6 +82,7 @@
- GLIBC_PRIVATE
- }
- librt {
-+ GLIBC_2.0
- GLIBC_2.1
- GLIBC_2.2
- GLIBC_2.3
---- sysdeps/unix/clock_gettime.c~ 2004-12-04 17:05:53.000000000 +0900
-+++ sysdeps/unix/clock_gettime.c 2004-12-23 12:04:01.000000000 +0900
-@@ -39,8 +39,13 @@
-
-
- /* Get current value of CLOCK and store it in TP. */
-+#ifdef DEBIAN_LIBRT_MIPS
-+int
-+__clock_gettime (clockid_t clock_id, struct timespec *tp)
-+#else
- int
- clock_gettime (clockid_t clock_id, struct timespec *tp)
-+#endif
- {
- int retval = -1;
-
-@@ -136,4 +136,6 @@
-
- return retval;
- }
-+#ifndef DEBIAN_LIBRT_MIPS
- librt_hidden_def (clock_gettime)
-+#endif
---- sysdeps/unix/clock_settime.c~ 2004-12-04 17:05:53.000000000 +0900
-+++ sysdeps/unix/clock_settime.c 2004-12-23 12:09:27.000000000 +0900
-@@ -37,8 +37,13 @@
-
-
- /* Set CLOCK to value TP. */
-+#ifdef DEBIAN_LIBRT_MIPS
-+int
-+__clock_settime (clockid_t clock_id, const struct timespec *tp)
-+#else
- int
- clock_settime (clockid_t clock_id, const struct timespec *tp)
-+#endif
- {
- int retval;
-
---- /dev/null 2004-09-27 19:55:25.000000000 +0900
-+++ ports/sysdeps/unix/sysv/linux/mips/clock_settime.c 2004-12-23 12:07:36.000000000 +0900
-@@ -0,0 +1,18 @@
-+/*
-+ * It adds for debian specific librt-mips binary incompatibility problems.
-+ * - gotom 2004-12-20.
-+ */
-+
-+#define DEBIAN_LIBRT_MIPS
-+
-+/* include linux clock_settime */
-+#include <sysdeps/unix/sysv/linux/clock_settime.c>
-+
-+/* compat symbols. */
-+#include <shlib-compat.h>
-+
-+#if SHLIB_COMPAT (librt, GLIBC_2_0, GLIBC_2_2)
-+strong_alias (__clock_settime, __clock_settime_old);
-+compat_symbol (librt, __clock_settime_old, clock_settime, GLIBC_2_0);
-+#endif
-+versioned_symbol (librt, __clock_settime, clock_settime, GLIBC_2_2);
---- /dev/null 2004-09-27 19:55:25.000000000 +0900
-+++ ports/sysdeps/unix/sysv/linux/mips/clock_gettime.c 2004-12-23 12:07:35.000000000 +0900
-@@ -0,0 +1,18 @@
-+/*
-+ * It adds for debian specific librt-mips binary incompatibility problems.
-+ * - gotom 2004-12-20.
-+ */
-+
-+#define DEBIAN_LIBRT_MIPS
-+
-+/* include linux clock_gettime */
-+#include <sysdeps/unix/sysv/linux/clock_gettime.c>
-+
-+/* compat symbols. */
-+#include <shlib-compat.h>
-+
-+#if SHLIB_COMPAT (librt, GLIBC_2_0, GLIBC_2_2)
-+strong_alias (__clock_gettime, __clock_gettime_old);
-+compat_symbol (librt, __clock_gettime_old, clock_gettime, GLIBC_2_0);
-+#endif
-+versioned_symbol (librt, __clock_gettime, clock_gettime, GLIBC_2_2);
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-06-07 21:12:39 UTC (rev 1630)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-06-07 21:46:20 UTC (rev 1631)
@@ -83,7 +83,6 @@
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
-mips/local-librt.diff -p0
mips/local-lazy-eval.diff -p2
mips/submitted-msq.diff -p0
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-06-07 21:12:39 UTC (rev 1630)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mips.mk 2006-06-07 21:46:20 UTC (rev 1631)
@@ -1,2 +1,4 @@
libc_add-ons = ports linuxthreads $(add-ons)
+libc_extra_config_options = $(extra_config_options) --without-__thread --disable
+-sanity-checks --without-tls
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-06-07 21:12:39 UTC (rev 1630)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/mipsel.mk 2006-06-07 21:46:20 UTC (rev 1631)
@@ -1,2 +1,4 @@
libc_add-ons = ports linuxthreads $(add-ons)
+libc_extra_config_options = $(extra_config_options) --without-__thread --disable
+-sanity-checks --without-tls
Reply to: