diff mbox

[4/5] lua : refactor with POST_PATH_HOOKS

Message ID 1342446352-31231-4-git-send-email-francois.perrad@gadz.org
State Rejected
Headers show

Commit Message

Francois Perrad July 16, 2012, 1:45 p.m. UTC 
---
 package/lua/lua.mk |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Comments

Thomas Petazzoni July 16, 2012, 3:46 p.m. UTC | #1 
Le Mon, 16 Jul 2012 15:45:51 +0200,
Francois Perrad <fperrad@gmail.com> a écrit :

> +define LUA_PREFIX_FIX_PKG_CONFIG
> +	$(SED) 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
> +endef
> +LUA_POST_PATCH_HOOKS += LUA_PREFIX_FIX_PKG_CONFIG
> +HOST_LUA_POST_PATCH_HOOKS += LUA_PREFIX_FIX_PKG_CONFIG
> +
> +define LUA_OPTIM_FIX_MAKEFILE
> +	$(SED) 's/-O2//' $(@D)/src/Makefile
> +endef
> +LUA_POST_PATCH_HOOKS += LUA_OPTIM_FIX_MAKEFILE
> +HOST_LUA_POST_PATCH_HOOKS += LUA_OPTIM_FIX_MAKEFILE

It sounds odd to me to have a patch to fix the /usr prefix in
src/luaconf.h on one side, and on the other side, fix other problems by
using sed in the .mk file. Either one or the other, but not both in the
same package.

Thomas
diff mbox

Patch

diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 5b8022a..04c47fc 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -23,9 +23,19 @@  HOST_LUA_DEPENDENCIES =
 HOST_LUA_MYCFLAGS = -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX
 HOST_LUA_MYLIBS = -ldl
 
+define LUA_PREFIX_FIX_PKG_CONFIG
+	$(SED) 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
+endef
+LUA_POST_PATCH_HOOKS += LUA_PREFIX_FIX_PKG_CONFIG
+HOST_LUA_POST_PATCH_HOOKS += LUA_PREFIX_FIX_PKG_CONFIG
+
+define LUA_OPTIM_FIX_MAKEFILE
+	$(SED) 's/-O2//' $(@D)/src/Makefile
+endef
+LUA_POST_PATCH_HOOKS += LUA_OPTIM_FIX_MAKEFILE
+HOST_LUA_POST_PATCH_HOOKS += LUA_OPTIM_FIX_MAKEFILE
+
 define LUA_BUILD_CMDS
-	sed -i -e 's/-O2//' $(@D)/src/Makefile
-	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
 	$(MAKE) \
 	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \
 	MYCFLAGS="$(TARGET_CFLAGS) $(LUA_MYCFLAGS)" \
@@ -34,8 +44,6 @@  define LUA_BUILD_CMDS
 endef
 
 define HOST_LUA_BUILD_CMDS
-	sed -i -e 's/-O2//' $(@D)/src/Makefile
-	sed -i -e 's/\/usr\/local/\/usr/' $(@D)/etc/lua.pc
 	$(MAKE) \
 	MYCFLAGS="$(HOST_LUA_MYCFLAGS)" \
 	MYLIBS="$(HOST_LUA_MYLIBS)" \