[src/trunk]: src/distrib Make gzip on some crunched install media support xz ...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/48637416aef3
branches:  trunk
changeset: 836192:48637416aef3
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 01 17:50:08 2018 +0000

description:
Make gzip on some crunched install media support xz decompression
(just like our base version does).

diffstat:

 distrib/alpha/instkernel/ramdisk/list      |   4 ++--
 distrib/amd64/ramdisks/common/list.ramdisk |   4 ++--
 distrib/sparc64/instfs/list                |   4 ++--
 distrib/utils/x_gzip/Makefile              |  10 ++++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diffs (79 lines):

diff -r b51707ced69d -r 48637416aef3 distrib/alpha/instkernel/ramdisk/list
--- a/distrib/alpha/instkernel/ramdisk/list     Mon Oct 01 13:28:07 2018 +0000
+++ b/distrib/alpha/instkernel/ramdisk/list     Mon Oct 01 17:50:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.45 2014/08/02 19:35:13 martin Exp $
+#      $NetBSD: list,v 1.46 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS        bin sbin external/bsd/less/bin usr.bin usr.sbin
 
@@ -61,7 +61,7 @@
 SPECIAL        gzip            srcdir  distrib/utils/x_gzip
 SPECIAL        ping            srcdir  distrib/utils/x_ping
 
-LIBS   -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS   -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
 
 # we need the boot blocks /usr/mdec
 COPY   ${DESTDIR}/usr/mdec/boot                usr/mdec/boot
diff -r b51707ced69d -r 48637416aef3 distrib/amd64/ramdisks/common/list.ramdisk
--- a/distrib/amd64/ramdisks/common/list.ramdisk        Mon Oct 01 13:28:07 2018 +0000
+++ b/distrib/amd64/ramdisks/common/list.ramdisk        Mon Oct 01 17:50:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list.ramdisk,v 1.20 2015/10/07 14:09:04 martin Exp $
+#      $NetBSD: list.ramdisk,v 1.21 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS        external/bsd/less/bin
 SRCDIRS        bin sbin usr.bin usr.sbin libexec
@@ -66,7 +66,7 @@
 ARGVLN sh -sh
 
 # libhack.o is built by Makefile & included Makefile.inc
-LIBS   libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop
+LIBS   libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -llzma -lprop
 
 # various files that we need in /etc for the install
 COPY   ${NETBSDSRCDIR}/etc/group               etc/group
diff -r b51707ced69d -r 48637416aef3 distrib/sparc64/instfs/list
--- a/distrib/sparc64/instfs/list       Mon Oct 01 13:28:07 2018 +0000
+++ b/distrib/sparc64/instfs/list       Mon Oct 01 17:50:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: list,v 1.27 2018/09/28 15:05:23 martin Exp $
+#      $NetBSD: list,v 1.28 2018/10/01 17:50:08 martin Exp $
 
 SRCDIRS        bin sbin libexec external/bsd/less/bin usr.bin usr.sbin
 
@@ -79,7 +79,7 @@
 # SPECIAL      xz              srcdir  external/public-domain/xz/bin
 
 LIBS   libhack.o
-LIBS   -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -lprop
+LIBS   -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lpcap -lz -llzma -lprop
 
 # various files that we need in /etc for the install
 COPY   ${NETBSDSRCDIR}/etc/group               etc/group
diff -r b51707ced69d -r 48637416aef3 distrib/utils/x_gzip/Makefile
--- a/distrib/utils/x_gzip/Makefile     Mon Oct 01 13:28:07 2018 +0000
+++ b/distrib/utils/x_gzip/Makefile     Mon Oct 01 17:50:08 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2011/06/19 01:25:35 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.9 2018/10/01 17:50:08 martin Exp $
 # Build a tiny limited gzip (i.e. for tiny boot media)
 
 SRCDIR=         ${.CURDIR}/../../../usr.bin/gzip
@@ -10,10 +10,12 @@
 CPPFLAGS+=     -DNO_BZIP2_SUPPORT
 CPPFLAGS+=     -DNO_COMPRESS_SUPPORT
 CPPFLAGS+=     -DNO_PACK_SUPPORT
-CPPFLAGS+=     -DNO_XZ_SUPPORT
+CPPFLAGS+=     ${"${USE_XZ_SETS:Uno}"!="no":?:-DNO_XZ_SUPPORT}
 
-DPADD=         ${LIBZ}
-LDADD=         -lz
+# for crunched binaries this does not take effect, also check the
+# LIBS entry in the lists file
+DPADD=         ${LIBZ} ${LIBLZMA}
+LDADD=         -lz -llzma
 
 .include <bsd.prog.mk>