Received: by mail.netbsd.org (Postfix, from userid 605) id 3267A84EF6; Sun, 6 Jan 2019 12:51:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 93D5B84CCC for ; Sun, 6 Jan 2019 12:51:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Cmva9G6Oi8iz for ; Sun, 6 Jan 2019 12:51:46 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id E5F3B84D9E for ; Sun, 6 Jan 2019 12:51:45 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DA713FB16; Sun, 6 Jan 2019 12:51:45 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154677910576660" MIME-Version: 1.0 Date: Sun, 6 Jan 2019 12:51:45 +0000 From: "Benny Siegert" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190106125145.DA713FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154677910576660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Sun Jan 6 12:51:45 UTC 2019 Modified Files: pkgsrc/mk: bsd.prefs.mk Log Message: bsd.prefs.mk: set OS_VARIANT=Microsoft if used under WSL. WSL is Windows Services for Linux, aka "bash on Ubuntu on Windows". Some packages need to differentiate plain Linux and running on WSL. Patch from David Weller-Fahy via PR pkg/53806. To generate a diff of this commit: cvs rdiff -u -r1.402 -r1.403 pkgsrc/mk/bsd.prefs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154677910576660 Content-Disposition: inline Content-Length: 836 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/bsd.prefs.mk diff -u pkgsrc/mk/bsd.prefs.mk:1.402 pkgsrc/mk/bsd.prefs.mk:1.403 --- pkgsrc/mk/bsd.prefs.mk:1.402 Mon Nov 12 14:22:58 2018 +++ pkgsrc/mk/bsd.prefs.mk Sun Jan 6 12:51:45 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.402 2018/11/12 14:22:58 jperkin Exp $ +# $NetBSD: bsd.prefs.mk,v 1.403 2019/01/06 12:51:45 bsiegert Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -226,7 +226,11 @@ LOWER_VENDOR?= chromeos LOWER_VENDOR?= pc . endif LOWER_VENDOR?= unknown +OS_VARIANT!= ${UNAME} -r +OS_VARIANT:= ${OS_VARIANT:C/^.*-//} +. if ${OS_VARIANT} != "Microsoft" OS_VARIANT= ${LOWER_VENDOR} +. endif . if !defined(HOST_MACHINE_ARCH) HOST_MACHINE_ARCH!= ${UNAME} -m MAKEFLAGS+= HOST_MACHINE_ARCH=${HOST_MACHINE_ARCH:Q} --_----------=_154677910576660--