From patchwork Tue Feb 11 09:12:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 319180 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 0C5F82C00B9 for ; Tue, 11 Feb 2014 20:12:51 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 552D58B4F1; Tue, 11 Feb 2014 09:12:50 +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 2mdbLarp3907; Tue, 11 Feb 2014 09:12:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 21BF28552D; Tue, 11 Feb 2014 09:12:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0F0341C27FF for ; Tue, 11 Feb 2014 09:12:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 08D4B8552D for ; Tue, 11 Feb 2014 09:12:48 +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 EhqaHvzMeqWy for ; Tue, 11 Feb 2014 09:12:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by whitealder.osuosl.org (Postfix) with ESMTPS id D643A84599 for ; Tue, 11 Feb 2014 09:12:45 +0000 (UTC) Received: by mail-we0-f177.google.com with SMTP id t61so5186997wes.22 for ; Tue, 11 Feb 2014 01:12:44 -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; bh=HVLktF70WzUfSQ1CwzuzeuMNsY70KEaJ9/21IybyqDs=; b=GKs10eQ7zr54F0+vWxj/oJRtF1+7Y4Ewkf7pfRn2+BAIgcTqcTDVKhOV3wXJcCdzBe 1Q0vcoKgLUrlUoUThIhOQiqgjlWuYcSgg7hytZRx0Ucn/9tm2NDS0VEzHiQi1qmPl618 v5PDWUPyvkILP552KkXbKQMbSThmwV9UwvW4MXoDvuJH7QT4wXCHilwZob1eP2OAwR49 URjH1uvuJesy98gldPVPTzgfZrJErfB1pmGui0shhMRgJcpwvRQzk0l29GcUZy77yLJi A9Rhy1dE54v8bjxDnGtFrNRdHpQ9Bw9ZzAnwiCOdZyRqh3zDqLIuTU0yiJ/ZajHcEkxP jNnQ== X-Received: by 10.180.189.169 with SMTP id gj9mr14010360wic.17.1392109964078; Tue, 11 Feb 2014 01:12:44 -0800 (PST) Received: from localhost (11-96-190-109.dsl.ovh.fr. [109.190.96.11]) by mx.google.com with ESMTPSA id q15sm42381077wjw.18.2014.02.11.01.12.43 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 01:12:43 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Tue, 11 Feb 2014 10:12:35 +0100 Message-Id: <1392109955-742-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.3 Subject: [Buildroot] [PATCH] 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` +