From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from eddie.linux-mips.org ([148.251.95.138] helo=cvs.linux-mips.org) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1iVh7w-0003lE-09 for ptxdist@pengutronix.de; Fri, 15 Nov 2019 20:19:28 +0100 Received: (from localhost user: 'ladis' uid#1021 fake: STDIN (ladis@eddie.linux-mips.org)) by eddie.linux-mips.org id S23993088AbfKOTT0Zp9X0 (ORCPT ); Fri, 15 Nov 2019 20:19:26 +0100 Date: Fri, 15 Nov 2019 20:19:24 +0100 From: Ladislav Michl Message-ID: <20191115191924.GA22406@lenoch> References: <20191025073326.GB26830@lenoch> <20191025073426.GC26830@lenoch> <20191025075559.GF30823@pengutronix.de> <20191025230928.GA30150@lenoch> <20191027063051.ai6l5hq57j2czfk3@pengutronix.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191027063051.ai6l5hq57j2czfk3@pengutronix.de> Subject: Re: [ptxdist] [PATCH 1/2] add scons conf tool List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Hi Michael, On Sun, Oct 27, 2019 at 07:30:51AM +0100, Michael Olbrich wrote: > On Sat, Oct 26, 2019 at 01:09:28AM +0200, Ladislav Michl wrote: > > On Fri, Oct 25, 2019 at 09:55:59AM +0200, Michael Olbrich wrote: > > > > diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh > > > > index c7093250d..5da79cace 100644 > > > > --- a/scripts/lib/ptxd_make_world_compile.sh > > > > +++ b/scripts/lib/ptxd_make_world_compile.sh > > > > @@ -37,6 +37,14 @@ ptxd_make_world_compile() { > > > > "${pkg_make_opt}" \ > > > > "${pkg_make_par}" > > > > ;; > > > > + scons) > > > > + ptxd_eval \ > > > > + "${pkg_path}" \ > > > > + "${pkg_env}" \ > > > > + "${pkg_conf_env}" \ > > > > > > No, don't use pkg_conf_env here. Take a look at what python is doing in > > > ptxd_make_world_init() > > > Otherwise, setting _MAKE_ENV in the package has no Effekt. > > > > See quick attempt bellow. Problem with SCons is that install stage > > has to be called with exactly the same env as build stage, otherwise > > package is rebuild. Alternatively we can leave everything to install > > stage. > > This looks good. Or maybe just drop pkg_install_env. It's deprecated Seems patch was modified to run scons at compile stage as well. What is the justification of such a change? > anyways do no need to use it for a new conf tool. > _MAKE_ENV was introduced exactly to share the same environment for > compile and install. Besides, some space instead tab sneaked in: diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh index 07cdd9330..f55786fb6 100644 --- a/scripts/lib/ptxd_make_world_compile.sh +++ b/scripts/lib/ptxd_make_world_compile.sh @@ -43,7 +43,7 @@ ptxd_make_world_compile() { "${pkg_env}" \ "${pkg_make_env}" \ scons -C "${pkg_build_dir}" \ - "${pkg_make_opt}" + "${pkg_make_opt}" ;; *) ptxd_eval \ diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index a7ae6cd95..5fb606a2e 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -105,7 +105,7 @@ ptxd_make_world_install() { "${pkg_make_env}" \ scons \ -C "${pkg_build_dir}" \ - "${pkg_make_opt}" \ + "${pkg_make_opt}" \ "${pkg_install_opt}" \ ) ;; _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de