diff options
author | 2018-06-27 04:47:59 -0500 | |
---|---|---|
committer | 2018-06-27 04:47:59 -0500 | |
commit | a06a4dd9514a57f4793076e4e76d13618c463064 (patch) | |
tree | 81b9fc95daf3f7353926a656c7d494f569f5cae0 | |
parent | luajit-2.0.4 patched w/removed symlinks; (diff) | |
download | ag-ops-a06a4dd9514a57f4793076e4e76d13618c463064.tar.gz ag-ops-a06a4dd9514a57f4793076e4e76d13618c463064.tar.bz2 ag-ops-a06a4dd9514a57f4793076e4e76d13618c463064.zip |
updated luajit-2.0.5-r1
-rw-r--r-- | dev-lang/luajit/files/luajit-nosymlinks.patch | 80 | ||||
-rw-r--r-- | dev-lang/luajit/luajit-2.0.4.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/luajit/luajit-2.0.5-r1.ebuild | 5 | ||||
-rw-r--r-- | dev-lang/luajit/luajit-2.0.5.ebuild | 5 |
4 files changed, 87 insertions, 5 deletions
diff --git a/dev-lang/luajit/files/luajit-nosymlinks.patch b/dev-lang/luajit/files/luajit-nosymlinks.patch new file mode 100644 index 0000000..290ce22 --- /dev/null +++ b/dev-lang/luajit/files/luajit-nosymlinks.patch @@ -0,0 +1,80 @@ +diff --git a/Makefile b/Makefile +index 85678ee..4d70d98 100644 +--- a/Makefile ++++ b/Makefile +@@ -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,36 +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_CMOD)/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_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) + 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_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_SOSHORT) +-INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) ++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) +@@ -109,19 +107,16 @@ 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) || : ++ $(LDCONFIG) $(INSTALL_LIB) || : + cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) + 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: diff --git a/dev-lang/luajit/luajit-2.0.4.ebuild b/dev-lang/luajit/luajit-2.0.4.ebuild index 1681cdf..430818a 100644 --- a/dev-lang/luajit/luajit-2.0.4.ebuild +++ b/dev-lang/luajit/luajit-2.0.4.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="0" +SLOT="2.0.4" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" diff --git a/dev-lang/luajit/luajit-2.0.5-r1.ebuild b/dev-lang/luajit/luajit-2.0.5-r1.ebuild index 3a6d64d..19dd108 100644 --- a/dev-lang/luajit/luajit-2.0.5-r1.ebuild +++ b/dev-lang/luajit/luajit-2.0.5-r1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="0" +SLOT="2.0.5-r1" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" @@ -20,7 +20,8 @@ S="${WORKDIR}/${MY_P}" # LUA_VERSION=$(readlink -e "${EROOT}"/usr/bin/lua | sed -ne 's:.*/usr/bin/lua\([\d.-]*\):\1:p') HTML_DOCS=( doc/ ) -PATCHES=( "${FILESDIR}"/${PN}-luaver.patch ) +PATCHES=( "${FILESDIR}"/${PN}-luaver.patch + "${FILESDIR}"/${PN}-nosymlinks.patch ) src_install(){ default diff --git a/dev-lang/luajit/luajit-2.0.5.ebuild b/dev-lang/luajit/luajit-2.0.5.ebuild index 3a6d64d..1db0ddd 100644 --- a/dev-lang/luajit/luajit-2.0.5.ebuild +++ b/dev-lang/luajit/luajit-2.0.5.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Just-In-Time Compiler for the Lua programming language" HOMEPAGE="http://luajit.org/" SRC_URI="http://luajit.org/download/${MY_P}.tar.gz" LICENSE="MIT" -SLOT="0" +SLOT="2.0.5" KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}" @@ -20,7 +20,8 @@ S="${WORKDIR}/${MY_P}" # LUA_VERSION=$(readlink -e "${EROOT}"/usr/bin/lua | sed -ne 's:.*/usr/bin/lua\([\d.-]*\):\1:p') HTML_DOCS=( doc/ ) -PATCHES=( "${FILESDIR}"/${PN}-luaver.patch ) +PATCHES=( "${FILESDIR}"/${PN}-luaver.patch + "${FILESDIR}"/${PN}-nosymlinks.patch ) src_install(){ default |