Hello Karl, the version built last is the one which will have the symlink set. However, i think this is not the ideal solution in terms of reproducibility, so we should probably only symlink lua5.1 for the Host installation?
A bit more background on this topic (as I've forgotten to add this to the commit message): LuaSrcDiet currently fails silently as it expects a "lua" named binary in it's path. I suspect there could be more silent breakage because of this currently. Best wishes David On 8/28/19 10:53 PM, Karl Palsson wrote: > > How is this meant to work when you have both? > > David Bauer <m...@david-bauer.net> wrote: >> Since the binaries for both lua as well as lua5.3 contain the >> version number, invocations of the "lua" binary are failing, as >> it's not created anymore for the host package. >> >> Fixes: fe59b46 ("lua: include version number in installed >> files") Signed-off-by: David Bauer <m...@david-bauer.net> >> --- >> package/utils/lua/Makefile | 4 +++- >> package/utils/lua5.3/Makefile | 4 +++- >> 2 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/package/utils/lua/Makefile >> b/package/utils/lua/Makefile index a2870448bd..e376e8c472 >> 100644 >> --- a/package/utils/lua/Makefile >> +++ b/package/utils/lua/Makefile >> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk >> >> PKG_NAME:=lua >> PKG_VERSION:=5.1.5 >> -PKG_RELEASE:=5 >> +PKG_RELEASE:=6 >> >> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz >> PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ >> @@ -133,6 +133,8 @@ define Host/Install >> $(MAKE) -C $(HOST_BUILD_DIR) \ >> INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \ >> install >> + >> + $(LN) $(STAGING_DIR_HOSTPKG)/bin/lua5.1 $(STAGING_DIR_HOSTPKG)/bin/lua >> endef >> >> define Build/InstallDev >> diff --git a/package/utils/lua5.3/Makefile >> b/package/utils/lua5.3/Makefile index c9e9bebb1a..7f835dd41f >> 100644 >> --- a/package/utils/lua5.3/Makefile >> +++ b/package/utils/lua5.3/Makefile >> @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk >> >> PKG_NAME:=lua >> PKG_VERSION:=5.3.5 >> -PKG_RELEASE:=4 >> +PKG_RELEASE:=5 >> >> PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz >> PKG_SOURCE_URL:=http://www.lua.org/ftp/ \ >> @@ -118,6 +118,8 @@ define Host/Install >> $(MAKE) -C $(HOST_BUILD_DIR) \ >> INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \ >> install >> + >> + $(LN) $(STAGING_DIR_HOSTPKG)/bin/lua5.3 $(STAGING_DIR_HOSTPKG)/bin/lua >> endef >> >> define Build/InstallDev >> -- >> 2.23.0 >> >> >> _______________________________________________ >> openwrt-devel mailing list >> openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel >> >> _______________________________________________ >> openwrt-devel mailing list >> openwrt-devel@lists.openwrt.org >> https://lists.openwrt.org/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel