cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pass PORTSDIR_PATH through to make-plist so it will be honored by

Browse Source 
update-plist; ok espie@
This commit is contained in:
naddy 2015-07-19 17:31:44 +00:00
parent 513c7a26f3
commit 626cc84e5e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infrastructure/bin/make-plist
View File

@ -1,5 +1,5 @@
#! /usr/bin/perl
# $OpenBSD: make-plist,v 1.8 2014/11/03 19:50:01 bcallah Exp $
# $OpenBSD: make-plist,v 1.9 2015/07/19 17:31:44 naddy Exp $
# Copyright (c) 2004-2008 Marc Espie <espie@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
@ -131,6 +131,7 @@ my $baseprefix=$ENV{PREFIX};
my $shared_only;
my $make = $ENV{MAKE};
my $portsdir = $ENV{PORTSDIR};
my $portsdir_path = $ENV{PORTSDIR_PATH};
sub prettify
{
@ -172,7 +173,7 @@ sub build_mtree
$stripped->{$pkgpath} = 1;
if (!defined $cached_tree->{$pkgpath}) {
$cached_tree->{$pkgpath} = {};
open my $fh, "cd $portsdir && env -i SUBDIR=$pkgpath ECHO_MSG=: $make print-plist |" or die "blech\n";
open my $fh, "cd $portsdir && env -i PORTSDIR_PATH=$portsdir_path SUBDIR=$pkgpath ECHO_MSG=: $make print-plist |" or die "blech\n";
augment_mtree($cached_tree->{$pkgpath}, $fh);
close($fh);
}

3
infrastructure/mk/bsd.port.mk
View File

@ -1,6 +1,6 @@
#-*- mode: Makefile; tab-width: 4; -*-
# ex:ts=4 sw=4 filetype=make:
# $OpenBSD: bsd.port.mk,v 1.1297 2015/06/11 09:26:01 espie Exp $
# $OpenBSD: bsd.port.mk,v 1.1298 2015/07/19 17:31:44 naddy Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@ -2452,6 +2452,7 @@ _internal-plist _internal-update-plist: _internal-fake ${_FAKESUDO_CHECK_COOKIE}
INSTALL_PRE_COOKIE=${_INSTALL_PRE_COOKIE} \
MAKE="${MAKE}" \
PORTSDIR=${PORTSDIR} \
PORTSDIR_PATH=${PORTSDIR_PATH} \
FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \
OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE} ${WRKINST}/.saved_libs' \
SHARED_ONLY="${SHARED_ONLY}" \