From: Rafał Miłecki <rafal@milecki.pl>
Date: Fri, 28 Jun 2019 09:38:23 +0000 (+0200)
Subject: lua: fix build with MacOS's make
X-Git-Tag: v21.02.0-rc1~5685
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=24645c0ee1103235338737fb3c4478f3c4109bc1;p=openwrt%2Fstaging%2Fhauke.git

lua: fix build with MacOS's make

It apparently requires passing V variable explicitly.

Fixes: fe59b46ca7e0 ("lua: include version number in installed files")
Reported-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/package/utils/lua/patches-host/001-include-version-number.patch b/package/utils/lua/patches-host/001-include-version-number.patch
index b7056fd47c..f769e60736 100644
--- a/package/utils/lua/patches-host/001-include-version-number.patch
+++ b/package/utils/lua/patches-host/001-include-version-number.patch
@@ -24,6 +24,15 @@ diff --git a/Makefile b/Makefile
  
  # Lua version and release.
  V= 5.1
+@@ -53,7 +53,7 @@ R= 5.1.5
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$V
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
 diff --git a/doc/lua.1 b/doc/lua5.1.1
 rename from doc/lua.1
 rename to doc/lua5.1.1
diff --git a/package/utils/lua/patches/001-include-version-number.patch b/package/utils/lua/patches/001-include-version-number.patch
index b7056fd47c..f769e60736 100644
--- a/package/utils/lua/patches/001-include-version-number.patch
+++ b/package/utils/lua/patches/001-include-version-number.patch
@@ -24,6 +24,15 @@ diff --git a/Makefile b/Makefile
  
  # Lua version and release.
  V= 5.1
+@@ -53,7 +53,7 @@ R= 5.1.5
+ all:	$(PLAT)
+ 
+ $(PLATS) clean:
+-	cd src && $(MAKE) $@
++	cd src && $(MAKE) $@ V=$V
+ 
+ test:	dummy
+ 	src/lua test/hello.lua
 diff --git a/doc/lua.1 b/doc/lua5.1.1
 rename from doc/lua.1
 rename to doc/lua5.1.1