From 21b1f21e6092acd023310718191c1bfdde4edab3 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 27 Jan 2018 22:19:39 +0100
Subject: Fix duplicate definition of LIBPTHREAD_VERSION

Now that libpthread is built along glibc, it should follow that
versioning anyway.

* Makefile (pthread-version): Do not define.
* sysdeps/pthread/Makefile [$(subdir) == posix] (CFLAGS-confstr.c): Set
-DLIBPTHREAD_VERSION='"HTL $(version)"'.
---
 Makefile                 | 2 --
 sysdeps/pthread/Makefile | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 6664549..758edd3 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,6 @@ makemode := library
 else
 subdir := htl
 
-pthread-version := 0.3
-
 srcdir = .
 endif
 
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index f5dbd25..12bb54e 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -1,7 +1,7 @@
 ifeq ($(subdir),rt)
 librt-sysdep_routines += timer_routines
 endif
+
 ifeq ($(subdir),posix)
-  # FIXME: this is not getting $(pthread-version) from libpthread/Makefile!
-CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"libpthread $(pthread-version)"'
+CFLAGS-confstr.c += -DLIBPTHREAD_VERSION='"HTL $(version)"'
 endif
-- 
cgit v1.2.3