r1462 - in glibc-package/branches/glibc-2.4/debian/patches: . hurd-i386
Author: schizo
Date: 2006-04-23 16:49:52 +0000 (Sun, 23 Apr 2006)
New Revision: 1462
Added:
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff
Removed:
glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff
Modified:
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
rename hurd-enable-ldconfig.diff
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff 2006-04-23 16:45:04 UTC (rev 1461)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff 2006-04-23 16:49:52 UTC (rev 1462)
@@ -1,88 +0,0 @@
-#! /bin/sh -e
-
-# DP: Description: Enable ldconfig and such on hurd-i386
-# DP: Author: Jeff Bailey <jbailey@nisa.net>
-# DP: Related Bugs: #309489
-# DP: Upstream status: Not submitted
-# DP: Status Details: Upstream disagrees with this patch, but I'm
-# DP: putting it in so that we have expected Debian behaviour on the
-# DP: Hurd. We should review this when the ELF standard supports runpath.
-# DP: Date: 08 Apr 2003
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/configure glibc-2.3.2/sysdeps/mach/hurd/configure
---- glibc-2.3.2.old/sysdeps/mach/hurd/configure 2003-02-25 19:46:36.000000000 -0500
-+++ glibc-2.3.2/sysdeps/mach/hurd/configure 2003-04-08 17:35:13.000000000 -0400
-@@ -115,3 +115,5 @@
- _ACEOF
-
- fi
-+
-+use_ldconfig=yes
---- glibc-2.3.2.old/sysdeps/mach/hurd/configure.in.orig 2005-05-30 17:31:32.000000000 +0200
-+++ glibc-2.3.2/sysdeps/mach/hurd/configure.in 2005-05-30 17:44:30.000000000 +0200
-@@ -36,3 +36,5 @@
- if test "x$libc_cv_hurd_version" != xok; then
- AC_MSG_ERROR(Hurd headers not installed or too old)
- fi
-+
-+use_ldconfig=yes
-diff -urN glibc-2.3.2.old/elf/ldconfig.c glibc-2.3.2/elf/ldconfig.c
---- glibc-2.3.2.old/elf/ldconfig.c~ 2003-04-12 13:24:37.000000000 -0400
-+++ glibc-2.3.2/elf/ldconfig.c 2003-04-12 13:25:00.000000000 -0400
-@@ -49,6 +49,10 @@
-
- #define PACKAGE _libc_intl_domainname
-
-+#ifndef PATH_MAX
-+#define PATH_MAX 1024
-+#endif
-+
- static const struct
- {
- const char *name;
-diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/dl-cache.c glibc-2.3.2/sysdeps/mach/hurd/dl-cache.c
---- glibc-2.3.2.old/sysdeps/mach/hurd/dl-cache.c 2001-07-07 15:21:25.000000000 -0400
-+++ glibc-2.3.2/sysdeps/mach/hurd/dl-cache.c 1969-12-31 19:00:00.000000000 -0500
-@@ -1,29 +0,0 @@
--/* Stubby version of dl-cache; the Hurd doesn't support this "feature".
-- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--const char *
--_dl_load_cache_lookup (const char *name)
--{
-- return 0;
--}
--
--void
--_dl_unload_cache (void)
--{
--}
Copied: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff (from rev 1446, glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff)
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-enable-ldconfig.diff 2006-04-20 21:28:44 UTC (rev 1446)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/local-enable-ldconfig.diff 2006-04-23 16:49:52 UTC (rev 1462)
@@ -0,0 +1,75 @@
+#! /bin/sh -e
+
+# DP: Description: Enable ldconfig and such on hurd-i386
+# DP: Author: Jeff Bailey <jbailey@nisa.net>
+# DP: Related Bugs: #309489
+# DP: Upstream status: Not submitted
+# DP: Status Details: Upstream disagrees with this patch, but I'm
+# DP: putting it in so that we have expected Debian behaviour on the
+# DP: Hurd. We should review this when the ELF standard supports runpath.
+# DP: Date: 08 Apr 2003
+
+diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/configure glibc-2.3.2/sysdeps/mach/hurd/configure
+--- glibc-2.3.2.old/sysdeps/mach/hurd/configure 2003-02-25 19:46:36.000000000 -0500
++++ glibc-2.3.2/sysdeps/mach/hurd/configure 2003-04-08 17:35:13.000000000 -0400
+@@ -115,3 +115,5 @@
+ _ACEOF
+
+ fi
++
++use_ldconfig=yes
+--- glibc-2.3.2.old/sysdeps/mach/hurd/configure.in.orig 2005-05-30 17:31:32.000000000 +0200
++++ glibc-2.3.2/sysdeps/mach/hurd/configure.in 2005-05-30 17:44:30.000000000 +0200
+@@ -36,3 +36,5 @@
+ if test "x$libc_cv_hurd_version" != xok; then
+ AC_MSG_ERROR(Hurd headers not installed or too old)
+ fi
++
++use_ldconfig=yes
+diff -urN glibc-2.3.2.old/elf/ldconfig.c glibc-2.3.2/elf/ldconfig.c
+--- glibc-2.3.2.old/elf/ldconfig.c~ 2003-04-12 13:24:37.000000000 -0400
++++ glibc-2.3.2/elf/ldconfig.c 2003-04-12 13:25:00.000000000 -0400
+@@ -49,6 +49,10 @@
+
+ #define PACKAGE _libc_intl_domainname
+
++#ifndef PATH_MAX
++#define PATH_MAX 1024
++#endif
++
+ static const struct
+ {
+ const char *name;
+diff -urN glibc-2.3.2.old/sysdeps/mach/hurd/dl-cache.c glibc-2.3.2/sysdeps/mach/hurd/dl-cache.c
+--- glibc-2.3.2.old/sysdeps/mach/hurd/dl-cache.c 2001-07-07 15:21:25.000000000 -0400
++++ glibc-2.3.2/sysdeps/mach/hurd/dl-cache.c 1969-12-31 19:00:00.000000000 -0500
+@@ -1,29 +0,0 @@
+-/* Stubby version of dl-cache; the Hurd doesn't support this "feature".
+- Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+- This file is part of the GNU C Library.
+-
+- The GNU C Library is free software; you can redistribute it and/or
+- modify it under the terms of the GNU Lesser General Public
+- License as published by the Free Software Foundation; either
+- version 2.1 of the License, or (at your option) any later version.
+-
+- The GNU C Library is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- Lesser General Public License for more details.
+-
+- You should have received a copy of the GNU Lesser General Public
+- License along with the GNU C Library; if not, write to the Free
+- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+- 02111-1307 USA. */
+-
+-const char *
+-_dl_load_cache_lookup (const char *name)
+-{
+- return 0;
+-}
+-
+-void
+-_dl_unload_cache (void)
+-{
+-}
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 16:45:04 UTC (rev 1461)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-23 16:49:52 UTC (rev 1462)
@@ -22,7 +22,6 @@
glibc23-cmov.diff -p0
#libgcc-compat-all.diff -p0
#libgcc-compat-other.diff -p1
-hurd-enable-ldconfig.diff -p1
#30_glibc232-base.diff -p0 # g: suspended
50_glibc232-arm-dwarf2-buildfix.diff -p0
50_glibc232-m68k-dwarf2-buildfix.diff -p0
@@ -122,9 +121,10 @@
amd64/local-biarch.diff -p1
hurd-i386/cvs-machrules-make.diff -p1
+hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/submitted-ioctl-decode-argument.diff -p0
+powerpc/local-sysconf.diff -p1
+
sparc/local-sparcv8-target.diff -p0
sparc/submitted-timing.diff -p1
-
-powerpc/local-sysconf.diff -p1
Reply to: