* Makefile (HURDLIBS): Reorder libs such that the threads lib

comes before the ports lib.  This makes sure the functions in
libthreads properly override the stubs in libports with the new
dynamic linker semantics in glibc 2.2.

6 files changed, 28 insertions, 6 deletions

diff --git a/ufs/ChangeLog b/ufs/ChangeLog
index 34f98d28..a83d02b8 100644
--- a/ufs/ChangeLog
+++ b/ufs/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* Makefile (HURDLIBS): Reorder libs such that the threads lib
+	comes before the ports lib.  This makes sure the functions in
+	libthreads properly override the stubs in libports with the new
+	dynamic linker semantics in glibc 2.2.
+
 2000-03-03  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* dir.c (diskfs_get_directs): Don't allocate buffer for *DATA until
diff --git a/ufs/Makefile b/ufs/Makefile
index c3bdc997..183caa86 100644
--- a/ufs/Makefile
+++ b/ufs/Makefile
@@ -1,5 +1,6 @@
-
-#   Copyright (C) 1994,95,96,99 Free Software Foundation, Inc.
+# Makefile for ufs
+#
+#   Copyright (C) 1994,95,96,99,2000 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -24,6 +25,6 @@ SRCS = alloc.c consts.c dir.c hyper.c inode.c main.c pager.c \
 LCLHDRS = ufs.h fs.h dinode.h dir.h
 
 OBJS = $(SRCS:.c=.o)
-HURDLIBS = diskfs iohelp fshelp store pager ports threads ihash shouldbeinlibc
+HURDLIBS = diskfs iohelp fshelp store pager threads ports ihash shouldbeinlibc
 
 include ../Makeconf
diff --git a/usermux/ChangeLog b/usermux/ChangeLog
index 7fac0e93..90b0a5f4 100644
--- a/usermux/ChangeLog
+++ b/usermux/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* Makefile (HURDLIBS): Reorder libs such that the threads lib
+	comes before the ports lib.  This makes sure the functions in
+	libthreads properly override the stubs in libports with the new
+	dynamic linker semantics in glibc 2.2.
+
 2000-07-18  Thomas Bushnell, BSG  <tb@mit.edu>
 
 	* mux.c (free_name): Fix typo in comment.
diff --git a/usermux/Makefile b/usermux/Makefile
index 318adde2..c07ae927 100644
--- a/usermux/Makefile
+++ b/usermux/Makefile
@@ -1,6 +1,6 @@
 # Makefile for usermux
 # 
-#   Copyright (C) 1997 Free Software Foundation, Inc.
+#   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU General Public License as
@@ -25,6 +25,6 @@ SRCS = usermux.c mux.c leaf.c node.c stubs.c
 LCLHDRS = usermux.h
 
 OBJS = $(SRCS:.c=.o)
-HURDLIBS = netfs fshelp iohelp ports threads ihash shouldbeinlibc
+HURDLIBS = netfs fshelp iohelp threads ports ihash shouldbeinlibc
 
 include ../Makeconf
diff --git a/utils/ChangeLog b/utils/ChangeLog
index 91b890e2..d5adefa5 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-26  Mark Kettenis  <kettenis@gnu.org>
+
+	* Makefile (HURDLIBS): Reorder libs such that the threads lib
+	comes before the ports lib.  This makes sure the functions in
+	libthreads properly override the stubs in libports with the new
+	dynamic linker semantics in glibc 2.2.
+
 2000-03-17  Thomas Bushnell, BSG  <tb@mit.edu>
 
 	* frobauth-mod.c (frobauth_modify): Don't use MOVE_SEND in Hurd RPC.
diff --git a/utils/Makefile b/utils/Makefile
index 6e36390d..e0d0bc16 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -32,7 +32,7 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \
 LCLHDRS = psout.h parse.h pids.h frobauth.h
 
 OBJS = $(filter-out %.sh,$(SRCS:.c=.o))
-HURDLIBS = ps ihash store fshelp ports threads ftpconn shouldbeinlibc
+HURDLIBS = ps ihash store fshelp threads ports ftpconn shouldbeinlibc
 login-LDLIBS = -lutil $(LIBCRYPT)
 addauth-LDLIBS = $(LIBCRYPT)
 setauth-LDLIBS = $(LIBCRYPT)