Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/x_gzip include bsd.own.mk to ensure that USE_X...
details: https://anonhg.NetBSD.org/src/rev/573ee2896c33
branches: trunk
changeset: 368411:573ee2896c33
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jul 10 04:01:07 2022 +0000
description:
include bsd.own.mk to ensure that USE_XZ_SETS is set properly before using it.
this should fix PR#56919.
diffstat:
distrib/utils/x_gzip/Makefile | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r 5df49cf743d4 -r 573ee2896c33 distrib/utils/x_gzip/Makefile
--- a/distrib/utils/x_gzip/Makefile Sat Jul 09 21:19:44 2022 +0000
+++ b/distrib/utils/x_gzip/Makefile Sun Jul 10 04:01:07 2022 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2020/06/03 07:06:18 rin Exp $
+# $NetBSD: Makefile,v 1.12 2022/07/10 04:01:07 mrg Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
+.include <bsd.own.mk>
+
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
PROG= gzip
@@ -11,15 +13,17 @@
CPPFLAGS+= -DNO_COMPRESS_SUPPORT
CPPFLAGS+= -DNO_PACK_SUPPORT
CPPFLAGS+= -DNO_LZ_SUPPORT
-CPPFLAGS+= ${"${USE_XZ_SETS:Uno}"!="no":?:-DNO_XZ_SUPPORT}
# for crunched binaries this does not take effect, also check the
# LIBS entry in the lists file
DPADD= ${LIBZ}
LDADD= -lz
+
.if ${USE_XZ_SETS:Uno} != "no"
DPADD+= ${LIBLZMA}
LDADD+= -llzma
+.else
+CPPFLAGS+= -DNO_XZ_SUPPORT
.endif
.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index