CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Sat Jun 2 01:40:52 UTC 2018
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
Don't warn about undefined symbols when we sanitize, since we are not linking
against the sanitizers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.8 src/external/public-domain/xz/lib/Makefile:1.9
--- src/external/public-domain/xz/lib/Makefile:1.8 Thu Jan 19 06:10:38 2017
+++ src/external/public-domain/xz/lib/Makefile Fri Jun 1 21:40:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/01/19 11:10:38 maya Exp $
+# $NetBSD: Makefile,v 1.9 2018/06/02 01:40:52 christos Exp $
.include
@@ -15,7 +15,9 @@ INCS+= base.h bcj.h block.h check.h cont
INCSDIR_lzma.h= /usr/include
INCSDIR= /usr/include/lzma
+.if ${MKSANITIZER} != "yes"
LDFLAGS+= -Wl,-z,defs
+.endif
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/common
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: maya
Date: Thu Jan 19 11:10:38 UTC 2017
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
restrict psabi warning hack to gcc, it doesn't exist in clang.
should help i386 llvm builds
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.7 src/external/public-domain/xz/lib/Makefile:1.8
--- src/external/public-domain/xz/lib/Makefile:1.7 Sat Jan 14 21:20:39 2017
+++ src/external/public-domain/xz/lib/Makefile Thu Jan 19 11:10:38 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/01/14 21:20:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2017/01/19 11:10:38 maya Exp $
.include
@@ -85,7 +85,7 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
mv -f ${.TARGET}.tmp ${.TARGET}
.if ${MACHINE_ARCH} == "i386"
-COPTS += -Wno-error=psabi
+COPTS += ${${ACTIVE_CC} == "gcc":? -Wno-error=psabi :}
.endif
CLEANFILES+= liblzma.pc
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Sat Jan 14 21:20:39 UTC 2017
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
Don't error out for psabi.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.6 src/external/public-domain/xz/lib/Makefile:1.7
--- src/external/public-domain/xz/lib/Makefile:1.6 Tue Jan 5 08:07:47 2016
+++ src/external/public-domain/xz/lib/Makefile Sat Jan 14 16:20:39 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/05 13:07:47 christos Exp $
+# $NetBSD: Makefile,v 1.7 2017/01/14 21:20:39 christos Exp $
.include
@@ -84,6 +84,10 @@ liblzma.pc: ${XZSRCDIR}/src/liblzma/libl
> ${.TARGET}.tmp && \
mv -f ${.TARGET}.tmp ${.TARGET}
+.if ${MACHINE_ARCH} == "i386"
+COPTS += -Wno-error=psabi
+.endif
+
CLEANFILES+= liblzma.pc
LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
CVS commit: src/external/public-domain/xz/lib
Module Name:src
Committed By: christos
Date: Fri Apr 17 20:12:45 UTC 2015
Modified Files:
src/external/public-domain/xz/lib: Makefile
Log Message:
there is no more lzma/lzma.h; it has been renamed to lzma/lzma12.h
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/public-domain/xz/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.4 src/external/public-domain/xz/lib/Makefile:1.5
--- src/external/public-domain/xz/lib/Makefile:1.4 Fri Apr 17 14:49:23 2015
+++ src/external/public-domain/xz/lib/Makefile Fri Apr 17 16:12:45 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/04/17 18:49:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/17 20:12:45 christos Exp $
LIB= lzma
USE_SHLIBDIR= yes
@@ -6,22 +6,12 @@ NOLINT= yes
.include bsd.init.mk
-# There are two different lzma.h files.
-# Copy public version to distinguish them.
-pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
- ${_MKTARGET_CREATE}
- rm -f ${.TARGET}
- ${TOOL_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
-
-.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
+.PATH: ${XZSRCDIR}/src/liblzma/api ${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
+ filter.h hardware.h index.h index_hash.h lzma.h lzma12.h \
+ stream_flags.h version.h vli.h
+INCSDIR_lzma.h= /usr/include
INCSDIR= /usr/include/lzma
LDFLAGS+= -Wl,-z,defs
CVS commit: src/external/public-domain/xz/lib
Module Name:src Committed By: joerg Date: Tue Nov 9 23:07:10 UTC 2010 Modified Files: src/external/public-domain/xz/lib: Makefile Log Message: Add back easy_encoder.c, lost during the final 5.0.0 update. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/public-domain/xz/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/lib/Makefile diff -u src/external/public-domain/xz/lib/Makefile:1.2 src/external/public-domain/xz/lib/Makefile:1.3 --- src/external/public-domain/xz/lib/Makefile:1.2 Tue Nov 2 19:12:48 2010 +++ src/external/public-domain/xz/lib/Makefile Tue Nov 9 23:07:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/02 19:12:48 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/11/09 23:07:09 joerg Exp $ LIB= lzma USE_SHLIBDIR= yes @@ -48,7 +48,7 @@ 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 \ + 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 \
