From owner-svn-ports-head@freebsd.org Thu Nov 7 06:07:38 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7D3C31A862D; Thu, 7 Nov 2019 06:07:38 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 477tGy13gbz48hH; Thu, 7 Nov 2019 06:07:37 +0000 (UTC) (envelope-from 6yearold@gmail.com) Received: by mail-pg1-f177.google.com with SMTP id f19so1218014pgk.11; Wed, 06 Nov 2019 22:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=/erKdCVUjIay5qO5W8eVjyO75UHE2KACRQkktJBhJDM=; b=pofUmTeUp0eqcQZIkVzU2wBrHbg7/G9gkL6BCcXM+K2ySFhlEi+ov5ig/dDUHKFy5b mz8jgMeWTP8v9Eq8cfzKGd+7mr6GIW6ITVVtGYXv7CkKfHk5ZPvwZCr7JrkSqSrOQ2Em q/CpEwDSETVwrxsfVaHUPwKOw5tkaVdS3Lje+hrNtMFPTBwFFG1BGwZv4Co/NCKcjWA2 LAofIqidQU3IBOKBnxLkLQTd6R5Tqb1RXZShpSVJ0S/f1ROuKK9YjgxFU3F5XQME4Goz V7nHcREgL4dSBZvNPBnWUHX4BgVJljQU2j7uISpHJPcY7QGdIiKjlHEAE9lbLTw7knKZ N3ZQ== X-Gm-Message-State: APjAAAXnsAT34xk8WbFraRMOj0c7fTYdWuCPed+y+eIv9yR2JTzjop6i 7ByXazE+UxhV6doQzY7cMO3BYa0XjRo= X-Google-Smtp-Source: APXvYqwqwZ4k1NrgFkNmaLN1A22G9yMyWkuo5QQGMFcV8HwIp+4Y54VOfWbAOkw4DV9WACTREeA/Zg== X-Received: by 2002:aa7:8e1a:: with SMTP id c26mr1816626pfr.151.1573106855313; Wed, 06 Nov 2019 22:07:35 -0800 (PST) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com. [209.85.214.181]) by smtp.gmail.com with ESMTPSA id e17sm1028200pfh.121.2019.11.06.22.07.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Nov 2019 22:07:34 -0800 (PST) Received: by mail-pl1-f181.google.com with SMTP id ay6so719054plb.0; Wed, 06 Nov 2019 22:07:34 -0800 (PST) X-Received: by 2002:a17:902:b08b:: with SMTP id p11mr1905527plr.57.1573106854024; Wed, 06 Nov 2019 22:07:34 -0800 (PST) MIME-Version: 1.0 References: <201911061902.xA6J2hV6031987@repo.freebsd.org> In-Reply-To: <201911061902.xA6J2hV6031987@repo.freebsd.org> From: Gleb Popov Date: Thu, 7 Nov 2019 10:07:08 +0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r516921 - head/Mk/Uses To: Niclas Zeising Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-Rspamd-Queue-Id: 477tGy13gbz48hH X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Nov 2019 06:07:38 -0000 On Wed, Nov 6, 2019 at 11:02 PM Niclas Zeising wrote: > Author: zeising > Date: Wed Nov 6 19:02:42 2019 > New Revision: 516921 > URL: https://svnweb.freebsd.org/changeset/ports/516921 > > Log: > Mk/Uses: Add USES+=xorg when including xorg.mk > > Add USES+=xorg to the places where MK/Uses/xorg.mk is included from > other > files in the Uses infrastructure. This is done to silence an erroneous > warning about USES=xorg not being set when using USES=gl, motif or > xorg-cat, > even when it's included from the framework. > > This is a different proposal than what was originally suggested in pr > 241627 > and https://reviews.freebsd.org/D22210 . > > PR: 238988, 241627 > Discussed with: mat > MFH: 2019Q4 > Differential Revision: https://reviews.freebsd.org/D22210 > > Modified: > head/Mk/Uses/gl.mk > head/Mk/Uses/motif.mk > head/Mk/Uses/xorg-cat.mk > > Modified: head/Mk/Uses/gl.mk > > ============================================================================== > --- head/Mk/Uses/gl.mk Wed Nov 6 18:58:04 2019 (r516920) > +++ head/Mk/Uses/gl.mk Wed Nov 6 19:02:42 2019 (r516921) > @@ -47,6 +47,7 @@ LIB_DEPENDS+= ${_GL_${_component}_LIB_DEPENDS} > > # We only need USES=xorg if we want USE_XORG modules > .if defined(USE_XORG) && !empty(USE_XORG) > +USES+= xorg > .include "${USESDIR}/xorg.mk" > .endif > > > Modified: head/Mk/Uses/motif.mk > > ============================================================================== > --- head/Mk/Uses/motif.mk Wed Nov 6 18:58:04 2019 (r516920) > +++ head/Mk/Uses/motif.mk Wed Nov 6 19:02:42 2019 (r516921) > @@ -29,6 +29,7 @@ MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" > > # We only need USES=xorg if we want USE_XORG modules > .if defined(USE_XORG) && !empty(USE_XORG) > +USES+= xorg > .include "${USESDIR}/xorg.mk" > .endif > > > Modified: head/Mk/Uses/xorg-cat.mk > > ============================================================================== > --- head/Mk/Uses/xorg-cat.mk Wed Nov 6 18:58:04 2019 (r516920) > +++ head/Mk/Uses/xorg-cat.mk Wed Nov 6 19:02:42 2019 (r516921) > @@ -179,6 +179,7 @@ USE_XORG+= fontutil > > # We only need USES=xorg if we want USE_XORG modules > . if defined(USE_XORG) && !empty(USE_XORG) > +USES+= xorg > .include "${USESDIR}/xorg.mk" > . endif > > I've been told that one can't employ USES inside the "framework". See cabal.mk how I included iconv there.