aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorILMostro <ilmostro7@gmail.com>2018-06-27 12:43:42 -0500
committerILMostro <ilmostro7@gmail.com>2018-06-27 12:43:42 -0500
commitb881c354b8cfa6371df75079f242d885a62452fb (patch)
tree7c500243b7fe8ae7f368c6855c97acbdda0b458a
parenteselect-luajit: LVER is not a command, but a variable (diff)
downloadag-ops-b881c354b8cfa6371df75079f242d885a62452fb.tar.gz
ag-ops-b881c354b8cfa6371df75079f242d885a62452fb.tar.bz2
ag-ops-b881c354b8cfa6371df75079f242d885a62452fb.zip
included luajit-205.patch
-rw-r--r--dev-lang/luajit/files/luajit-205.patch124
1 files changed, 124 insertions, 0 deletions
diff --git a/dev-lang/luajit/files/luajit-205.patch b/dev-lang/luajit/files/luajit-205.patch
new file mode 100644
index 0000000..7a2521e
--- /dev/null
+++ b/dev-lang/luajit/files/luajit-205.patch
@@ -0,0 +1,124 @@
+diff --git a/Makefile b/Makefile
+index 5a188ae..6f269ca 100644
+--- a/Makefile
++++ b/Makefile
+@@ -10,7 +10,7 @@
+ # For MSVC, please follow the instructions given in src/msvcbuild.bat.
+ # For MinGW and Cygwin, cd to src and run make with the Makefile there.
+ #
+-# Copyright (C) 2005-2017 Mike Pall. See Copyright Notice in luajit.h
++# Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h
+ ##############################################################################
+
+ MAJVER= 2
+@@ -32,7 +32,7 @@ DPREFIX= $(DESTDIR)$(PREFIX)
+ INSTALL_BIN= $(DPREFIX)/bin
+ INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
+ INSTALL_SHARE= $(DPREFIX)/share
+-INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER)
++INSTALL_INC= $(DPREFIX)/include/luajit-$(VERSION)
+
+ INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION)
+ INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
+@@ -40,37 +40,34 @@ INSTALL_LMODD= $(INSTALL_SHARE)/lua
+ INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
+ INSTALL_CMODD= $(INSTALL_LIB)/lua
+ INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER)
++INSTALL_CMODL= $(INSTALL_LIB)/luajit-$(VERSION)
+ INSTALL_MAN= $(INSTALL_SHARE)/man/man1
+ INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
+
+ INSTALL_TNAME= luajit-$(VERSION)
+-INSTALL_TSYMNAME= luajit
+ INSTALL_ANAME= libluajit-$(ABIVER).a
+-INSTALL_SOSHORT1= libluajit-$(ABIVER).so
+-INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
+-INSTALL_SONAME= $(INSTALL_SOSHORT2).$(MINVER).$(RELVER)
++INSTALL_SONAME= libluajit-$(ABIVER).so
++INSTALL_SOSHORT= libluajit-$(ABIVER).so
++INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+ INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib
+ INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib
+-INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib
+-INSTALL_PCNAME= luajit.pc
++INSTALL_PCNAME= luajit-$(VERSION).pc
+
+-INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
+-INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
+-INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
+-INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
++INSTALL_STATIC= $(INSTALL_CMODL)/$(INSTALL_ANAME)
++INSTALL_DYN= $(INSTALL_CMODL)/$(INSTALL_SONAME)
++INSTALL_SHORT1= $(INSTALL_CMODL)/$(INSTALL_SOSHORT)
++INSTALL_SHORT2= $(INSTALL_CMODL)/$(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) \
+- $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD)
++ $(INSTALL_PKGCONFIG) $(INSTALL_JITLIB) $(INSTALL_LMOD) $(INSTALL_CMOD) $(INSTALL_CMODL)
+ UNINSTALL_DIRS= $(INSTALL_JITLIB) $(INSTALL_LJLIBD) $(INSTALL_INC) \
+- $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD)
++ $(INSTALL_LMOD) $(INSTALL_LMODD) $(INSTALL_CMOD) $(INSTALL_CMODD) $(INSTALL_CMODL)
+
+ RM= rm -f
+ MKDIR= mkdir -p
+ RMDIR= rmdir 2>/dev/null
+-SYMLINK= ln -sf
+ INSTALL_X= install -m 0755
+ INSTALL_F= install -m 0644
+ UNINSTALL= $(RM)
+@@ -88,17 +85,12 @@ FILES_JITLIB= bc.lua v.lua dump.lua dis_x86.lua dis_x64.lua dis_arm.lua \
+ dis_ppc.lua dis_mips.lua dis_mipsel.lua bcsave.lua vmdef.lua
+
+ ifeq (,$(findstring Windows,$(OS)))
+- HOST_SYS:= $(shell uname -s)
+-else
+- HOST_SYS= Windows
+-endif
+-TARGET_SYS?= $(HOST_SYS)
+-
+-ifeq (Darwin,$(TARGET_SYS))
+- INSTALL_SONAME= $(INSTALL_DYLIBNAME)
+- INSTALL_SOSHORT1= $(INSTALL_DYLIBSHORT1)
+- INSTALL_SOSHORT2= $(INSTALL_DYLIBSHORT2)
+- LDCONFIG= :
++ ifeq (Darwin,$(shell uname -s))
++ INSTALL_SONAME= $(INSTALL_DYLIBNAME)
++ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT1)
++ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_DYLIBSHORT2)
++ LDCONFIG= :
++ endif
+ endif
+
+ ##############################################################################
+@@ -115,24 +107,21 @@ install: $(INSTALL_DEP)
+ $(MKDIR) $(INSTALL_DIRS)
+ cd src && $(INSTALL_X) $(FILE_T) $(INSTALL_T)
+ cd src && test -f $(FILE_A) && $(INSTALL_F) $(FILE_A) $(INSTALL_STATIC) || :
+- $(RM) $(INSTALL_TSYM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
++ $(RM) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2)
+ cd src && test -f $(FILE_SO) && \
+ $(INSTALL_X) $(FILE_SO) $(INSTALL_DYN) && \
+- $(LDCONFIG) $(INSTALL_LIB) && \
+- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT1) && \
+- $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || :
+- cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)
++ $(LDCONFIG) $(INSTALL_LIB) || :
++ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(VERSION)
+ cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \
+ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \
+ $(RM) $(FILE_PC).tmp
+ cd src && $(INSTALL_F) $(FILES_INC) $(INSTALL_INC)
+ cd src/jit && $(INSTALL_F) $(FILES_JITLIB) $(INSTALL_JITLIB)
+- $(SYMLINK) $(INSTALL_TNAME) $(INSTALL_TSYM)
+ @echo "==== Successfully installed LuaJIT $(VERSION) to $(PREFIX) ===="
+
+ uninstall:
+ @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ===="
+- $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC)
++ $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/luajit-$(VERSION) $(INSTALL_PC)
+ for file in $(FILES_JITLIB); do \
+ $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \
+ done