| Message ID | 1393227301-14874-3-git-send-email-francois.perrad@gadz.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
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)) >
On 25/02/14 18:39, Arnout Vandecappelle wrote: > 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? Answering my own question: it can't: http://autobuild.buildroot.net/results/44e/44e2a79a29172a28ff3024a9d75e89a204efc22d/build-end.log /home/test/test/2/output/host/usr/bin/bfin-uclinux-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -Wl,-elf2flt -Wall -fPIC -DLUA_USE_POSIX -DLUA_USE_DLOPEN -c -o loadlib.o loadlib.c loadlib.c:61:19: error: dlfcn.h: No such file or directory loadlib.c: In function 'll_unloadlib': loadlib.c:64: warning: implicit declaration of function 'dlclose' loadlib.c: In function 'll_load': loadlib.c:69: warning: implicit declaration of function 'dlopen' loadlib.c:69: error: 'RTLD_NOW' undeclared (first use in this function) loadlib.c:69: error: (Each undeclared identifier is reported only once loadlib.c:69: error: for each function it appears in.) loadlib.c:69: warning: initialization makes pointer from integer without a cast loadlib.c:70: warning: implicit declaration of function 'dlerror' loadlib.c:70: warning: passing argument 2 of 'lua_pushstring' makes pointer from integer without a cast loadlib.c: In function 'll_sym': loadlib.c:76: warning: implicit declaration of function 'dlsym' loadlib.c:77: warning: passing argument 2 of 'lua_pushstring' makes pointer from integer without a cast Clearly it needs !BR2_PREFER_STATIC. Fix is not entirely trivial because of the large number of reverse dependencies. Regards, Arnout
2014-02-25 18:39 GMT+01:00 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. Ok. > >> + 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? Ok. > >> ++ 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 Ok. > > > > 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? You are right. lua doesn't work with Blackfin. See http://patchwork.ozlabs.org/patch/314146/ François. > > > 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 > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On 25/02/14 22:07, François Perrad wrote: >> > >> > 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? > You are right. lua doesn't work with Blackfin. > See http://patchwork.ozlabs.org/patch/314146/ OK, I'll do a quick review of that patch. Could you make a series of the first two of these, together with an update of 314146, to be included in 2014.02? Regards, Arnout
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) + 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) ++ cd $(INSTALL_LIB) && ln -sf liblua.so.$(R) liblua.so + 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))
since the commit (lua*: restore version in module paths), 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(-)