From owner-svn-src-head@freebsd.org Thu Feb 28 21:47:49 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3B8C151A821; Thu, 28 Feb 2019 21:47:49 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9448AE84; Thu, 28 Feb 2019 21:47:49 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id F20301352B; Thu, 28 Feb 2019 21:47:48 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf1-f44.google.com with SMTP id h10so16412476lfc.12; Thu, 28 Feb 2019 13:47:48 -0800 (PST) X-Gm-Message-State: APjAAAXBxfrgs/rB6FZiN+MwY38wK8Bs/K7NyRJ4XhSBjFYgho7WW9E6 KeArfNmlJeJqC/6KCH0MSflcP+pULECXHB0U+Y0= X-Google-Smtp-Source: APXvYqyZOBoERPFmdHtPmOy9k1J5Up6Fb9XE1VVLgLNHC4aHfSE3NkrwnTd/UdZq2aeD2xvgTFJanOckoKzMwphR9EM= X-Received: by 2002:a19:aacc:: with SMTP id t195mr944438lfe.153.1551390467465; Thu, 28 Feb 2019 13:47:47 -0800 (PST) MIME-Version: 1.0 References: <201902282048.x1SKmILE082786@repo.freebsd.org> <0EC04D65-721E-49F1-9755-7A8FDDE554DB@gmail.com> In-Reply-To: <0EC04D65-721E-49F1-9755-7A8FDDE554DB@gmail.com> From: Kyle Evans Date: Thu, 28 Feb 2019 15:47:14 -0600 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r344666 - head/tools/build/mk To: Enji Cooper Cc: Bryan Drewery , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4D9448AE84 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.974,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Feb 2019 21:47:49 -0000 On Thu, Feb 28, 2019 at 3:44 PM Enji Cooper wrote: > > > > On Feb 28, 2019, at 12:48 PM, Bryan Drewery wrote: > > > > Author: bdrewery > > Date: Thu Feb 28 20:48:18 2019 > > New Revision: 344666 > > URL: https://svnweb.freebsd.org/changeset/base/344666 > > > > Log: > > bsd.nls.mk isn't optional. > > > > It is protected by MK_NLS. If it should really be optional then > > it needs to be documented as such in share/mk/bsd.README and > > .sinclude used where needed. > > > > This fixes a regression from r335011. > > > > PR: 232527 > > Submitted by: jarrod@downtools.com.au > > Reported by: ktullavik@gmail.com > > MFC after: 3 days > > Should bsd.{lib,prog}.mk instead be taught to ignore errors when including this file? > Thanks! > -Enji If we actually conditionally installed it, sure- it was only removed because of r335011, so it would go through an install/remove dance between installworld and delete-old on WITHOUT_NLS systems. If we're going to make it conditional on MK_NLS, it needs to actually be conditional on MK_NLS the proper way along with an s/.include/.sinclude/.