Re: [ptxdist] [PATCH 1/2] add scons conf tool

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Nov 15, 2019 at 08:19:24PM +0100, Ladislav Michl wrote:
> 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 <PKG>_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?

Compiling should happen in the compile stage. Otherwise, thinks like
parallel building does not work correctly. It does not work correctly yet
for scons because I need to sanitize the parallel building options for
non-make tools, but that's on my todo list.

And I looked at gpsd. Scons is not the reason why stuff is rebuild during
install: There is a header that is recreated every time scons is called
:-/.

> > anyways do no need to use it for a new conf tool.
> > <PKG>_MAKE_ENV was introduced exactly to share the same environment for
> > compile and install.
> 
> Besides, some space instead tab sneaked in:

Right, that should be fixed. I'll handle it.

Michael

> 
> 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
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de