From: Jörg Krause Date: Wed, 20 May 2015 07:41:49 +0000 (+0200) Subject: package/luajit: renumber patches X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e672cfbe57de29f55047af6502de6711cb017418;p=buildroot.git package/luajit: renumber patches Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- diff --git a/package/luajit/0001-no-bin-symlink.patch b/package/luajit/0001-no-bin-symlink.patch new file mode 100644 index 0000000000..0de3162027 --- /dev/null +++ b/package/luajit/0001-no-bin-symlink.patch @@ -0,0 +1,26 @@ +Do not use a symlink for the binary, simply name if luajit + +Signed-off-by: Thomas Petazzoni + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -42,8 +42,7 @@ + INSTALL_MAN= $(INSTALL_SHARE)/man/man1 + INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig + +-INSTALL_TNAME= luajit-$(VERSION) +-INSTALL_TSYMNAME= luajit ++INSTALL_TNAME= luajit + INSTALL_ANAME= libluajit-$(ABIVER).a + INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) + INSTALL_SOSHORT= libluajit-$(ABIVER).so +@@ -57,7 +56,6 @@ + INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) + INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) + INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) +-INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) + + INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ diff --git a/package/luajit/0002-install-inc.patch b/package/luajit/0002-install-inc.patch new file mode 100644 index 0000000000..1fd11b1a17 --- /dev/null +++ b/package/luajit/0002-install-inc.patch @@ -0,0 +1,17 @@ +Install includes like lua's ones + +Signed-off-by: Francois Perrad + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,7 @@ DPREFIX= $(DESTDIR)$(PREFIX) + INSTALL_BIN= $(DPREFIX)/bin + INSTALL_LIB= $(DPREFIX)/lib + INSTALL_SHARE= $(DPREFIX)/share +-INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) ++INSTALL_INC= $(DPREFIX)/include + + INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) + INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit diff --git a/package/luajit/0003-install-so.patch b/package/luajit/0003-install-so.patch new file mode 100644 index 0000000000..738ec07716 --- /dev/null +++ b/package/luajit/0003-install-so.patch @@ -0,0 +1,22 @@ +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 + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -56,7 +56,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_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) + INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) diff --git a/package/luajit/0004-no-bin-symlink.patch b/package/luajit/0004-no-bin-symlink.patch deleted file mode 100644 index 0de3162027..0000000000 --- a/package/luajit/0004-no-bin-symlink.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not use a symlink for the binary, simply name if luajit - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -42,8 +42,7 @@ - INSTALL_MAN= $(INSTALL_SHARE)/man/man1 - INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig - --INSTALL_TNAME= luajit-$(VERSION) --INSTALL_TSYMNAME= luajit -+INSTALL_TNAME= luajit - INSTALL_ANAME= libluajit-$(ABIVER).a - INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) - INSTALL_SOSHORT= libluajit-$(ABIVER).so -@@ -57,7 +56,6 @@ - INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) - INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) - INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) --INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) - INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) - - INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ diff --git a/package/luajit/0005-install-inc.patch b/package/luajit/0005-install-inc.patch deleted file mode 100644 index 1fd11b1a17..0000000000 --- a/package/luajit/0005-install-inc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Install includes like lua's ones - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,7 @@ DPREFIX= $(DESTDIR)$(PREFIX) - INSTALL_BIN= $(DPREFIX)/bin - INSTALL_LIB= $(DPREFIX)/lib - INSTALL_SHARE= $(DPREFIX)/share --INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) -+INSTALL_INC= $(DPREFIX)/include - - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) - INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit diff --git a/package/luajit/0006-install-so.patch b/package/luajit/0006-install-so.patch deleted file mode 100644 index 738ec07716..0000000000 --- a/package/luajit/0006-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 - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,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_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) - INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)