Merge pull request #988 from IdrisKalp/master

xz
This commit is contained in:
Idris Kalp
2019-12-12 00:49:41 +03:00
committed by GitHub
+23 -11
View File
@@ -1,11 +1,23 @@
--- a/Makefile.in 2018-04-29 19:01:26.000000000 +0300 diff -Nru xz-5.2.4.orig/configure.ac xz-5.2.4/configure.ac
+++ b/Makefile.in 2019-12-12 00:22:02.754424198 +0300 --- xz-5.2.4.orig/configure.ac 2018-04-29 18:10:38.000000000 +0300
@@ -313,7 +313,7 @@ +++ xz-5.2.4/configure.ac 2019-12-12 00:47:48.808460129 +0300
INTLLIBS = @INTLLIBS@ @@ -551,6 +551,7 @@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ echo
LD = @LD@ echo "POSIX threading support:"
-LDFLAGS = @LDFLAGS@ AX_PTHREAD([:]) dnl We don't need the HAVE_PTHREAD macro.
+LDFLAGS = @LDFLAGS@ -pthread + PTHREAD_LIBS="$PTHREAD_LIBS -pthread"
LIBICONV = @LIBICONV@ LIBS="$LIBS $PTHREAD_LIBS"
LIBINTL = @LIBINTL@ AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS"
LIBOBJS = @LIBOBJS@
diff -Nru xz-5.2.4.orig/Makefile.in xz-5.2.4/Makefile.in
--- xz-5.2.4.orig/Makefile.in 2018-04-29 19:01:26.000000000 +0300
+++ xz-5.2.4/Makefile.in 2019-12-12 00:48:19.857460850 +0300
@@ -351,7 +351,7 @@
PREFERABLY_POSIX_SHELL = @PREFERABLY_POSIX_SHELL@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
+PTHREAD_LIBS = @PTHREAD_LIBS@ -pthread
RANLIB = @RANLIB@
RC = @RC@
SED = @SED@