svn commit: r341453 - head/lib/libarchive

[Sean Bruno]

Author: sbruno
Date: Tue Dec  4 03:23:14 2018
New Revision: 341453
URL: https://svnweb.freebsd.org/changeset/base/341453

Log:
  Revert r340997 at the request of multiple users.
  - breaks ports-mgmt/pkg build for mips64, powerpc64 and i386 for some users.
  
  --- pkg-static ---
  /usr/lib/liblzma.a(stream_encoder_mt.o): In function `mythread_cond_init':
  /usr/local/poudriere/jails/ppc64/usr/src/contrib/xz/src/common/mythread.h:230:
  undefined reference to `pthread_condattr_init'
  
  Reported by:	jhibbits zeising

Modified:
  head/lib/libarchive/Makefile
  head/lib/libarchive/config_freebsd.h

Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile	Tue Dec  4 02:30:11 2018	(r341452)
+++ head/lib/libarchive/Makefile	Tue Dec  4 03:23:14 2018	(r341453)
@@ -7,6 +7,7 @@ _LIBARCHIVEDIR=	${SRCTOP}/contrib/libarchive
 LIB=	archive
 
 LIBADD=	z bz2 lzma bsdxml
+CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
 
 # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
 # It has no real relation to the libarchive version number.

Modified: head/lib/libarchive/config_freebsd.h
==============================================================================
--- head/lib/libarchive/config_freebsd.h	Tue Dec  4 02:30:11 2018	(r341452)
+++ head/lib/libarchive/config_freebsd.h	Tue Dec  4 03:23:14 2018	(r341453)
@@ -133,17 +133,14 @@
 #define HAVE_LCHFLAGS 1
 #define HAVE_LCHMOD 1
 #define HAVE_LCHOWN 1
-#define HAVE_LIBLZMA 1
 #define HAVE_LIBZ 1
 #define HAVE_LIMITS_H 1
 #define HAVE_LINK 1
-#define HAVE_LZMA_H 1
 #define HAVE_LOCALE_H 1
 #define HAVE_LOCALTIME_R 1
 #define HAVE_LONG_LONG_INT 1
 #define HAVE_LSTAT 1
 #define HAVE_LUTIMES 1
-#define HAVE_LZMA_STREAM_ENCODER_MT 1
 #define HAVE_MBRTOWC 1
 #define HAVE_MEMMOVE 1
 #define HAVE_MEMORY_H 1