[X2Go-Commits] [nx-libs] 04/04: nxproxy/{m4, configure.ac, src/Makefile.am}: drop pthread overlinking.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/libXcomp-pthread-underlinking
in repository nx-libs.

commit d1fe6a6016efbb4f487dcac2f91194e58597ee3b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 4 11:15:22 2019 +0200

    nxproxy/{m4,configure.ac,src/Makefile.am}: drop pthread overlinking.
    
    Should be fixed by correctly building libXcomp.
    
    See: ArcticaProject/nx-libs#756
---
 nxproxy/configure.ac     | 11 -----------
 nxproxy/m4/ax_pthread.m4 |  1 -
 nxproxy/src/Makefile.am  |  3 ---
 3 files changed, 15 deletions(-)

diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index 6a0a41c..2ca64f6 100644
--- a/nxproxy/configure.ac
+++ b/nxproxy/configure.ac
@@ -28,17 +28,6 @@ NX_DEFAULT_OPTIONS
 
 NX_TARGET_USE_ELF
 
-dnl This is a workaround for a nasty libtool bug.
-dnl We actually compile libXcomp with pthread support, but libtool uses g++ ... -nostdlib ... -pthread
-dnl on Linux. -nostdlib causes -pthread to be ignored.
-dnl According to GCC upstream, this is not a bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-dnl GCC upstream insists that libtool needs to handle -pthread in a special way when using -nostdlib.
-dnl A patch has been submitted to the libtool project: http://lists.gnu.org/archive/html/libtool-patches/2013-11/msg00015.html
-dnl but never applied to the code base. Boo.
-dnl We will work around this bug by using AX_PTHREAD and linking with pthread support in all consumers of
-dnl libXcomp for now.
-AX_PTHREAD([], AC_MSG_ERROR([no POSIX threads support detected]))
-
 AC_CONFIG_FILES([
 Makefile
 man/Makefile
diff --git a/nxproxy/m4/ax_pthread.m4 b/nxproxy/m4/ax_pthread.m4
deleted file mode 120000
index 156af3d..0000000
--- a/nxproxy/m4/ax_pthread.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../m4/ax_pthread.m4
\ No newline at end of file
diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am
index fbe52cb..20ec702 100644
--- a/nxproxy/src/Makefile.am
+++ b/nxproxy/src/Makefile.am
@@ -9,12 +9,10 @@ nxproxy_SOURCES =					\
     $(NULL)
 
 nxproxy_LDADD =						\
-    @PTHREAD_LIBS@					\
     -L$(top_srcdir)/../nxcomp/src/.libs -lXcomp		\
     $(NULL)
 
 nxproxy_LDFLAGS =					\
-    $(PTHREAD_LDFLAGS)					\
     $(NULL)
 
 if TARGET_ELF
@@ -25,7 +23,6 @@ endif TARGET_ELF
 
 nxproxy_CFLAGS =					\
     $(BASE_CFLAGS)					\
-    $(PTHREAD_CFLAGS)					\
     $(NULL)
 
 AM_CPPFLAGS =						\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git