From 2a19134ff8d42b5f78cb20e08830039a99cc5afb Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 6 Nov 2013 13:12:50 +0000 Subject: Add `xz' command as a TOOL. --- mk/tools/defaults.mk | 3 ++- mk/tools/replace.mk | 23 +++++++++++++---------- mk/tools/tools.Cygwin.mk | 3 ++- mk/tools/tools.DragonFly.mk | 3 ++- mk/tools/tools.FreeBSD.mk | 5 ++++- mk/tools/tools.GNUkFreeBSD.mk | 3 ++- mk/tools/tools.Haiku.mk | 5 ++++- mk/tools/tools.Linux.mk | 5 ++++- mk/tools/tools.NetBSD.mk | 5 ++++- 9 files changed, 37 insertions(+), 18 deletions(-) (limited to 'mk') diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk index 6fd5b7c1f20..c036e7771c1 100644 --- a/mk/tools/defaults.mk +++ b/mk/tools/defaults.mk @@ -1,4 +1,4 @@ -# $NetBSD: defaults.mk,v 1.58 2012/10/01 10:45:16 ryoon Exp $ +# $NetBSD: defaults.mk,v 1.59 2013/11/06 13:12:50 obache Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -146,6 +146,7 @@ _TOOLS_VARNAME.wc= WC _TOOLS_VARNAME.wish= WISH _TOOLS_VARNAME.xargs= XARGS _TOOLS_VARNAME.xmkmf= XMKMF_CMD +_TOOLS_VARNAME.xzcat= XZ _TOOLS_VARNAME.xzcat= XZCAT _TOOLS_VARNAME.yacc= YACC diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 9fb01140b5f..4d9746984ba 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.262 2013/09/12 10:48:51 jperkin Exp $ +# $NetBSD: replace.mk,v 1.263 2013/11/06 13:12:50 obache Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -867,16 +867,19 @@ TOOLS_ARGS.xargs= -r # don't run command if stdin is empty . endif .endif -.if !defined(TOOLS_IGNORE.xzcat) && !empty(_USE_TOOLS:Mxzcat) -. if !empty(PKGPATH:Marchivers/xz) -MAKEFLAGS+= TOOLS_IGNORE.xzcat= -. elif !empty(_TOOLS_USE_PKGSRC.xzcat:M[yY][eE][sS]) -TOOLS_DEPENDS.xzcat?= xz>=4.999.9betanb1:../../archivers/xz -TOOLS_CREATE+= xzcat -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.xzcat=xzcat -TOOLS_PATH.xzcat= ${TOOLS_PREFIX.xzcat}/bin/xzcat +_TOOLS.xz= xz xzcat +.for _t_ in ${_TOOLS.xz} +. if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) +. if !empty(PKGPATH:Marchivers/xz) +MAKEFLAGS+= TOOLS_IGNORE.${_t_}= +. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) +TOOLS_DEPENDS.${_t_}?= xz>=4.999.9betanb1:../../archivers/xz +TOOLS_CREATE+= ${_t_} +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=xz +TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} +. endif . endif -.endif +.endfor .if !defined(TOOLS_IGNORE.yacc) && !empty(_USE_TOOLS:Myacc) . if !empty(PKGPATH:Mdevel/bison) diff --git a/mk/tools/tools.Cygwin.mk b/mk/tools/tools.Cygwin.mk index 6d46415f71d..b9a4c2c4f3b 100644 --- a/mk/tools/tools.Cygwin.mk +++ b/mk/tools/tools.Cygwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Cygwin.mk,v 1.4 2013/08/24 11:30:44 obache Exp $ +# $NetBSD: tools.Cygwin.mk,v 1.5 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the Cygwin operating system. @@ -139,6 +139,7 @@ TOOLS_PLATFORM.xargs?= /bin/xargs -r .if exists(/bin/xgettext) TOOLS_PLATFORM.xgettext?= /bin/xgettext .endif +TOOLS_PLATFORM.xzcat?= /bin/xz TOOLS_PLATFORM.xzcat?= /bin/xzcat .if exists(/bin/yacc) TOOLS_PLATFORM.yacc?= /bin/yacc diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk index 898ab0faf7d..0b9dcb44d27 100644 --- a/mk/tools/tools.DragonFly.mk +++ b/mk/tools/tools.DragonFly.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.DragonFly.mk,v 1.39 2013/08/24 11:30:44 obache Exp $ +# $NetBSD: tools.DragonFly.mk,v 1.40 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the DragonFly operating system. @@ -92,5 +92,6 @@ TOOLS_PLATFORM.true?= /usr/bin/true TOOLS_PLATFORM.tsort?= /usr/bin/tsort TOOLS_PLATFORM.wc?= /usr/bin/wc TOOLS_PLATFORM.xargs?= /usr/bin/xargs +TOOLS_PLATFORM.xz?= /usr/bin/xz TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat TOOLS_PLATFORM.yacc?= /usr/bin/yacc diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk index 6f23503b5d1..f1d7ec49b4e 100644 --- a/mk/tools/tools.FreeBSD.mk +++ b/mk/tools/tools.FreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.FreeBSD.mk,v 1.37 2013/08/24 11:30:44 obache Exp $ +# $NetBSD: tools.FreeBSD.mk,v 1.38 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the FreeBSD operating system. @@ -86,6 +86,9 @@ TOOLS_PLATFORM.true?= true # shell builtin TOOLS_PLATFORM.tsort?= /usr/bin/tsort TOOLS_PLATFORM.wc?= /usr/bin/wc TOOLS_PLATFORM.xargs?= /usr/bin/xargs +.if exists(/usr/bin/xz) +TOOLS_PLATFORM.xz?= /usr/bin/xz +.endif .if exists(/usr/bin/xzcat) TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat .endif diff --git a/mk/tools/tools.GNUkFreeBSD.mk b/mk/tools/tools.GNUkFreeBSD.mk index bb4b9b1f830..99ebd9ee962 100644 --- a/mk/tools/tools.GNUkFreeBSD.mk +++ b/mk/tools/tools.GNUkFreeBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.GNUkFreeBSD.mk,v 1.1 2013/07/26 09:38:15 ryoon Exp $ +# $NetBSD: tools.GNUkFreeBSD.mk,v 1.2 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the Debian GNU/kFreeBSD operating system. @@ -83,4 +83,5 @@ TOOLS_PLATFORM.true?= true # shell builtin TOOLS_PLATFORM.tsort?= /usr/bin/tsort TOOLS_PLATFORM.wc?= /usr/bin/wc TOOLS_PLATFORM.xargs?= /usr/bin/xargs -r +TOOLS_PLATFORM.xz?= /usr/bin/xz TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat diff --git a/mk/tools/tools.Haiku.mk b/mk/tools/tools.Haiku.mk index 274847db504..4b5794a96bb 100644 --- a/mk/tools/tools.Haiku.mk +++ b/mk/tools/tools.Haiku.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Haiku.mk,v 1.9 2013/08/24 11:30:44 obache Exp $ +# $NetBSD: tools.Haiku.mk,v 1.10 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the Haiku operating system. @@ -119,6 +119,9 @@ TOOLS_PLATFORM.tsort?= /bin/tsort TOOLS_PLATFORM.wc?= /bin/wc TOOLS_PLATFORM.xargs?= /bin/xargs -r #TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext +.if exists(/boot/common/bin/xz) +TOOLS_PLATFORM.xz?= /boot/common/bin/xz +.endif .if exists(/boot/common/bin/xzcat) TOOLS_PLATFORM.xzcat?= /boot/common/bin/xzcat .endif diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk index 36b7e4c753c..699db4914f5 100644 --- a/mk/tools/tools.Linux.mk +++ b/mk/tools/tools.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.Linux.mk,v 1.51 2013/08/24 10:12:52 tron Exp $ +# $NetBSD: tools.Linux.mk,v 1.52 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the Linux operating system. @@ -246,6 +246,9 @@ TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext .if exists(/usr/bin/yacc) TOOLS_PLATFORM.yacc?= /usr/bin/yacc .endif +.if exists(/usr/bin/xz) +TOOLS_PLATFORM.xz?= /usr/bin/xz +.endif .if exists(/usr/bin/xzcat) TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat .endif diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk index 6c6f3cde0e3..9b3daf0cdb9 100644 --- a/mk/tools/tools.NetBSD.mk +++ b/mk/tools/tools.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: tools.NetBSD.mk,v 1.48 2013/08/18 11:45:33 tron Exp $ +# $NetBSD: tools.NetBSD.mk,v 1.49 2013/11/06 13:12:50 obache Exp $ # # System-supplied tools for the NetBSD operating system. @@ -121,6 +121,9 @@ TOOLS_PLATFORM.xargs?= /usr/bin/xargs .if exists(/usr/bin/xgettext) TOOLS_PLATFORM.xgettext?= /usr/bin/xgettext .endif +.if exists(/usr/bin/xz) +TOOLS_PLATFORM.xz?= /usr/bin/xz +.endif .if exists(/usr/bin/xzcat) TOOLS_PLATFORM.xzcat?= /usr/bin/xzcat .endif -- cgit v1.2.3