From patchwork Thu Feb 13 22:59:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 320234 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 843C22C00A2 for ; Fri, 14 Feb 2014 10:00:08 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CCF0193E84; Thu, 13 Feb 2014 23:00:07 +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 WDqqstICAmE4; Thu, 13 Feb 2014 23:00:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2061193E4D; Thu, 13 Feb 2014 23:00:07 +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 66EC21CE951 for ; Thu, 13 Feb 2014 23:00:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 53DA893E55 for ; Thu, 13 Feb 2014 23:00:05 +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 e6l0lfEc+6Aj for ; Thu, 13 Feb 2014 23:00:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by hemlock.osuosl.org (Postfix) with ESMTPS id EA8E993CFD for ; Thu, 13 Feb 2014 23:00:03 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id t61so8284073wes.28 for ; Thu, 13 Feb 2014 15:00:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HVLktF70WzUfSQ1CwzuzeuMNsY70KEaJ9/21IybyqDs=; b=j4jL2iPc9YBA0UTZgz7KEfnhoZQnBwUNyEHRg7sbZeW9ERbpYbHLftTjAcN9+TMHn2 dzHfkljnAA5GziWTnekwd+Mg0Wxu79ocFqQtCSFxo1LDykEYyNCORPTKClmu30kFoNfn uGHN54Tc79HodI1LqvxnLszYYTiA6defLeYDrQKXBGDMuW8eb2VjOl9gYfQ825Zo7mB1 RxlXQhbldVMhGrz1a6YA6oqF9+t50lPUPVbblTnmglnm6GVxZP1AG+gRldULR0SKiMxx WKk5W+H5yIoIRFZ43sFk4HNSGExBrMcGUMVIdjClMYLyi0wsM73pXyNVvCwlS3KPill2 BT/w== X-Received: by 10.180.89.211 with SMTP id bq19mr8215400wib.58.1392332401962; Thu, 13 Feb 2014 15:00:01 -0800 (PST) Received: from localhost (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id fb8sm17421462wic.3.2014.02.13.15.00.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 13 Feb 2014 15:00:01 -0800 (PST) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Thu, 13 Feb 2014 23:59:50 +0100 Message-Id: <1392332394-27935-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1392332394-27935-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1392332394-27935-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH v5 1/5] sdl: fix autoreconf timing issue 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 Context: The autobuilders were failing on the symbol _XData32 being in conflicts. A patch had been added to SDL to add a check to the configure.in Problem: Sometimes, the build would fail, because of an _XData32 symbol being in conflicts eventhrough the patch was here. What was happening: Following the classic buildroot workflow: - Extract - [...] - Apply 001 patch, which touches configure.in AND configure - Apply 002 patch, which touches configure.in - Invoke autogen.sh - [...] Right before running autogen.sh, we have configure.in which is more recent than configure, which is fine. We then, execute autogen.sh which, basically, runs autoconf. If your machine was lighty loaded, the time difference between configure.in and configure was really tiny (ms order), which seems to be neglected by autoconf. The results was that the configure was *NOT* generated. And our second patch was taken into account. If your machine was under heavy load, the time difference between the two files would have been greater and then *maybe* picked up by autoconf. And then the configure file was re-generated. When the 0001 patch was introduced, SDL package did *NOT* run it's autogen.sh, which is why it touches also the configure. This came later, causing this behavior. Fixes: http://autobuild.buildroot.net/results/d1c/d1c36f634dbf6b6e5d18444c2a23dfd129202b80/ Signed-off-by: Maxime Hadjinlian --- .../sdl/sdl-0001-use-correct-directfb-config.patch | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/package/sdl/sdl-0001-use-correct-directfb-config.patch b/package/sdl/sdl-0001-use-correct-directfb-config.patch index 2250790..ef671a1 100644 --- a/package/sdl/sdl-0001-use-correct-directfb-config.patch +++ b/package/sdl/sdl-0001-use-correct-directfb-config.patch @@ -4,13 +4,10 @@ The configure script has just checked for the correct directfb-config script, so also use it for the version check instead of whatever might be in the path. -Also patch the generated configure, as it doesn't cleanly autoreconf. - Signed-off-by: Peter Korsgaard --- - configure | 2 +- configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) Index: SDL-1.2.15/configure.in =================================================================== @@ -25,16 +22,4 @@ Index: SDL-1.2.15/configure.in HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` if test $HAVE_VERSION -ge $NEED_VERSION; then DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` -Index: SDL-1.2.15/configure -=================================================================== ---- SDL-1.2.15.orig/configure -+++ SDL-1.2.15/configure -@@ -24958,7 +24958,7 @@ - else - set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'` - NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` -- set -- `directfb-config --version | sed 's/\./ /g'` -+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'` - HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` - if test $HAVE_VERSION -ge $NEED_VERSION; then - DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` +