sdl: fix autoreconf timing issue
PATCH 1/1 sdl: fix autoreconf timing issue
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/
--- .../sdl/sdl-0001-use-correct-directfb-config.patch | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-)
package/sdl/sdl-0001-use-correct-directfb-config.patch +2 -17
@@ -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 <[email protected]> --- - 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` +
Signature · 1 line
1.8.5.3
PATCH 1/1 sdl: fix autoreconf timing issue
Quoted 23 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Maxime" == Maxime Hadjinlian <[email protected]> writes:
Context:
The autobuilders were failing on the symbol_XData32being in conflicts. A patch had been added to SDL to add a check to the configure.inProblem:
Sometimes, the build would fail, because of an_XData32symbol 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
- Invokeautogen.sh
- [...]Right before running
autogen.sh, we have configure.in which is more recent than configure, which is fine.
We then, executeautogen.shwhich, basically, runs autoconf.
Quoted 5 lines
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.
NOT taken.
Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 sdl: fix autoreconf timing issue
In reply to Maxime HadjinlianDear Maxime Hadjinlian,
Quoted 4 lines · Maxime Hadjinlian
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.
Quoted 8 lines
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 <[email protected]>
Wow, amazing problem. Thanks a lot for getting to the bottom of it. The solution is indeed simple, but the investigation definitely wasn't (I've followed your conversation with Yann on IRC yesterday evening, and I remember quickly discussing the issue with you during the Buildroot Developer Days). Congrats!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 sdl: fix autoreconf timing issue
Quoted 15 lines · Thomas Petazzoni
Dear Maxime Hadjinlian,
Quoted 11 lines · Maxime Hadjinlian
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/
Quoted 7 lines
Quoted 1 line
Signed-off-by Maxime Hadjinlian <[email protected]>Wow, amazing problem. Thanks a lot for getting to the bottom of it. The solution is indeed simple, but the investigation definitely wasn't (I've followed your conversation with Yann on IRC yesterday evening, and I remember quickly discussing the issue with you during the Buildroot Developer Days). Congrats!
Thank you.
A huge thanks to Yann E. Morin too as he put me on the right track and I stupidly forgot to add him as Cc: :/.
Quoted 6 lines
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com