[PATCH 09/10] gnu: base: Remove a multiple definition from libpthread.

[PATCH 09/10] gnu: base: Remove a multiple definition from libpthread.

[Manolis Ragkousis]

[-- Attachment #1: Type: text/plain, Size: 73 bytes --]

This and the previous one will become part of the add glibc/hurd commit.

[-- Attachment #2: 0009-gnu-base-Remove-a-multiple-definition-from-libpthrea.patch --]
[-- Type: text/x-patch, Size: 1233 bytes --]

From c79795377c6325739fdd1f5d1f40942f0dc349ad Mon Sep 17 00:00:00 2001
From: Manolis Ragkousis <manolis837@gmail.com>
Date: Tue, 19 May 2015 00:57:04 +0300
Subject: [PATCH 09/10] gnu: base: Remove a multiple definition from
 libpthread.

gnu/packages/patches/glibc-hurd-extern-inline.patch: Remove a multiple definition from libpthread.
---
 gnu/packages/patches/glibc-hurd-extern-inline.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/patches/glibc-hurd-extern-inline.patch b/gnu/packages/patches/glibc-hurd-extern-inline.patch
index 33eb3a4..dd18d1b 100644
--- a/gnu/packages/patches/glibc-hurd-extern-inline.patch
+++ b/gnu/packages/patches/glibc-hurd-extern-inline.patch
@@ -14,3 +14,20 @@ considered a standard part of the API in GNU-land.
  
  endif
 
+There is a definition of __libc_getspecific in libpthread that causes the
+build to fail. Remove it. 
+--- a/libpthread/pthread/cthreads-compat.c
++++ b/libpthread/pthread/cthreads-compat.c
+@@ -70,12 +70,6 @@
+   return 0;
+ }
+ 
+-void *
+-__libc_getspecific (cthread_key_t key)
+-{
+-  return pthread_getspecific (key);
+-}
+-
+ int
+ cthread_setspecific (cthread_key_t key, void *val)
+ {
\ No newline at end of file
-- 
2.4.1

Re: [PATCH 09/10] gnu: base: Remove a multiple definition from libpthread.

[Ludovic Courtès]

Manolis Ragkousis <manolis837@gmail.com> skribis:

> This and the previous one will become part of the add glibc/hurd commit.

You mean you the two commits will be merged?  Sounds good to me
(wip-hurd), with appropriate commit log.

Ludo’.