From owner-svn-src-all@FreeBSD.ORG Wed Oct 1 15:06:11 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F24BE22 for ; Wed, 1 Oct 2014 15:06:11 +0000 (UTC) Received: from mail-qg0-f47.google.com (mail-qg0-f47.google.com [209.85.192.47]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 60BB033B for ; Wed, 1 Oct 2014 15:06:11 +0000 (UTC) Received: by mail-qg0-f47.google.com with SMTP id i50so384220qgf.20 for ; Wed, 01 Oct 2014 08:06:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=hTHPjtoyQ2xgSQgXtvKW170kINj/aBb46w8Wtv5In1Q=; b=j31P++ayYMoGp/C5O23cyg3KfgsQNihrIm4mEqT/AqQUDT5tcZoG6OH4wGHccREOSs OydDD7gLSjCktiy0rhInH4wjptr2LfSnDgJm928xFcL5zhNTddyd8+WrX2Zbpje7b8p+ +0JDdEhDS+05NOeaaE772D0t4Tb0lfCgIjzkaoZX2tTu+7TPVyTsw1Gyc7krDfl+TI5K 9di52FxPRlEHH8qwJNdSLOiesZyckiH9rH+oLT7ftPamoNyONBWAB5xbo+fCvptisVhO HvyMkekaaT95JYu5qG/eUJLs50GBTkYTrSadOknddsehHd2duZb9xBKKaSr57Jdm3KwP Uebg== X-Gm-Message-State: ALoCoQnfKBo/4Hg2z6kN/qgMYugVCzkoylNrWZCIBi2a40nwEtUG2ufmSBde5ExDWEPnVRMjf1Gi MIME-Version: 1.0 X-Received: by 10.224.127.131 with SMTP id g3mr32389843qas.81.1412175964498; Wed, 01 Oct 2014 08:06:04 -0700 (PDT) Received: by 10.140.31.36 with HTTP; Wed, 1 Oct 2014 08:06:04 -0700 (PDT) In-Reply-To: <542C14F6.7020506@FreeBSD.org> References: <201409291505.s8TF5Nhh066884@svn.freebsd.org> <542C14F6.7020506@FreeBSD.org> Date: Wed, 1 Oct 2014 09:06:04 -0600 Message-ID: Subject: Re: svn commit: r272282 - head/share/mk From: Will Andrews To: Guido Falsi Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, "src-committers@FreeBSD.org" , Baptiste Daroussin X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Oct 2014 15:06:11 -0000 If r272363 doesn't resolve the issue for you, let me know. Thanks! --Will. On Wed, Oct 1, 2014 at 8:51 AM, Guido Falsi wrote: > On 09/29/14 17:05, Will Andrews wrote: >> Author: will >> Date: Mon Sep 29 15:05:23 2014 >> New Revision: 272282 >> URL: http://svnweb.freebsd.org/changeset/base/272282 >> >> Log: >> Search for the nearest PORTSDIR where Mk/bsd.ports.mk exists, from .CURDIR. >> This will only take effect if PORTSDIR is not set, as previously supported. >> >> Use .if exists(), for four specific possibilities relative to .CURDIR: >> ., .., ../.., and ../../.. The fourth possibility is primarily in case >> ports ever grows a third level. If none of these paths exist, fall back to >> the old default of /usr/ports. >> >> This removes the need to set PORTSDIR explicitly (or via wrapper script) if >> one is running out of a ports tree that is not in /usr/ports, but in a >> home directory. >> >> Reviewed by: bapt, bdrewery (older version) >> CR: D799 >> MFC after: 1 week >> Sponsored by: Spectra Logic >> > > Hi, > > I just refreshed my machines head r272349 and this change is creating > problems to me. > > Maybe I've always been doing something wrong but this is what is happening: > > root@marvin:~ [0]# cd /usr/ports/x11/nvidia-driver > root@marvin:/usr/ports/x11/nvidia-driver [0]# make -V PORTSDIR > /usr/ports/x11/nvidia-driver/../.. > > this is problematic since now all dependencies are relative paths, this > is said to be unsupported in bsd.sanity.mk, line 35 and following ones. > > It also makes poudriere builds fail: > > root@marvin:~ [0]# poudriere bulk -C -p mptest -t -j 11amd64 x11/xlogo > ====>> Creating the reference jail... done > ====>> Mounting system devices for 11amd64-mptest > ====>> Mounting ports/packages/distfiles > ====>> Mounting packages from: /poudriere/data/packages/11amd64-mptest > ====>> Logs: /poudriere/data/logs/bulk/11amd64-mptest/2014-10-01_16h44m56s > ====>> WWW: > http://pkg.madpilot.net:8888/logs/bulk/11amd64-mptest/2014-10-01_16h44m56s > ====>> Appending to make.conf: /usr/local/etc/poudriere.d/make.conf > ====>> DEVELOPER=yes ignored from make.conf. Use 'bulk -t' or 'testport' > for testing instead. > /etc/resolv.conf -> /poudriere/data/build/11amd64-mptest/ref/etc/resolv.conf > ====>> Starting jail 11amd64-mptest > ====>> Loading MOVED > ====>> Calculating ports order and dependencies > ====>> Error: Duplicated origin for pkgconf-0.9.7: > devel/xorg-macros/../../devel/pkgconf AND x11/xlogo/../../devel/pkgconf. > Rerun with -vv to see which ports are depending on these. > ====>> Cleaning up > ====>> Umounting file systems > > (the ports nvidia-driver and xlogo in these small logs are taken at random) > > It also completely breaks portmaster. > > Maybe this patch is excessive and should first try to discover if we > already are in the standard /usr/ports subtree? > > I have not tried but I'm quite confident I can :fix: this by adding > PORTSTREE=/usr/ports in /etc/make.conf, but this does not look like a > good solution. > > -- > Guido Falsi