Module Name: src
Committed By: mrg
Date: Sun Jul 10 04:01:07 UTC 2022
Modified Files:
src/distrib/utils/x_gzip: Makefile
Log Message:
include bsd.own.mk to ensure that USE_XZ_SETS is set properly before using it.
this should fix PR#56919.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.11 src/distrib/utils/x_gzip/Makefile:1.12
--- src/distrib/utils/x_gzip/Makefile:1.11 Wed Jun 3 07:06:18 2020
+++ src/distrib/utils/x_gzip/Makefile Sun Jul 10 04:01:07 2022
@@ -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_BZIP2_SUPPORT
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>
