[Buildroot] [PATCH 1/2] Revert "package/luvi: bump version to 2.8.0"

[Buildroot] [PATCH 1/2] Revert "package/luvi: bump version to 2.8.0"

[Bernd Kuhls]

This reverts commit ac6fedda6b43996545ff498cd19a781698a96050.

Fixes
http://autobuild.buildroot.net/results/111/11146b138d3d092c3a230d197528d5dbe293e3fc/
and many others.

Quoting J?rg Krause:
http://lists.busybox.net/pipermail/buildroot/2018-August/228534.html

"The version bump as version 2.8.0 does only updates the projects
 submodules, which we are not using at all. Instead, we always build
 luvi with dependencies provided as packages in Buildroot."

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/luvi/luvi.hash | 3 +--
 package/luvi/luvi.mk   | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash
index d5716e0036..e2239b6171 100644
--- a/package/luvi/luvi.hash
+++ b/package/luvi/luvi.hash
@@ -1,3 +1,2 @@
 # Locally calculated
-sha256 a18e138c7032ef8406fef6e2135a61fad713861742512f2073adc0b4ab6d8f8b  luvi-v2.8.0.tar.gz
-sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
+sha256  ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42  luvi-src-v2.7.6.tar.gz
diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
index 8b3b7659b0..111dc09acd 100644
--- a/package/luvi/luvi.mk
+++ b/package/luvi/luvi.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-LUVI_VERSION = v2.8.0
-LUVI_SITE = https://github.com/luvit/luvi.git
-LUVI_SITE_METHOD = git
-LUVI_GIT_SUBMODULES = YES
+# we keep version 2.7.6 because 2.8.0 causes build errors and only
+# contains updates to submodules we do not need
+LUVI_VERSION = v2.7.6
+LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
+LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
 LUVI_LICENSE = Apache-2.0
 LUVI_LICENSE_FILES = LICENSE.txt
 LUVI_DEPENDENCIES = libuv luajit luv host-luajit
-- 
2.19.1

[Buildroot] [PATCH 2/2] package/luvi: add license hash

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/luvi/luvi.hash | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash
index e2239b6171..22e5cfa7bf 100644
--- a/package/luvi/luvi.hash
+++ b/package/luvi/luvi.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256  ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42  luvi-src-v2.7.6.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
-- 
2.19.1

[Buildroot] [PATCH 1/2] Revert "package/luvi: bump version to 2.8.0"

[Jörg Krause]

Hi Bernd,

On Sat, 2018-10-13 at 10:01 +0200, Bernd Kuhls wrote:
> This reverts commit ac6fedda6b43996545ff498cd19a781698a96050.
> 
> Fixes
> http://autobuild.buildroot.net/results/111/11146b138d3d092c3a230d197528d5dbe293e3fc/
> and many others.

Does this really fix the issue about missing "c-api/compat-5.3.h" for
you? Because it is a luv (not luvi) issue.

Nevertheless, I am happy about the revert as it takes ages to fetch all
submodules.

> Quoting J?rg Krause:
> http://lists.busybox.net/pipermail/buildroot/2018-August/228534.html
> 
> "The version bump as version 2.8.0 does only updates the projects
>  submodules, which we are not using at all. Instead, we always build
>  luvi with dependencies provided as packages in Buildroot."
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/luvi/luvi.hash | 3 +--
>  package/luvi/luvi.mk   | 9 +++++----
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/package/luvi/luvi.hash b/package/luvi/luvi.hash
> index d5716e0036..e2239b6171 100644
> --- a/package/luvi/luvi.hash
> +++ b/package/luvi/luvi.hash
> @@ -1,3 +1,2 @@
>  # Locally calculated
> -sha256 a18e138c7032ef8406fef6e2135a61fad713861742512f2073adc0b4ab6d8f8b  luvi-v2.8.0.tar.gz
> -sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
> +sha256  ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42  luvi-src-v2.7.6.tar.gz
> diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk
> index 8b3b7659b0..111dc09acd 100644
> --- a/package/luvi/luvi.mk
> +++ b/package/luvi/luvi.mk
> @@ -4,10 +4,11 @@
>  #
>  ################################################################################
>  
> -LUVI_VERSION = v2.8.0
> -LUVI_SITE = https://github.com/luvit/luvi.git
> -LUVI_SITE_METHOD = git
> -LUVI_GIT_SUBMODULES = YES
> +# we keep version 2.7.6 because 2.8.0 causes build errors and only
> +# contains updates to submodules we do not need
> +LUVI_VERSION = v2.7.6
> +LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
> +LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
>  LUVI_LICENSE = Apache-2.0
>  LUVI_LICENSE_FILES = LICENSE.txt
>  LUVI_DEPENDENCIES = libuv luajit luv host-luajit

Best regards,
J?rg Krause

[Buildroot] [PATCH 1/2] Revert "package/luvi: bump version to 2.8.0"

[Peter Korsgaard]

>>>>> "J?rg" == J?rg Krause <joerg.krause@embedded.rocks> writes:

 > Hi Bernd,
 > On Sat, 2018-10-13 at 10:01 +0200, Bernd Kuhls wrote:
 >> This reverts commit ac6fedda6b43996545ff498cd19a781698a96050.
 >> 
 >> Fixes
 >> http://autobuild.buildroot.net/results/111/11146b138d3d092c3a230d197528d5dbe293e3fc/
 >> and many others.

 > Does this really fix the issue about missing "c-api/compat-5.3.h" for
 > you? Because it is a luv (not luvi) issue.

It does not:

fatal error: c-api/compat-5.3.h: No such file or directory
 #include "c-api/compat-5.3.h"
                              ^
compilation terminated.
CMakeFiles/luvi.dir/build.make:74: recipe for target 'CMakeFiles/luvi.dir/src/main.c.o' failed
make[4]: *** [CMakeFiles/luvi.dir/src/main.c.o] Error 1
CMakeFiles/Makefile2:180: recipe for target 'CMakeFiles/luvi.dir/all' failed
make[3]: *** [CMakeFiles/luvi.dir/all] Error 2
Makefile:127: recipe for target 'all' failed
make[2]: *** [all] Error 2
package/pkg-generic.mk:229: recipe for target '/home/peko/source/buildroot/output-test/build/luvi-v2.7.6/.stamp_built' failed
make[1]: *** [/home/peko/source/buildroot/output-test/build/luvi-v2.7.6/.stamp_built] Error 2

 > Nevertheless, I am happy about the revert as it takes ages to fetch all
 > submodules.

Ok, applied with the autobuilder references removed, thanks.

How should the luv issue be fixed?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/2] Revert "package/luvi: bump version to 2.8.0"

[Jörg Krause]

Hi Peter,

On Sat, 2018-10-20 at 19:36 +0200, Peter Korsgaard wrote:
> > > > > > "J?rg" == J?rg Krause <joerg.krause@embedded.rocks> writes:
> 
>  > Hi Bernd,
>  > On Sat, 2018-10-13 at 10:01 +0200, Bernd Kuhls wrote:
>  >> This reverts commit ac6fedda6b43996545ff498cd19a781698a96050.
>  >> 
>  >> Fixes
>  >> http://autobuild.buildroot.net/results/111/11146b138d3d092c3a230d197528d5dbe293e3fc/
>  >> and many others.
> 
>  > Does this really fix the issue about missing "c-api/compat-5.3.h" for
>  > you? Because it is a luv (not luvi) issue.
> 
> It does not:
> 
> fatal error: c-api/compat-5.3.h: No such file or directory
>  #include "c-api/compat-5.3.h"
>                               ^
> compilation terminated.
> CMakeFiles/luvi.dir/build.make:74: recipe for target 'CMakeFiles/luvi.dir/src/main.c.o' failed
> make[4]: *** [CMakeFiles/luvi.dir/src/main.c.o] Error 1
> CMakeFiles/Makefile2:180: recipe for target 'CMakeFiles/luvi.dir/all' failed
> make[3]: *** [CMakeFiles/luvi.dir/all] Error 2
> Makefile:127: recipe for target 'all' failed
> make[2]: *** [all] Error 2
> package/pkg-generic.mk:229: recipe for target '/home/peko/source/buildroot/output-test/build/luvi-v2.7.6/.stamp_built' failed
> make[1]: *** [/home/peko/source/buildroot/output-test/build/luvi-v2.7.6/.stamp_built] Error 2
> 
>  > Nevertheless, I am happy about the revert as it takes ages to fetch all
>  > submodules.
> 
> Ok, applied with the autobuilder references removed, thanks.
> 
> How should the luv issue be fixed?

I had a look at this issue. luv shouldn't include the compat-5.3.h
header file in luv.h, but in luv.c.

However, this leads to another issue, as luvi is using `luaL_newlib`
from Lua >= 5.2. The was not an issue with the previous version 1.9.1
of luv, as luv.h defined this macro. If luvi is using this non-Lua-5.1
macro, it should provide a definition itself, as the main Lua engine is
LuaJIT.

I've send a PR to upstream [1]. I will wait for feedback until I
propose the patches for luv and luvi to Buildroot.

[1] https://github.com/luvit/luv/pull/310

Best regards,
J?rg Krause