From patchwork Tue Mar 27 15:28:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 149160 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 18E9AB6EE6 for ; Wed, 28 Mar 2012 17:54:06 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC8AC8AB36; Wed, 28 Mar 2012 06:54:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ML2YW5x4v18d; Wed, 28 Mar 2012 06:54:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 55CCB8AA2C; Wed, 28 Mar 2012 06:54:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1C1E08F753 for ; Wed, 28 Mar 2012 06:54:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1A19DA027D for ; Wed, 28 Mar 2012 06:54:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6J9mKAZcgeXW for ; Wed, 28 Mar 2012 06:53:59 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by hemlock.osuosl.org (Postfix) with ESMTP id 75C67A01F4 for ; Wed, 28 Mar 2012 06:53:59 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 6DB7696998; Wed, 28 Mar 2012 06:53:59 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Tue, 27 Mar 2012 17:28:34 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 7a70788a2207af8ed97bbd26effaf5e461faf8af X-Git-Newrev: d0e5eb281f0e3b323ecb3446c1b16baf7f3baa69 X-Patchwork-Hint: ignore Message-Id: <20120328065359.6DB7696998@busybox.osuosl.org> Subject: [Buildroot] [git commit] libxml-parser-perl: fix host-intltool breakage when microperl is enabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net commit: http://git.buildroot.net/buildroot/commit/?id=d0e5eb281f0e3b323ecb3446c1b16baf7f3baa69 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Microperl will build host-microperl and install it into HOST_DIR/usr/bin, where other packages will pick it up as _CONFIGURE_OPTS / _MAKE_ENV prepends that to the path. libxml-parser-perl didn't though, so it would still be built against the system perl, causing host-intltool to fail when it would use host-microperl together with libxml-parser-perl if the system perl isn't compatible with host-microperl. Fix it by using HOST_CONFIGURE_OPTS and ensuring it is built after (host-)microperl if enabled. Signed-off-by: Peter Korsgaard --- package/libxml-parser-perl/libxml-parser-perl.mk | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk index 9e6f2ec..1022302 100644 --- a/package/libxml-parser-perl/libxml-parser-perl.mk +++ b/package/libxml-parser-perl/libxml-parser-perl.mk @@ -9,9 +9,15 @@ LIBXML_PARSER_PERL_SITE:=http://www.cpan.org/modules/by-module/XML/ LIBXML_PARSER_PERL_DEPENDENCIES = expat +ifeq ($(BR2_PACKAGE_MICROPERL),y) +# microperl builds host-microperl, so ensure we build after that to build +# against host-microperl instead of the system perl +LIBXML_PARSER_PERL_DEPENDENCIES += microperl +endif + define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS (cd $(@D) ; \ - perl Makefile.PL \ + $(HOST_CONFIGURE_OPTS) perl Makefile.PL \ PREFIX=$(HOST_DIR)/usr \ EXPATLIBPATH=$(HOST_DIR)/usr/lib \ EXPATINCPATH=$(HOST_DIR)/usr/include \