summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trans/ChangeLog7
-rw-r--r--trans/Makefile12
2 files changed, 13 insertions, 6 deletions
diff --git a/trans/ChangeLog b/trans/ChangeLog
index 22625eb3..fd215e5d 100644
--- a/trans/ChangeLog
+++ b/trans/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-26 Mark Kettenis <kettenis@gnu.org>
+
+ * Makefile: 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-19 Roland McGrath <roland@baalperazim.frob.com>
* new-fifo.c (trivfs_protid_portclasses, trivfs_protid_nportclasses):
diff --git a/trans/Makefile b/trans/Makefile
index ad7a3a4a..03c48f36 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 1994,95,96,97,99 Free Software Foundation, Inc.
+# Copyright (C) 1994,95,96,97,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
@@ -23,7 +23,7 @@ targets = symlink firmlink ifsock magic null fifo new-fifo fwd crash \
SRCS = ifsock.c symlink.c magic.c null.c fifo.c new-fifo.c fwd.c \
crash.c firmlink.c password.c hello.c hello-mt.c
OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o
-HURDLIBS=ports trivfs threads fshelp pipe ihash shouldbeinlibc
+HURDLIBS = threads ports trivfs fshelp pipe ihash shouldbeinlibc
password-LDLIBS = $(LIBCRYPT)
include ../Makeconf
@@ -33,11 +33,11 @@ ifsock: ifsockServer.o
crash: crashServer.o crash_replyUser.o msgServer.o
password: passwordServer.o
-crash password: ../libports/libports.a ../libtrivfs/libtrivfs.a ../libthreads/libthreads.a ../libfshelp/libfshelp.a
+crash password: ../libthreads/libthreads.a ../libports/libports.a ../libtrivfs/libtrivfs.a ../libthreads/libthreads.a ../libfshelp/libfshelp.a
fifo new-fifo: ../libpipe/libpipe.a
-fwd new-fifo: ../libfshelp/libfshelp.a ../libports/libports.a
-hello-mt hello magic null ifsock fifo new-fifo firmlink: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a
+fwd: ../libfshelp/libfshelp.a ../libports/libports.a
+hello-mt magic null ifsock fifo new-fifo firmlink: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libthreads/libthreads.a ../libports/libports.a ../libihash/libihash.a
+hello: ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a
$(targets): ../libshouldbeinlibc/libshouldbeinlibc.a
-hello-mt magic fwd null ifsock fifo new-fifo firmlink: ../libthreads/libthreads.a
$(targets): %: %.o