external/public-domain/xz - Sync with NetBSD-8

Instead of adding ifdefs, indicate availablility of functionality in config.h.

external/public-domain/xz/bin/lzmainfo/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/08/04 03:38:06 matt Exp $
+# $NetBSD: Makefile,v 1.2 2016/01/28 19:40:29 christos Exp $
 
 PROG=	lzmainfo
 BINDIR=	/usr/bin
@@ -18,8 +18,8 @@ CPPFLAGS+=	-DPACKAGE=\"xz\"
 .if !defined(__MINIX)
 CPPFLAGS+=	-DENABLE_NLS -DLOCALEDIR=\"/usr/share/locale\"
 
-DPADD+=	${LIBLZMA} ${LIBINTL}
+DPADD+=	${LIBLZMA} ${LIBINTL} ${LIBPTHREAD}
-LDADD+=	-llzma -lintl
+LDADD+=	-llzma -lintl -lpthread
 .else
 DPADD+= ${LIBLZMA}
 LDADD+= -llzma

external/public-domain/xz/include/config.h

@@ -46,10 +46,8 @@
 /* Define to 1 if sha256 integrity check is enabled. */
 #define HAVE_CHECK_SHA256 1
 
-#if !defined(__minix)
 /* Define to 1 if you have the `clock_gettime' function. */
 #define HAVE_CLOCK_GETTIME 1
-#endif /* !defined(__minix) */
 
 /* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
 /* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
@@ -58,11 +56,9 @@
    */
 /* #undef HAVE_DCGETTEXT */
 
-#if !defined(__minix)
 /* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
    you don't. */
 #define HAVE_DECL_CLOCK_MONOTONIC 1
-#endif /* !defined(__minix) */
 
 /* Define to 1 if you have the declaration of `program_invocation_name', and
    to 0 if you don't. */
@@ -146,15 +142,14 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 /* #undef HAVE_GETTEXT */
 
-#if !defined(__minix)
 /* Define if you have the iconv() function and it works. */
 #define HAVE_ICONV 1
 
 /* Define to 1 if you have the <immintrin.h> header file. */
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__lint__) && \
+	!defined(__PCC__)
 #define HAVE_IMMINTRIN_H 1
 #endif
-#endif /* !defined(__minix) */
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
@@ -192,13 +187,13 @@
 /* Define to 1 if you have the `pipe2' function. */
 #define HAVE_PIPE2 1
 
-#if !defined(__minix)
 /* Define to 1 if you have the `posix_fadvise' function. */
-#define HAVE_POSIX_FADVISE 1
+/* #define HAVE_POSIX_FADVISE 1 */
+#undef HAVE_POSIX_FADVISE
 
 /* Define to 1 if you have the `pthread_condattr_setclock' function. */
-#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1
+/* #define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 */
-#endif /* !defined(__minix) */
+#undef HAVE_PTHREADS_CONDATTR_SETCLOCK
 
 /* Have PTHREAD_PRIO_INHERIT. */
 /* #undef HAVE_PTHREAD_PRIO_INHERIT */
@@ -294,18 +289,15 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #define HAVE__BOOL 1
 
-#if !defined(__minix)
 /* Define to 1 if _mm_movemask_epi8 is available. */
 #define HAVE__MM_MOVEMASK_EPI8 1
-#endif /* !defined(__minix) */
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
-#if !defined(__minix)
 /* Define to 1 when using POSIX threads (pthreads). */
-#define MYTHREAD_POSIX 1
+/* #define MYTHREAD_POSIX 1 */
-#endif /* !defined(__minix) */
+#undef MYTHREAD_POSIX
 
 /* Define to 1 when using Windows Vista compatible threads. This uses features
    that are not available on Windows XP. */
@@ -425,7 +417,7 @@
 /* Version number of package */
 #define VERSION "5.2.1"
 
-#if !defined(__NetBSD__) && !defined(__minix)
+#ifndef __NetBSD__
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
 #if defined AC_APPLE_UNIVERSAL_BUILD
@@ -455,9 +447,9 @@
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */
 
-#if !defined(__minix)
 /* Define to 1 if on MINIX. */
 /* #undef _MINIX */
+#define _MINIX 1
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
@@ -465,11 +457,7 @@
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 /* #undef _POSIX_SOURCE */
-#else
+
-#define _MINIX 1
-#define _POSIX_1_SOURCE 2
-#define _POSIX_SOURCE 1
-#endif /* !defined(__minix) */
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
    #define below would cause a syntax error. */

external/public-domain/xz/lib/Makefile

@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 11:10:38 maya Exp $
+
+.include <bsd.init.mk>
 
 LIB=		lzma
 USE_SHLIBDIR=	yes
 NOLINT=		yes
 
-.include <bsd.init.mk>
 
 .PATH:	${XZSRCDIR}/src/liblzma/api ${XZSRCDIR}/src/liblzma/api/lzma
 INCS+=	base.h bcj.h block.h check.h container.h delta.h \
@@ -34,17 +35,17 @@ SRCS+=	check.c crc32_table.c crc64_table.c
 SRCS+=	crc32_fast.c crc64_fast.c
 
 #__MINIX: No pthreads:
-#         hardware_cputhreads.c outqueue.c stream_encoder_mt.c
+#	hardware_cputhreads.c stream_encoder_mt.c
 .PATH:	${XZSRCDIR}/src/liblzma/common
 SRCS+=	common.c block_util.c easy_preset.c filter_common.c \
-	hardware_physmem.c index.c \
+	hardware_physmem.c hardware_cputhreads.c index.c \
 	stream_flags_common.c vli_size.c \
 	alone_encoder.c block_buffer_encoder.c block_encoder.c \
 	block_header_encoder.c easy_buffer_encoder.c easy_encoder.c \
 	easy_encoder_memusage.c filter_buffer_encoder.c \
 	filter_encoder.c filter_flags_encoder.c index_encoder.c \
 	stream_buffer_encoder.c stream_encoder.c \
-	stream_flags_encoder.c vli_encoder.c \
+	stream_flags_encoder.c vli_encoder.c outqueue.c \
 	alone_decoder.c auto_decoder.c block_buffer_decoder.c \
 	block_decoder.c block_header_decoder.c easy_decoder_memusage.c \
 	filter_buffer_decoder.c filter_decoder.c filter_flags_decoder.c \
@@ -85,11 +86,14 @@ liblzma.pc:	${XZSRCDIR}/src/liblzma/liblzma.pc.in
 	    > ${.TARGET}.tmp && \
 	mv -f ${.TARGET}.tmp ${.TARGET}
 
+.if ${MACHINE_ARCH} == "i386"
+COPTS += ${${ACTIVE_CC} == "gcc":? -Wno-error=psabi :}
+.endif
+
 CLEANFILES+=	liblzma.pc
 
 .if !defined(__MINIX)
-LDADD+=	-lpthread
+LIBDPLIBS+=	pthread ${NETBSDSRCDIR}/lib/libpthread
-DPADD+=	${LIBPTHREAD}
 .endif # defined(__MINIX)
 
 .include <bsd.lib.mk>