Re: [ptxdist] [ANNOUNCE] PTXdist 2012.01.0 released

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

Hi,

On Tue, Jan 10, 2012 at 01:36:57PM +0100, Alexander Dahl wrote:
> Am 07.01.2012 23:46, schrieb Michael Olbrich:
> > Robert Schwebel (10):
> >       host-libffi: added
> 
> This seems to make problems over here. After migrating from ptxdist
> 2011.12.0 the related entries in my config are:
> 
>   % grep -i ffi configs/ptxconfig
>   PTXCONF_HOST_LIBFFI=m
>   PTXCONF_LIBFFI=m
> 
> In the menu I see:
> 
>   Selected by: PYGOBJECT [=n] || JAMVM [=n] && JAMVM_USE_LIBFFI [=n] ||
> GLIB [=m]
> 
> GLIB is selected by: MC [=m] (nothing else) and midnight commander
> itself is set to <M> because it is used or not in some collections I
> work with.
> 
> Running `ptxdist go` with mc not set in the collection I get the
> following error:
> 
>   ---------------------------
>   target: libffi-3.0.9.tar.gz
>   ---------------------------
>   
>   
>   error: empty parameter to 'ptxd_make_get'
>   
>   make: ***
> [/home/adahl/mnt/bagend-isys/Downloads/ptxdist_src_archive/libffi-3.0.9.tar.gz]
> Error 1

Ugly. The problem this:host-glib and host-libffi are not in
PTX_PACKAGES_SELECTED. This means that the mapping in
rules/post/ptxd_make_world_get.make is not applied for these packages.
However, PTXCONF_HOST_GLIB and PTXCONF_HOST_LIBFFI are still set to 'm'.
This means in rules/host-glib.make the following will still generate a
dependency:
--------------------------------------------------------
ifdef PTXCONF_HOST_GLIB
$(STATEDIR)/autogen-tools: $(STATEDIR)/host-glib.install.post
endif
--------------------------------------------------------
And with host-glib depending on host-libffi this results the this error...

I think the correct fix is to unset 'PTXCONF_*=m'. This patch should help,
but I'm not sure if there are any other side effects. Maybe we need to
handle this earlier.
Marc: what do you think?
--------------------------------------------------------
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make
index 35c2c27..ac18beb 100644
--- a/rules/other/Toplevel.make
+++ b/rules/other/Toplevel.make
@@ -28,6 +28,7 @@ include $(PTXDIST_PTXCONFIG)
 ifneq ($(wildcard $(PTXDIST_COLLECTIONCONFIG)),)
 include $(PTXDIST_COLLECTIONCONFIG)
 PTX_COLLECTION := y
+$(foreach var,$(filter PTXCONF_%,$(.VARIABLES)),$(if $(filter-out m,$($(var))),,$(eval $(var):=)))
 endif
 
 # ----------------------------------------------------------------------------
--------------------------------------------------------

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de