On Tue, Mar 17, 2015 at 10:02:36PM +0100, Andreas Pretzsch wrote: > If PTXCONF_ICONV is not enabled, --without-libiconv-prefix is > passed as configure option. > Currently, this is done by adding the option to GNUPG_AUTOCONF, > which causes ptxdist to abort with > ptxdist: error: ptxd_make_world_init_compat: <PKG>_AUTOCONF > is incompatible with <PKG>_CONF_OPT > > Fix this by adding it to GNUPG_CONF_OPT instead. > > Signed-off-by: Andreas Pretzsch <a...@cn-eng.de> > --- > Attn.: Tested only with ptxdist-2014.05, but as the same logic > applies in latest ptxdist, this should still work.
Thanks, applied (It's already in ptxdist-2015.03.0). Michael > > rules/gnupg.make | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rules/gnupg.make b/rules/gnupg.make > index 71e765e..67d6719 100644 > --- a/rules/gnupg.make > +++ b/rules/gnupg.make > @@ -54,7 +54,7 @@ GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > --disable-bzip2 > > ifndef PTXCONF_ICONV > -GNUPG_AUTOCONF += --without-libiconv-prefix > +GNUPG_CONF_OPT += --without-libiconv-prefix > endif > > # > ---------------------------------------------------------------------------- > -- > 2.1.3 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- 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
