From patchwork Thu Nov 1 10:42:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Esben Haabendal X-Patchwork-Id: 196150 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 6DBC12C032B for ; Thu, 1 Nov 2012 21:42:58 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 1A5643FB34 for ; Thu, 1 Nov 2012 11:42:54 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 36EA73FB34 for ; Thu, 1 Nov 2012 11:42:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2111; q=dns/txt; s=ironport2; t=1351766572; x=1383302572; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=vNQCQ7UptipdJKNH6mbssZq56FbBr7sbgPuXu4Tef4c=; b=mdlkNEvi96PbON3pkiQHAYHc2W6UZ/UCfH4/tD50KjYs1IfT5Tga0x5Y tsKmUkK4W596soJUrfzVmwGaj8FfnhQrSgpeK0j2FR4IhiXa6bdcibeGc mOhrS7PpKAsZL8q; X-IronPort-AV: E=Sophos;i="4.80,692,1344204000"; d="scan'208";a="1771770" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES128-SHA; 01 Nov 2012 11:42:51 +0100 Received: from dev.prevas.dk (172.16.10.60) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.318.1; Thu, 1 Nov 2012 11:42:51 +0100 Received: from arh128 (unknown [172.16.11.60]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: eha) by dev.prevas.dk (Postfix) with ESMTPSA id 3746E7FC90; Thu, 1 Nov 2012 11:42:51 +0100 (CET) Received: by arh128 (Postfix, from userid 1000) id 6D9AA8027E; Thu, 1 Nov 2012 11:42:49 +0100 (CET) From: Esben Haabendal To: Morten Thunberg Svendsen Subject: Re: [PATCH 5/9] bzip2: Remove call to "bash ./autogen.sh" in do_configure, use autoreconf with custom reconf References: <88f2bdab1e42163c7e96d01fe683567127c129de.1350484529.git.morten.thunbergsvendsen@prevas.dk> Date: Thu, 1 Nov 2012 11:42:49 +0100 In-Reply-To: <88f2bdab1e42163c7e96d01fe683567127c129de.1350484529.git.morten.thunbergsvendsen@prevas.dk> (Morten Thunberg Svendsen's message of "Wed, 17 Oct 2012 16:39:53 +0200") Message-ID: <87fw4t61ue.fsf@arh128.prevas.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Cc: dev@oe-lite.org X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Morten Thunberg Svendsen writes: > --- > recipes/bzip2/bzip2.inc | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/recipes/bzip2/bzip2.inc b/recipes/bzip2/bzip2.inc > index e11ab73..dad6b46 100644 > --- a/recipes/bzip2/bzip2.inc > +++ b/recipes/bzip2/bzip2.inc > @@ -2,7 +2,17 @@ DESCRIPTION = "Very high-quality data compression program" > > RECIPE_TYPES = "machine native sdk" > > -inherit autotools pkgconfig > +inherit autotools-autoreconf pkgconfig > +AUTORECONF_CMD = " \ > + mv LICENSE COPYING; \ > + mv CHANGES NEWS; \ > + touch AUTHORS \ > +&& touch ChangeLog \ > +&& ${LIBTOOLIZE} --force --copy \ > +&& aclocal -I . $acpaths --force \ > +&& automake -a --copy --force --gnu \ > +&& autoconf -I . $acpaths --force \ > +" > > SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz" > > @@ -34,8 +44,3 @@ RDEPENDS_${PN}-bzdiff = "${PN}-libbz2" > RDEPENDS_${PN}-bzgrep = "${PN}-libbz2" > RDEPENDS_${PN}-bzip2recover = "${PN}-libbz2" > RDEPENDS_${PN}-bzmore = "${PN}-libbz2" > - > -do_configure () { > - bash ./autogen.sh > - do_configure_autotools > -} Can you the fix below also. It works with old OE-lite/core versions also. diff --git a/recipes/bzip2/bzip2.inc b/recipes/bzip2/bzip2.inc index e11ab73..8af1c7e 100644 --- a/recipes/bzip2/bzip2.inc +++ b/recipes/bzip2/bzip2.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Very high-quality data compression program" RECIPE_TYPES = "machine native sdk" -inherit autotools pkgconfig +inherit autotools-autoreconf pkgconfig SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz" @@ -35,7 +35,10 @@ RDEPENDS_${PN}-bzgrep = "${PN}-libbz2" RDEPENDS_${PN}-bzip2recover = "${PN}-libbz2" RDEPENDS_${PN}-bzmore = "${PN}-libbz2" -do_configure () { - bash ./autogen.sh - do_configure_autotools +do_autoreconf[prefuncs] += "do_autoreconf_prep" +do_autoreconf_prep() { + ln -sf LICENSE COPYING + ln -sf CHANGES NEWS + touch AUTHORS + touch ChangeLog }