* [Buildroot] [PATCH] luajit: bump to version 2.0.5
@ 2017-05-02 7:56 Francois Perrad
2017-05-02 20:35 ` Thomas Petazzoni
2017-05-04 16:00 ` Thomas Petazzoni
0 siblings, 2 replies; 3+ messages in thread
From: Francois Perrad @ 2017-05-02 7:56 UTC (permalink / raw)
To: buildroot
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/luajit/0001-no-bin-symlink.patch | 10 +++++-----
package/luajit/0003-install-so.patch | 22 ----------------------
package/luajit/luajit.hash | 2 +-
package/luajit/luajit.mk | 2 +-
4 files changed, 7 insertions(+), 29 deletions(-)
delete mode 100644 package/luajit/0003-install-so.patch
diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch
index 37298dd7c7..dd1dfd89fc 100644
--- a/package/luajit/0001-no-bin-symlink.patch
+++ b/package/luajit/0001-no-bin-symlink.patch
@@ -14,11 +14,11 @@ Index: b/Makefile
-INSTALL_TSYMNAME= luajit
+INSTALL_TNAME= luajit
INSTALL_ANAME= libluajit-$(ABIVER).a
- INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
- INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -58,7 +57,6 @@
- INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_SOSHORT1= libluajit-$(ABIVER).so
+ INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
+@@ -59,7 +58,6 @@
+ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
-INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
diff --git a/package/luajit/0003-install-so.patch b/package/luajit/0003-install-so.patch
deleted file mode 100644
index 5929595abe..0000000000
--- a/package/luajit/0003-install-so.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix the following runtime error :
- luajit: error while loading shared libraries: libluajit-5.1.so.2: cannot open shared object file: No such file or directory
-
-by creating two symbolic links:
- libluajit-5.1.so -> libluajit-5.1.so.2.0.3
- libluajit-5.1.so.2 -> libluajit-5.1.so.2.0.3
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@
- INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
- INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
- INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
--INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
-+INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER)
- INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
- INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
-
diff --git a/package/luajit/luajit.hash b/package/luajit/luajit.hash
index 086bef0199..2081d12724 100644
--- a/package/luajit/luajit.hash
+++ b/package/luajit/luajit.hash
@@ -1,2 +1,2 @@
# Hashes from: http://luajit.org/download.html
-md5 dd9c38307f2223a504cbfb96e477eca0 LuaJIT-2.0.4.tar.gz
+md5 48353202cbcacab84ee41a5a70ea0a2c LuaJIT-2.0.5.tar.gz
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index d3ef3b7599..300e6dbc29 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LUAJIT_VERSION = 2.0.4
+LUAJIT_VERSION = 2.0.5
LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
LUAJIT_SITE = http://luajit.org/download
LUAJIT_LICENSE = MIT
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] luajit: bump to version 2.0.5
2017-05-02 7:56 [Buildroot] [PATCH] luajit: bump to version 2.0.5 Francois Perrad
@ 2017-05-02 20:35 ` Thomas Petazzoni
2017-05-04 16:00 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2017-05-02 20:35 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 2 May 2017 09:56:22 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/luajit/0001-no-bin-symlink.patch | 10 +++++-----
> package/luajit/0003-install-so.patch | 22 ----------------------
> package/luajit/luajit.hash | 2 +-
> package/luajit/luajit.mk | 2 +-
> 4 files changed, 7 insertions(+), 29 deletions(-)
> delete mode 100644 package/luajit/0003-install-so.patch
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] luajit: bump to version 2.0.5
2017-05-02 7:56 [Buildroot] [PATCH] luajit: bump to version 2.0.5 Francois Perrad
2017-05-02 20:35 ` Thomas Petazzoni
@ 2017-05-04 16:00 ` Thomas Petazzoni
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2017-05-04 16:00 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 2 May 2017 09:56:22 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/luajit/0001-no-bin-symlink.patch | 10 +++++-----
> package/luajit/0003-install-so.patch | 22 ----------------------
> package/luajit/luajit.hash | 2 +-
> package/luajit/luajit.mk | 2 +-
> 4 files changed, 7 insertions(+), 29 deletions(-)
> delete mode 100644 package/luajit/0003-install-so.patch
This commit has broken the build of the luvi package, see:
http://autobuild.buildroot.net/results/3ee/3eef12dbe07fb375e87b2b2898dcc5ef0c11e7a5/build-end.log
Reverting the luajit bump fixes the issue.
Could you have a look ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-04 16:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-02 7:56 [Buildroot] [PATCH] luajit: bump to version 2.0.5 Francois Perrad
2017-05-02 20:35 ` Thomas Petazzoni
2017-05-04 16:00 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.