[Midnightbsd-cvs] src [11016] trunk/lib/liblzma: update to 5.2.3
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 15 18:36:13 EDT 2018
Revision: 11016
http://svnweb.midnightbsd.org/src/?rev=11016
Author: laffer1
Date: 2018-06-15 18:36:13 -0400 (Fri, 15 Jun 2018)
Log Message:
-----------
update to 5.2.3
Modified Paths:
--------------
trunk/lib/liblzma/Makefile
trunk/lib/liblzma/config.h
Modified: trunk/lib/liblzma/Makefile
===================================================================
--- trunk/lib/liblzma/Makefile 2018-06-15 22:34:34 UTC (rev 11015)
+++ trunk/lib/liblzma/Makefile 2018-06-15 22:36:13 UTC (rev 11016)
@@ -1,10 +1,10 @@
-# $FreeBSD: stable/11/lib/liblzma/Makefile 298107 2016-04-16 07:45:30Z gjb $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/liblzma/Makefile 313619 2017-02-11 06:55:35Z ngie $
-PACKAGE=lib${LIB}
LIB= lzma
-LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
+LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma
-.PATH: ${LZMADIR}/../common
+.PATH: ${LZMADIR:H}/common
SRCS+= tuklib_physmem.c tuklib_cpucores.c
.PATH: ${LZMADIR}/api/lzma
@@ -145,10 +145,10 @@
-I${LZMADIR}/lzma \
-I${LZMADIR}/delta \
-I${LZMADIR}/simple \
- -I${LZMADIR}/../common
+ -I${LZMADIR:H}/common
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+DPADD+= ${LIBPTHREAD}
+LDADD+= -lpthread
VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
@@ -156,11 +156,10 @@
CLEANFILES+= liblzma.pc
-FILES= liblzma.pc
-FILESDIR= ${LIBDATADIR}/pkgconfig
-
+.if !defined(LIBRARIES_ONLY)
+all: liblzma.pc
liblzma.pc: liblzma.pc.in
- sed -e 's, at prefix@,/usr,g ; \
+ @sed -e 's, at prefix@,/usr,g ; \
s, at exec_prefix@,/usr,g ; \
s, at libdir@,/usr/lib,g ; \
s, at includedir@,/usr/include,g ; \
@@ -169,4 +168,9 @@
s, at PTHREAD_CFLAGS@,,g ; \
s, at PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
+beforeinstall:
+ @${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ liblzma.pc ${DESTDIR}${LIBDATADIR}/pkgconfig
+.endif
+
.include <bsd.lib.mk>
Modified: trunk/lib/liblzma/config.h
===================================================================
--- trunk/lib/liblzma/config.h 2018-06-15 22:34:34 UTC (rev 11015)
+++ trunk/lib/liblzma/config.h 2018-06-15 22:36:13 UTC (rev 11016)
@@ -1,4 +1,5 @@
/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/lib/liblzma/config.h 312518 2017-01-20 06:40:12Z delphij $ */
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
@@ -10,7 +11,7 @@
/* Define to 1 if translation of program messages to the user's native
language is requested. */
-/* disabled intentionally */
+/* FreeBSD - disabled intentionally */
/* #undef ENABLE_NLS */
/* Define to 1 if bswap_16 is available. */
@@ -25,6 +26,9 @@
/* Define to 1 if you have the <byteswap.h> header file. */
/* #undef HAVE_BYTESWAP_H */
+/* Define to 1 if Capsicum is available. */
+/* #undef HAVE_CAPSICUM */
+
/* Define to 1 if the system has the type `CC_SHA256_CTX'. */
/* #undef HAVE_CC_SHA256_CTX */
@@ -31,11 +35,11 @@
/* Define to 1 if you have the `CC_SHA256_Init' function. */
/* #undef HAVE_CC_SHA256_INIT */
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
/* #undef HAVE_CFLOCALECOPYCURRENT */
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
@@ -56,7 +60,7 @@
/* Define if the GNU dcgettext() function is already present or preinstalled.
*/
-/* disabled intentionally */
+/* FreeBSD - disabled intentionally */
/* #undef HAVE_DCGETTEXT */
/* Define to 1 if you have the declaration of `CLOCK_MONOTONIC', and to 0 if
@@ -67,6 +71,9 @@
to 0 if you don't. */
#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
+/* Define to 1 if any of HAVE_DECODER_foo have been defined. */
+#define HAVE_DECODERS 1
+
/* Define to 1 if arm decoder is enabled. */
#define HAVE_DECODER_ARM 1
@@ -97,6 +104,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
+/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */
+#define HAVE_ENCODERS 1
+
/* Define to 1 if arm encoder is enabled. */
#define HAVE_ENCODER_ARM 1
@@ -128,11 +138,10 @@
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the `futimens' function. */
-/* #define HAVE_FUTIMENS 1 */
+/* #undef HAVE_FUTIMENS 1 */
/* Define to 1 if you have the `futimes' function. */
/* #undef HAVE_FUTIMES */
-#define HAVE_FUTIMES 1
/* Define to 1 if you have the `futimesat' function. */
/* #undef HAVE_FUTIMESAT */
@@ -144,7 +153,7 @@
#define HAVE_GETOPT_LONG 1
/* Define if the GNU gettext() function is already present or preinstalled. */
-/* disabled intentionally */
+/* FreeBSD - disabled intentionally */
/* #undef HAVE_GETTEXT */
/* Define if you have the iconv() function and it works. */
@@ -151,7 +160,7 @@
#define HAVE_ICONV 1
/* Define to 1 if you have the <immintrin.h> header file. */
-/* only with clang because the base gcc does not support it */
+/* FreeBSD - only with clang because the base gcc does not support it */
#if defined(__clang__) && defined(__MidnightBSD__) && defined(__amd64__)
#define HAVE_IMMINTRIN_H 1
#endif
@@ -183,9 +192,6 @@
/* Define to 1 to enable hc4 match finder. */
#define HAVE_MF_HC4 1
-/* Define to 1 if you have the <minix/sha2.h> header file. */
-/* #undef HAVE_MINIX_SHA2_H */
-
/* Define to 1 if getopt.h declares extern int optreset. */
#define HAVE_OPTRESET 1
@@ -202,15 +208,15 @@
/* #undef HAVE_SHA256INIT */
/* Define to 1 if the system has the type `SHA256_CTX'. */
-/* disabled libmd SHA256 for now */
+/* FreeBSD - disabled libmd SHA256 for now */
/* #undef HAVE_SHA256_CTX */
/* Define to 1 if you have the <sha256.h> header file. */
-/* disabled libmd SHA256 for now */
+/* FreeBSD - disabled libmd SHA256 for now */
/* #undef HAVE_SHA256_H */
/* Define to 1 if you have the `SHA256_Init' function. */
-/* disabled libmd SHA256 for now */
+/* FreeBSD - disabled libmd SHA256 for now */
/* #undef HAVE_SHA256_INIT */
/* Define to 1 if the system has the type `SHA2_CTX'. */
@@ -255,6 +261,9 @@
/* Define to 1 if you have the <sys/byteorder.h> header file. */
/* #undef HAVE_SYS_BYTEORDER_H */
+/* Define to 1 if you have the <sys/capsicum.h> header file. */
+/* #undef HAVE_SYS_CAPSICUM_H */
+
/* Define to 1 if you have the <sys/endian.h> header file. */
#define HAVE_SYS_ENDIAN_H 1
@@ -292,6 +301,9 @@
/* Define to 1 if the system has the type `_Bool'. */
#define HAVE__BOOL 1
+/* Define to 1 if you have the `_futime' function. */
+/* #undef HAVE__FUTIME */
+
/* Define to 1 if _mm_movemask_epi8 is available. */
#if defined(__MidnightBSD__) && defined(__amd64__)
#define HAVE__MM_MOVEMASK_EPI8 1
@@ -324,7 +336,7 @@
#define PACKAGE_NAME "XZ Utils"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "XZ Utils 5.2.2"
+#define PACKAGE_STRING "XZ Utils 5.2.3"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xz"
@@ -333,7 +345,7 @@
#define PACKAGE_URL "http://tukaani.org/xz/"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "5.2.2"
+#define PACKAGE_VERSION "5.2.3"
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -354,6 +366,10 @@
/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */
/* Define to 1 if the number of available CPU cores can be detected with
+ sched_getaffinity() */
+/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */
+
+/* Define to 1 if the number of available CPU cores can be detected with
sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */
/* #undef TUKLIB_CPUCORES_SYSCONF */
@@ -363,7 +379,7 @@
/* Define to 1 if the system supports fast unaligned access to 16-bit and
32-bit integers. */
-/* derive from __NO_STRICT_ALIGNMENT */
+/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */
/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */
/* Define to 1 if the amount of physical memory can be detected with
@@ -417,7 +433,7 @@
/* Version number of package */
-#define VERSION "5.2.2"
+#define VERSION "5.2.3"
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
More information about the Midnightbsd-cvs
mailing list