[Midnightbsd-cvs] src [9181] trunk/lib/liblzma: update config
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Oct 15 12:38:36 EDT 2016
Revision: 9181
http://svnweb.midnightbsd.org/src/?rev=9181
Author: laffer1
Date: 2016-10-15 12:38:36 -0400 (Sat, 15 Oct 2016)
Log Message:
-----------
update config
Modified Paths:
--------------
trunk/lib/liblzma/Makefile
trunk/lib/liblzma/config.h
Modified: trunk/lib/liblzma/Makefile
===================================================================
--- trunk/lib/liblzma/Makefile 2016-10-15 16:28:10 UTC (rev 9180)
+++ trunk/lib/liblzma/Makefile 2016-10-15 16:38:36 UTC (rev 9181)
@@ -1,117 +1,172 @@
-# $MidnightBSD: src/lib/liblzma/Makefile,v 1.3 2011/03/08 12:53:10 laffer1 Exp $
-# $NetBSD: Makefile,v 1.3 2010/11/09 23:07:09 joerg Exp $
+# $FreeBSD: stable/11/lib/liblzma/Makefile 298107 2016-04-16 07:45:30Z gjb $
+PACKAGE=lib${LIB}
LIB= lzma
-USE_SHLIBDIR= yes
-NO_LINT= yes
-WARNS= 3
+LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
-XZSRCDIR= ${.CURDIR}/../../contrib/xz
+.PATH: ${LZMADIR}/../common
+SRCS+= tuklib_physmem.c tuklib_cpucores.c
-.include <bsd.init.mk>
+.PATH: ${LZMADIR}/api/lzma
-# There are two different lzma.h files.
-# Copy public version to distinguish them.
-pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
- rm -f ${.TARGET}
- cat ${XZSRCDIR}/src/liblzma/api/lzma.h > ${.TARGET}
-CLEANFILES+= pub-lzma.h
-INCS= pub-lzma.h
-INCSDIR_pub-lzma.h= /usr/include
-INCSNAME_pub-lzma.h= lzma.h
+MAININCS= ../lzma.h
+MAININCSDIR= ${INCLUDEDIR}
-.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
-INCS+= base.h bcj.h block.h check.h container.h delta.h \
- filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
- version.h vli.h
+LZMAINCS+= base.h \
+ bcj.h \
+ block.h \
+ check.h \
+ container.h \
+ delta.h \
+ filter.h \
+ hardware.h \
+ index.h \
+ index_hash.h \
+ lzma12.h \
+ stream_flags.h \
+ version.h \
+ vli.h
-INCSDIR= /usr/include/lzma
+LZMAINCSDIR= ${INCLUDEDIR}/lzma
-LDFLAGS+= -Wl,-z,defs
+INCSGROUPS= MAININCS LZMAINCS
-CFLAGS+= -I${XZSRCDIR}
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/check
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/api
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/common
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/delta
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/lz
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/lzma
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/rangecoder
-CFLAGS+= -I${XZSRCDIR}/src/liblzma/simple
-CFLAGS+= -I${XZSRCDIR}/src/common -I${.CURDIR}
-CFLAGS+= -DTUKLIB_SYMBOL_PREFIX=lzma_
-CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -std=c99
+.PATH: ${LZMADIR}/common
+SRCS+= common.c \
+ block_util.c \
+ easy_preset.c \
+ filter_common.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 \
+ 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 \
+ index_decoder.c \
+ index_hash.c \
+ stream_buffer_decoder.c \
+ stream_decoder.c \
+ stream_flags_decoder.c \
+ stream_encoder_mt.c \
+ vli_decoder.c \
+ outqueue.c
-.PATH: ${XZSRCDIR}/src/common
-SRCS+= tuklib_physmem.c
-.PATH: ${XZSRCDIR}/src/liblzma/check
-SRCS+= check.c crc32_table.c crc64_table.c
-SRCS+= sha256.c
+.PATH: ${LZMADIR}/check
+SRCS+= check.c \
+ crc32_table.c \
+ crc64_table.c \
+ sha256.c
.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386"
SRCS+= crc32_x86.S \
crc64_x86.S
+ACFLAGS+= -Wa,--noexecstack
.else
SRCS+= crc32_fast.c \
crc64_fast.c
.endif
+.PATH: ${LZMADIR}/lz
+SRCS+= lz_encoder.c \
+ lz_encoder_mf.c \
+ lz_decoder.c
-.PATH: ${XZSRCDIR}/src/liblzma/common
-SRCS+= common.c block_util.c easy_preset.c filter_common.c \
- hardware_physmem.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 \
- 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 \
- index_decoder.c index_hash.c stream_buffer_decoder.c \
- stream_decoder.c stream_flags_decoder.c vli_decoder.c
+.PATH: ${LZMADIR}/lzma
+SRCS+= lzma_encoder.c \
+ lzma_encoder_presets.c \
+ lzma_encoder_optimum_fast.c \
+ lzma_encoder_optimum_normal.c \
+ fastpos_table.c \
+ lzma_decoder.c \
+ lzma2_encoder.c \
+ lzma2_decoder.c
-.PATH: ${XZSRCDIR}/src/liblzma/delta
-SRCS+= delta_common.c delta_encoder.c delta_decoder.c
+.PATH: ${LZMADIR}/rangecoder
+SRCS+= price_table.c
-.PATH: ${XZSRCDIR}/src/liblzma/lz
-SRCS+= lz_decoder.c lz_encoder.c lz_encoder_mf.c
+.PATH: ${LZMADIR}/delta
+SRCS+= delta_common.c \
+ delta_encoder.c \
+ delta_decoder.c
-.PATH: ${XZSRCDIR}/src/liblzma/lzma
-SRCS+= lzma_encoder.c lzma_encoder_presets.c \
- lzma_encoder_optimum_fast.c lzma_encoder_optimum_normal.c \
- lzma_decoder.c lzma2_encoder.c lzma2_decoder.c \
- fastpos_table.c
+.PATH: ${LZMADIR}/simple
+SRCS+= simple_coder.c \
+ simple_encoder.c \
+ simple_decoder.c \
+ x86.c \
+ powerpc.c \
+ ia64.c \
+ arm.c \
+ armthumb.c \
+ sparc.c
-.PATH: ${XZSRCDIR}/src/liblzma/rangecoder
-SRCS+= price_table.c
+.PATH: ${LZMADIR}
-.PATH: ${XZSRCDIR}/src/liblzma/simple
-SRCS+= simple_coder.c simple_encoder.c simple_decoder.c \
- arm.c armthumb.c ia64.c powerpc.c sparc.c x86.c
+VERSION_MAJOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MAJOR" {print $$3 } ' \
+ ${LZMADIR}/api/lzma/version.h
+VERSION_MINOR!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_MINOR" {print $$3 } ' \
+ ${LZMADIR}/api/lzma/version.h
+VERSION_PATCH!= awk '$$1 == "\#define" && $$2 == "LZMA_VERSION_PATCH" {print $$3 } ' \
+ ${LZMADIR}/api/lzma/version.h
-liblzma.pc: ${XZSRCDIR}/src/liblzma/liblzma.pc.in
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ${TOOL_SED} \
- -e 's, at prefix@,/usr,' \
- -e 's, at exec_prefix@,/usr,' \
- -e 's, at libdir@,/usr/lib,' \
- -e 's, at includedir@,/usr/include,' \
- -e 's, at PACKAGE_HOMEPAGE@,${XZHOMEPAGE:Q},' \
- -e 's, at PACKAGE_VERSION@,${XZVERSION:Q},' \
- -e 's, at PTHREAD_CFLAGS@ @PTHREAD_LIBS@,,' \
- < ${XZSRCDIR}/src/liblzma/liblzma.pc.in \
- > ${.TARGET}.tmp && \
- mv -f ${.TARGET}.tmp ${.TARGET}
+WARNS?= 3
+CFLAGS+= -DHAVE_CONFIG_H \
+ -DTUKLIB_SYMBOL_PREFIX=lzma_ \
+ -I${.CURDIR} \
+ -I${LZMADIR}/api \
+ -I${LZMADIR}/common \
+ -I${LZMADIR}/check \
+ -I${LZMADIR}/lz \
+ -I${LZMADIR}/rangecoder \
+ -I${LZMADIR}/lzma \
+ -I${LZMADIR}/delta \
+ -I${LZMADIR}/simple \
+ -I${LZMADIR}/../common
+
+DPADD= ${LIBPTHREAD}
+LDADD= -lpthread
+
+VERSION_DEF= ${.CURDIR}/Versions.def
+SYMBOL_MAPS= ${.CURDIR}/Symbol.map
+CFLAGS+= -DSYMBOL_VERSIONING
+
CLEANFILES+= liblzma.pc
-VERSION_DEF= ${.CURDIR}/Versions.def
-SYMBOL_MAPS= ${.CURDIR}/Symbol.map
-CFLAGS+= -DSYMBOL_VERSIONING
+FILES= liblzma.pc
+FILESDIR= ${LIBDATADIR}/pkgconfig
+liblzma.pc: liblzma.pc.in
+ 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 ; \
+ s, at PACKAGE_URL@,http://tukaani.org/xz/,g ; \
+ s, at PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \
+ s, at PTHREAD_CFLAGS@,,g ; \
+ s, at PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET}
+
.include <bsd.lib.mk>
Modified: trunk/lib/liblzma/config.h
===================================================================
--- trunk/lib/liblzma/config.h 2016-10-15 16:28:10 UTC (rev 9180)
+++ trunk/lib/liblzma/config.h 2016-10-15 16:38:36 UTC (rev 9181)
@@ -128,10 +128,11 @@
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the `futimens' function. */
-#define HAVE_FUTIMENS 1
+/* #define 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 */
More information about the Midnightbsd-cvs
mailing list