aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-06-29 23:03:20 +0000
committerRoland McGrath <roland@gnu.org>2004-06-29 23:03:20 +0000
commit4f16d3b530955dd1cb7bcc78499f4b4aa957c9b7 (patch)
tree28be35c86f542eb9dd81ebbca22f215048f769a6
parent0b8d139044f6731790bc55663f213eb11487f793 (diff)
downloadglibc-4f16d3b530955dd1cb7bcc78499f4b4aa957c9b7.zip
glibc-4f16d3b530955dd1cb7bcc78499f4b4aa957c9b7.tar.gz
glibc-4f16d3b530955dd1cb7bcc78499f4b4aa957c9b7.tar.bz2
2004-06-29 Roland McGrath <roland@redhat.com>
* Banner: NPTL no longer has its own version number. * Makefile (nptl-version): Variable removed. * sysdeps/pthread/Makefile (CFLAGS-confstr.c): Set LIBPTHREAD_VERSION using $(version), the glibc version number.
-rw-r--r--nptl/Banner2
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl/sysdeps/pthread/Makefile4
3 files changed, 3 insertions, 5 deletions
diff --git a/nptl/Banner b/nptl/Banner
index 5344480..7c1487e 100644
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-NPTL 0.61 by Ulrich Drepper
+Native POSIX Threads Library by Ulrich Drepper et al
diff --git a/nptl/Makefile b/nptl/Makefile
index c282c6f..56dd089 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -21,8 +21,6 @@
#
subdir := nptl
-nptl-version := $(shell sed -n 's/^[^0-9]* \([0-9.]*\).*$$/\1/p' Banner)
-
headers := pthread.h semaphore.h bits/semaphore.h
extra-libs := libpthread
diff --git a/nptl/sysdeps/pthread/Makefile b/nptl/sysdeps/pthread/Makefile
index 05854be..207e10f 100644
--- a/nptl/sysdeps/pthread/Makefile
+++ b/nptl/sysdeps/pthread/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -48,5 +48,5 @@ endif
endif
ifeq ($(subdir),posix)
-CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../nptl/Banner)\""
+CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"NPTL $(version)"'
endif