diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2019-04-04 13:07:40 +0200 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2019-04-04 13:22:10 +0200 |
| commit | dd0d49c4ef08ddd0e6cb8e689f07ee84b51c2974 (patch) | |
| tree | 9844249f3536956e627d24a46394b920655ce8ee | |
| parent | d1fe6a6016efbb4f487dcac2f91194e58597ee3b (diff) | |
| download | nx-libs-dd0d49c4ef08ddd0e6cb8e689f07ee84b51c2974.tar.gz nx-libs-dd0d49c4ef08ddd0e6cb8e689f07ee84b51c2974.tar.bz2 nx-libs-dd0d49c4ef08ddd0e6cb8e689f07ee84b51c2974.zip | |
debian/patches/{,series}: remove 2004_enforce-lpthread.patch.
This workaround/hack should not be needed any longer.
| -rw-r--r-- | debian/patches/2004_enforce-lpthread.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/2004_enforce-lpthread.patch b/debian/patches/2004_enforce-lpthread.patch deleted file mode 100644 index 474feb0dd..000000000 --- a/debian/patches/2004_enforce-lpthread.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 745ba5c80..e1ec9c56d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 2001_nx-X11_install-location.debian.patch 2002_xserver-xext_set-securitypolicy-path.debian.patch 2003_nxdialog-use-python3.patch -2004_enforce-lpthread.patch |