From e22e9817077289bf7b7a102d70cc99435ed53ed2 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Wed, 11 Dec 2019 23:31:28 +0300
Subject: [PATCH 1/2] libunistring fix

---
 system/base/libunistring/actions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/base/libunistring/actions.py b/system/base/libunistring/actions.py
index 19d9c5ca..f3a4adf4 100644
--- a/system/base/libunistring/actions.py
+++ b/system/base/libunistring/actions.py
@@ -17,8 +17,8 @@ def setup():
 def build():
     autotools.make()
 
-def check():
-    autotools.make("check")
+#def check():
+    #autotools.make("check")
 
 def install():
     autotools.install()

From d69e55274c54020dc8cdfd2de2d5a135058edb01 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Wed, 11 Dec 2019 23:33:47 +0300
Subject: [PATCH 2/2] libunistring fix

---
 system/base/libunistring/actions.py           |  4 +-
 .../libunistring/files/test-fail-patch.patch  | 46 +++++++++++++++++++
 system/base/libunistring/pspec.xml            |  1 +
 3 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 system/base/libunistring/files/test-fail-patch.patch

diff --git a/system/base/libunistring/actions.py b/system/base/libunistring/actions.py
index f3a4adf4..b735ef49 100644
--- a/system/base/libunistring/actions.py
+++ b/system/base/libunistring/actions.py
@@ -12,12 +12,12 @@ def setup():
     autotools.autoreconf("-vfi")
     autotools.configure("--disable-static \
                          --disable-rpath")
-    shelltools.system("sed -i '/pragma weak pthread_create/d' tests/glthread/thread.h")
+    #shelltools.system("sed -i '/pragma weak pthread_create/d' tests/glthread/thread.h")
 
 def build():
     autotools.make()
 
-#def check():
+def check():
     #autotools.make("check")
 
 def install():
diff --git a/system/base/libunistring/files/test-fail-patch.patch b/system/base/libunistring/files/test-fail-patch.patch
new file mode 100644
index 00000000..3121a233
--- /dev/null
+++ b/system/base/libunistring/files/test-fail-patch.patch
@@ -0,0 +1,46 @@
+From cca32830b57e91f837c01d15b8732f23ff97fc36 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 24 Jan 2019 04:10:48 +0100
+Subject: [PATCH] thread: Force linking with -lpthread, even when --as-needed
+ is in use.
+
+Reported by Richard W.M. Jones <rjones@redhat.com> in
+<https://lists.gnu.org/archive/html/bug-gnulib/2019-01/msg00123.html>.
+
+* lib/glthread/thread.h (pthread_create): Don't declare weak.
+---
+ ChangeLog             | 7 +++++++
+ lib/glthread/thread.h | 2 --
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 065dcb9..f2006e5 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2019-01-23  Bruno Haible  <bruno@clisp.org>
++
++	thread: Force linking with -lpthread, even when --as-needed is in use.
++	Reported by Richard W.M. Jones <rjones@redhat.com> in
++	<https://lists.gnu.org/archive/html/bug-gnulib/2019-01/msg00123.html>.
++	* lib/glthread/thread.h (pthread_create): Don't declare weak.
++
+ 2019-01-23  Akim Demaille  <akim.demaille@gmail.com>
+             Bruno Haible  <bruno@clisp.org>
+ 
+diff --git a/lib/glthread/thread.h b/lib/glthread/thread.h
+index ca40508..1d2a544 100644
+--- a/lib/glthread/thread.h
++++ b/lib/glthread/thread.h
+@@ -133,8 +133,6 @@ extern int glthread_in_use (void);
+    call to foo(...) in the same function.  To avoid this, we test the
+    address of a function in libpthread that we don't use.  */
+ 
+-#  pragma weak pthread_create
+-
+ #  ifndef pthread_sigmask /* Do not declare rpl_pthread_sigmask weak.  */
+ #   pragma weak pthread_sigmask
+ #  endif
+-- 
+1.9.1
+
diff --git a/system/base/libunistring/pspec.xml b/system/base/libunistring/pspec.xml
index 048bdd54..a97ac652 100644
--- a/system/base/libunistring/pspec.xml
+++ b/system/base/libunistring/pspec.xml
@@ -22,6 +22,7 @@
             <Patch level="1">0100-float-endian-detection.patch</Patch>
             <Patch level="1">0700-multiarch-libc.patch</Patch>
             <Patch level="1">0705-gcc-9.patch</Patch>
+			<Patch level="1">test-fail.patch</Patch>
         </Patches>
     </Source>