From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]
	ident=Debian-exim) by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <mol@pengutronix.de>) id 1Yb3Rw-0001O5-3F
	for ptxdist@pengutronix.de; Thu, 26 Mar 2015 09:47:36 +0100
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.80)
	(envelope-from <mol@pengutronix.de>) id 1Yb3Rw-0006xG-1c
	for ptxdist@pengutronix.de; Thu, 26 Mar 2015 09:47:36 +0100
Date: Thu, 26 Mar 2015 09:47:36 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20150326084736.GE3000@pengutronix.de>
References: <1426626156-24206-1-git-send-email-apr@cn-eng.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1426626156-24206-1-git-send-email-apr@cn-eng.de>
Subject: Re: [ptxdist] [PATCH] gnupg: fix build breakage if ICONV is not
 enabled
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

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