aboutsummaryrefslogtreecommitdiff
path: root/nxproxy
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2019-04-04 11:15:22 +0200
committerMihai Moldovan <ionic@ionic.de>2019-04-04 11:19:01 +0200
commitd1fe6a6016efbb4f487dcac2f91194e58597ee3b (patch)
treeac0d03c26fea498523fea1d1dbcbe9312ff8dddd /nxproxy
parent95f8cf7ea0a169b47c84be29d0db3a40d1a86d86 (diff)
downloadnx-libs-d1fe6a6016efbb4f487dcac2f91194e58597ee3b.tar.gz
nx-libs-d1fe6a6016efbb4f487dcac2f91194e58597ee3b.tar.bz2
nx-libs-d1fe6a6016efbb4f487dcac2f91194e58597ee3b.zip
nxproxy/{m4,configure.ac,src/Makefile.am}: drop pthread overlinking.
Should be fixed by correctly building libXcomp. See: ArcticaProject/nx-libs#756
Diffstat (limited to 'nxproxy')
-rw-r--r--nxproxy/configure.ac11
l---------nxproxy/m4/ax_pthread.m41
-rw-r--r--nxproxy/src/Makefile.am3
3 files changed, 0 insertions, 15 deletions
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index 6a0a41cbb..2ca64f61e 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 156af3df3..000000000
--- 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 fbe52cbf8..20ec7022e 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 = \