aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/2004_enforce-lpthread.patch33
-rw-r--r--debian/patches/series1
2 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/2004_enforce-lpthread.patch b/debian/patches/2004_enforce-lpthread.patch
new file mode 100644
index 000000000..474feb0dd
--- /dev/null
+++ b/debian/patches/2004_enforce-lpthread.patch
@@ -0,0 +1,33 @@
+Description: Enforce -lpthread when linking nxcomp.
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Abstract:
+ This is a workaround for a nasty libtool bug!!!
+ .
+ We actually compile libXcomp with pthread support, but libtool uses g++
+ ... -nostdlib ... -pthread on Linux. -nostdlib causes -pthread to be
+ ignored.
+ .
+ According to GCC upstream, this is not a bug:
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+ .
+ GCC upstream insists that libtool needs to handle -pthread in a special
+ way when using -nostdlib.
+ .
+ A patch has been submitted to the libtool project:
+ http://lists.gnu.org/archive/html/libtool-patches/2013-11/msg00015.html
+ but never applied to the code base. Boo.
+ .
+ We will work around this bug by hard-coding the linking with pthread
+ support in libXcomp for now.
+
+--- a/nxcomp/src/Makefile.am
++++ b/nxcomp/src/Makefile.am
+@@ -139,7 +139,7 @@
+ libXcomp_la_LDFLAGS = \
+ -version-number @LT_COMP_VERSION@ \
+ -no-undefined \
+- $(PTHREAD_LDFLAGS) \
++ $(PTHREAD_LDFLAGS) -lpthread \
+ $(NULL)
+
+ libXcompincludedir = $(includedir)/nx
diff --git a/debian/patches/series b/debian/patches/series
index e1ec9c56d..745ba5c80 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
2001_nx-X11_install-location.debian.patch
2002_xserver-xext_set-securitypolicy-path.debian.patch
2003_nxdialog-use-python3.patch
+2004_enforce-lpthread.patch