Skip to contentSkip to conversation

sdl: run autogen.sh as PRE_CONFIGURE step

PATCH New Romain Naour 3 participants 4 messages Feb 22, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sdl: run autogen.sh as PRE_CONFIGURE step

For the same reason as for the gpm package:

"Move the GPM_RUN_AUTOGEN to be a PRE_CONFIGURE step because this step depends on the dependancies being built. If it is a POST_PATCH step the dependencies won't be built and the GPM_RUN_AUTOGEN step will fail (if the host doesn't have autotools)"
-- Ryan Barnett

Fixes:
http://autobuild.buildroot.net/results/543/543b4135c7996133f32e82d72d6f2969622f8617/build-end.log

---
 package/sdl/sdl.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/sdl/sdl.mk +2 -3
index ba5fbca..ad3e19d 100644
@@ -12,15 +12,14 @@ SDL_LICENSE_FILES = COPYING
 SDL_INSTALL_STAGING = YES
 
 # we're patching configure.in, but package cannot autoreconf with our version of
-# autotools, so we have to do it manually instead of setting SD_AUTORECONF = YES
+# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
 define SDL_RUN_AUTOGEN
 	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
 endef
 
-SDL_POST_PATCH_HOOKS += SDL_RUN_AUTOGEN
+SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
 SDL_DEPENDENCIES += host-automake host-autoconf host-libtool
 
-
 ifeq ($(BR2_PACKAGE_SDL_FBCON),y)
 SDL_CONF_OPT += --enable-video-fbcon=yes
 else
Signature · 1 line
1.8.5.3
#1 lore raw

PATCH 1/1 sdl: run autogen.sh as PRE_CONFIGURE step

Dear Romain Naour,

Quoted 23 lines · Romain Naour

For the same reason as for the gpm package:

"Move the GPM_RUN_AUTOGEN to be a PRE_CONFIGURE step because this step depends on the dependancies being built. If it is a POST_PATCH step the dependencies won't be built and the GPM_RUN_AUTOGEN step will fail (if the host doesn't have autotools)"
-- Ryan Barnett

Fixes:
http://autobuild.buildroot.net/results/543/543b4135c7996133f32e82d72d6f2969622f8617/build-end.log

---
 package/sdl/sdl.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/sdl/sdl.mk +0 -0
index ba5fbca..ad3e19d 100644
@@ -12,15 +12,14 @@ SDL_LICENSE_FILES = COPYING
 SDL_INSTALL_STAGING = YES
 

package/sdl/sdl.mk SDL_LICENSE_FILES = COPYING · line 21

Quoted 10 lines
package/sdl/sdl.mk +2 -2
 # we're patching configure.in, but package cannot autoreconf with our version of
-# autotools, so we have to do it manually instead of setting SD_AUTORECONF = YES
+# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
 define SDL_RUN_AUTOGEN
 	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
 endef
 
-SDL_POST_PATCH_HOOKS += SDL_RUN_AUTOGEN
+SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
 SDL_DEPENDENCIES += host-automake host-autoconf host-libtool

A similar change was made (but for a different reason) in the next branch, in commit
http://git.buildroot.net/buildroot/commit/package/sdl?h=next&id=f75b5de9f6f473a257c607e97419a2338d57333c.

Peter, we should backport this patch into the master branch, I believe.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 sdl: run autogen.sh as PRE_CONFIGURE step

Hi Thomas,
Le 22/02/2014 18:12, Thomas Petazzoni a ?crit :

Quoted 40 lines

Dear Romain Naour,

Quoted 23 lines · Romain Naour

For the same reason as for the gpm package:

"Move the GPM_RUN_AUTOGEN to be a PRE_CONFIGURE step because this step depends on the dependancies being built. If it is a POST_PATCH step the dependencies won't be built and the GPM_RUN_AUTOGEN step will fail (if the host doesn't have autotools)"
-- Ryan Barnett

Fixes:
http://autobuild.buildroot.net/results/543/543b4135c7996133f32e82d72d6f2969622f8617/build-end.log

---
  package/sdl/sdl.mk | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
package/sdl/sdl.mk +0 -0
index ba5fbca..ad3e19d 100644
@@ -12,15 +12,14 @@ SDL_LICENSE_FILES = COPYING
  SDL_INSTALL_STAGING = YES
 

package/sdl/sdl.mk SDL_LICENSE_FILES = COPYING · line 21

Quoted 10 lines
package/sdl/sdl.mk +2 -2
  # we're patching configure.in, but package cannot autoreconf with our version of
-# autotools, so we have to do it manually instead of setting SD_AUTORECONF = YES
+# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES
  define SDL_RUN_AUTOGEN
  	cd $(@D) && PATH=$(HOST_PATH) ./autogen.sh
  endef
 
-SDL_POST_PATCH_HOOKS += SDL_RUN_AUTOGEN
+SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN
  SDL_DEPENDENCIES += host-automake host-autoconf host-libtool

A similar change was made (but for a different reason) in the next branch, in commit
http://git.buildroot.net/buildroot/commit/package/sdl?h=next&id=f75b5de9f6f473a257c607e97419a2338d57333c.

Quoted 3 lines

Peter, we should backport this patch into the master branch, I believe.

Thomas

Ha ok, I didn't see it.
Indeed, we need it in master branch.

Thanks,
Romain

#3 lore raw

PATCH 1/1 sdl: run autogen.sh as PRE_CONFIGURE step

Quoted 11 lines
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Romain" == Romain Naour <[email protected]> writes:

A similar change was made (but for a different reason) in the next branch, in commit
http://git.buildroot.net/buildroot/commit/package/sdl?h=next&id=f75b5de9f6f473a257c607e97419a2338d57333c.

Peter, we should backport this patch into the master branch, I believe.

Thomas

Ha ok, I didn't see it.
Indeed, we need it in master branch.

Ok, I've cherry picked that commit for master, thanks.

Signature · 1 line
Bye, Peter Korsgaard