[Buildroot] [PATCH 02/24] lua: refactor install steps

[Arnout Vandecappelle <arnout@mind.be>]

On 24/02/14 08:34, Francois Perrad wrote:
> since the commit (lua*: restore version in module paths),

 If you refer to a commit, please use its abbreviated sha.

> the upstream Makefiles are usable for install.
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/lua/5.1.5/lua-02-shared-libs-for-lua.patch |   22 ++++++++++++++
>  package/lua/5.2.3/lua-02-shared-libs-for-lua.patch |   22 ++++++++++++++
>  package/lua/lua.mk                                 |   30 ++------------------
>  3 files changed, 47 insertions(+), 27 deletions(-)
> 
> diff --git a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> index 97a7068..1227cbd 100644
> --- a/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> +++ b/package/lua/5.1.5/lua-02-shared-libs-for-lua.patch
> @@ -1,8 +1,30 @@
>  Add the compilation of a shared library.
>  Compile the lua binary with the shared library.
> +And install the shared library.
>  
>  Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>  
> +Index: b/Makefile
> +===================================================================
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -43,7 +43,7 @@
> + # What to install.
> + TO_BIN= lua luac
> + TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp
> +-TO_LIB= liblua.a
> ++TO_LIB= liblua.a liblua.so.$(R)

 I think it's more appropriate to make a separate TO_SOLIB.

> + TO_MAN= lua.1 luac.1
> + 
> + # Lua version and release.
> +@@ -63,6 +63,7 @@
> + 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
> + 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
> + 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)

 Shouldn't this be INSTALL_EXEC for the .so?

> ++	cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so

 Seems more appropriate to me to do
	ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so



 Not related to this patch, but it seems to me that the .so is built and
installed unconditionally, even on BR2_PREFER_STATIC and BINFMT_FLAT. How
can this even work?


 Regards,
 Arnout

> + 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
> + 
> + ranlib:
>  Index: b/src/Makefile
>  ===================================================================
>  --- a/src/Makefile
> diff --git a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> index 4679325..9321c62 100644
> --- a/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> +++ b/package/lua/5.2.3/lua-02-shared-libs-for-lua.patch
> @@ -1,8 +1,30 @@
>  Add the compilation of a shared library.
>  Compile the lua binary with the shared library.
> +And install the shared library.
>  
>  Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>  
> +Index: b/Makefile
> +===================================================================
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -41,7 +41,7 @@
> + # What to install.
> + TO_BIN= lua luac
> + TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp
> +-TO_LIB= liblua.a
> ++TO_LIB= liblua.a liblua.so.$(R)
> + TO_MAN= lua.1 luac.1
> + 
> + # Lua version and release.
> +@@ -62,6 +62,7 @@
> + 	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
> + 	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
> + 	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
> ++	cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so
> + 	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
> + 
> + uninstall:
>  Index: b/src/Makefile
>  ===================================================================
>  --- a/src/Makefile
> diff --git a/package/lua/lua.mk b/package/lua/lua.mk
> index a20531c..c016d7e 100644
> --- a/package/lua/lua.mk
> +++ b/package/lua/lua.mk
> @@ -65,43 +65,19 @@ define HOST_LUA_BUILD_CMDS
>  endef
>  
>  define LUA_INSTALL_STAGING_CMDS
> +	$(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
>  	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
>  		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
> -	$(INSTALL) -m 0755 -D $(@D)/src/lua $(STAGING_DIR)/usr/bin/lua
> -	$(INSTALL) -m 0755 -D $(@D)/src/luac $(STAGING_DIR)/usr/bin/luac
> -	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
> -		$(STAGING_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
> -	ln -sf liblua.so.$(LUA_VERSION) $(STAGING_DIR)/usr/lib/liblua.so
> -	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(STAGING_DIR)/usr/lib/liblua.a
> -	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(STAGING_DIR)/usr/include/lua.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(STAGING_DIR)/usr/include/luaconf.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(STAGING_DIR)/usr/include/lualib.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(STAGING_DIR)/usr/include/lauxlib.h
>  endef
>  
>  define LUA_INSTALL_TARGET_CMDS
> -	$(INSTALL) -m 0755 -D $(@D)/src/lua $(TARGET_DIR)/usr/bin/lua
> -	$(INSTALL) -m 0755 -D $(@D)/src/luac $(TARGET_DIR)/usr/bin/luac
> -	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
> -		$(TARGET_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
> -	ln -sf liblua.so.$(LUA_VERSION) $(TARGET_DIR)/usr/lib/liblua.so
> -	mkdir -p $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)
> -	mkdir -p $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)
> +	$(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install
>  endef
>  
>  define HOST_LUA_INSTALL_CMDS
> -	$(INSTALL) -m 0755 -D $(@D)/src/lua $(HOST_DIR)/usr/bin/lua
> -	$(INSTALL) -m 0755 -D $(@D)/src/luac $(HOST_DIR)/usr/bin/luac
> -	$(INSTALL) -m 0755 -D $(@D)/src/liblua.so.$(LUA_VERSION) \
> -		$(HOST_DIR)/usr/lib/liblua.so.$(LUA_VERSION)
> -	ln -sf liblua.so.$(LUA_VERSION) $(HOST_DIR)/usr/lib/liblua.so
> -	$(INSTALL) -m 0644 -D $(@D)/src/liblua.a $(HOST_DIR)/usr/lib/liblua.a
> +	$(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
>  	$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
>  		$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
> -	$(INSTALL) -m 0644 -D $(@D)/src/lua.h $(HOST_DIR)/usr/include/lua.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/luaconf.h $(HOST_DIR)/usr/include/luaconf.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/lualib.h $(HOST_DIR)/usr/include/lualib.h
> -	$(INSTALL) -m 0644 -D $(@D)/src/lauxlib.h $(HOST_DIR)/usr/include/lauxlib.h
>  endef
>  
>  $(eval $(generic-package))
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F