Bug#309489: hurd-enable-ldconfig.dpatch update
Hi,
Adding --without-tls to the configure options make glibc build on
hurd-i386, however, binary-arch fails due to ldconfig not being
available. The attached update of hurd-enable-ldconfig.dpatch makes
ldconfig being built again, once the patch gets reactivated in 00list.
cheers,
Michael
PS: Do you guys have any opinion on using RUNPATH eventually instead of
ldconfig?
#! /bin/sh -e
# DP: Description: Enable ldconfig and such on hurd-i386
# DP: Author: Jeff Bailey <jbailey@nisa.net>
# 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)
-{
-}
Reply to: