From owner-svn-ports-head@FreeBSD.ORG Fri Oct 24 22:32:38 2014 Return-Path: Delivered-To: svn-ports-head@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 51C3FF1; Fri, 24 Oct 2014 22:32:38 +0000 (UTC) Received: from mail-yh0-x236.google.com (mail-yh0-x236.google.com [IPv6:2607:f8b0:4002:c01::236]) (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 DD4C48F8; Fri, 24 Oct 2014 22:32:37 +0000 (UTC) Received: by mail-yh0-f54.google.com with SMTP id 29so1908829yhl.13 for ; Fri, 24 Oct 2014 15:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=hocs99SmJix/mcVfEuxGVp3k3vEdCSGkQrCktaMO/Ys=; b=octku5XW98tZM9/JltWx35hhKF/RnkNqsLEWnFo19/bvz20yDmCmTsYle+rZhrvxA9 s22En8IkeNtEgvdiseT45nk7XJpIV9RwYDy1N4ZgydDAu7tkK4wa6tbQwfp0JgjsNf5K XnThf+/Ofd29HA/Bq+x2Il7dQ58UPax/slxOk/bt+pu+G21v/n5Cwo4Y1gfjM9J9A0Nu M9HzL5SVehLFEQK3NOsuzXRq0i4Wb6fp8v+semSi1pZCFQFwQiViVBbMO/hnagNe4ihR oxIQEswT98q1NKWxxSZjVHFYLJvCfy6fT7kwc9YsNY1QdaPN5inai9CiorXbWkbBYb8O 8h4Q== MIME-Version: 1.0 X-Received: by 10.236.74.199 with SMTP id x47mr8076643yhd.180.1414189956991; Fri, 24 Oct 2014 15:32:36 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.170.207.73 with HTTP; Fri, 24 Oct 2014 15:32:36 -0700 (PDT) In-Reply-To: <201410241610.s9OGAf52099898@svn.freebsd.org> References: <201410241610.s9OGAf52099898@svn.freebsd.org> Date: Sat, 25 Oct 2014 00:32:36 +0200 X-Google-Sender-Auth: 6g0tniIHVjnxKqHHNKgKkcx_Q7I Message-ID: Subject: Re: svn commit: r371447 - head/Mk/Uses From: Antoine Brodin To: Marcus von Appen Content-Type: text/plain; charset=UTF-8 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 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: Fri, 24 Oct 2014 22:32:38 -0000 On Fri, Oct 24, 2014 at 6:10 PM, Marcus von Appen wrote: > Author: mva > Date: Fri Oct 24 16:10:40 2014 > New Revision: 371447 > URL: https://svnweb.freebsd.org/changeset/ports/371447 > QAT: https://qat.redports.org/buildarchive/r371447/ > > Log: > - Use the proper python version value within a single port build > > If a port requests a different python version from the one being the > default or provided at the command line, certain directories as well > as plist entries will use the wrong python version value (the one > being the default or provided at the command line), instead of > the value, the port requests > > Differential Revision: https://reviews.freebsd.org/D963 > With hat: python@ > > Modified: > head/Mk/Uses/python.mk Hi, I reverted for now as it breaks some ports. Cheers, Antoine > > Modified: head/Mk/Uses/python.mk > ============================================================================== > --- head/Mk/Uses/python.mk Fri Oct 24 16:02:32 2014 (r371446) > +++ head/Mk/Uses/python.mk Fri Oct 24 16:10:40 2014 (r371447) > @@ -448,6 +448,16 @@ IGNORE= needs an unsupported version of > PYTHON_VERSION?= python${_PYTHON_VERSION} > DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION} > > +# NOTE: > +# > +# PYTHON_VERSION will hold whatever is passed down the dependency chain. > +# If a user runs `make PYTHON_VERSION=python3.3, PYTHON_VERSION will be > +# set to 'python3.3'. A port however may require a different version, > +# which is stored (above) in _PYTHON_VERSION. > +# Every python bit below hence should use python${_PYTHON_VERSION}, since > +# this is the value, the _port_ requires > +# > + > # Got the correct python version, set some publicly accessible variables > PYTHON_VER= ${_PYTHON_VERSION} > PYTHON_SUFFIX= ${_PYTHON_VERSION:S/.//g} > @@ -467,8 +477,8 @@ PYTHON_ABIVER!= ${PYTHON_CMD}-config -- > PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print(sys.prefix)' \ > 2> /dev/null || ${ECHO_CMD} ${LOCALBASE}) | ${TAIL} -1 > > -PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION}${PYTHON_ABIVER} > -PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} > +PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/python${_PYTHON_VERSION}${PYTHON_ABIVER} > +PYTHON_LIBDIR= ${PYTHONBASE}/lib/python${_PYTHON_VERSION} > PYTHON_PLATFORM= ${OPSYS:tl}${OSREL:C/\.[0-9.]*//} > PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages > PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}- > @@ -626,7 +636,7 @@ PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPR > PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \ > PYTHON_PLATFORM=${PYTHON_PLATFORM} \ > PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \ > - PYTHON_VERSION=${PYTHON_VERSION} \ > + PYTHON_VERSION=${_PYTHON_VERSION} \ > PYTHON_VER=${PYTHON_VER} > > _USES_POST+= python >