summaryrefslogtreecommitdiff
path: root/dev-lang
diff options
context:
space:
mode:
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/Manifest.gzbin22140 -> 22130 bytes
-rw-r--r--dev-lang/luajit/Manifest9
-rw-r--r--dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch25
-rw-r--r--dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild (renamed from dev-lang/luajit/luajit-2.1.1716656478.ebuild)1
-rw-r--r--dev-lang/luajit/luajit-2.1.1731601260.ebuild (renamed from dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild)4
-rw-r--r--dev-lang/luajit/luajit-2.1.9999999999.ebuild2
6 files changed, 8 insertions, 33 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ee1501bfc436..fa25b8962835 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
Binary files differ
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index 828a3494d3db..c0fe2211c4a2 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,7 +1,6 @@
-AUX luajit-2.1.1727870382-fix-ljlibd-prefix.patch 866 BLAKE2B a6c879b4ed03292b94f6e1cb9549139ea6ad04a4aba0c8af6edd83b3e3f5db0f5a2d7d0fe8187bc9f57ea0b25fd283c0901e4d7d1eebc9e82944d999ec3acce6 SHA512 d2493282d691c3e4cc19f590de062241b6cb7d88a1ac0e7c8cec8e4b8162659af29a9ab5363cf91110a14dc26d7f43ec39dddc94583fbed8811eec4a9fb01977
DIST luajit-2.1.1716656478.tar.gz 1081717 BLAKE2B 42807910aa81e705ff39c382e98e479d46d31453fd6fc1857220c7d4cb66d0801e2ffd813ea3c55ab2bcde8e64275d0fec2044514d7b0ef5287714ec8061bf7a SHA512 6b00d37a33f0bafbd953569ef035546a97237a53cfb718d8aecca7e9c7afe5e4706e4a53e40b9afb8720adc8eee044d8d75b8ea6cdc50d2c3f8461d79bb73b26
-DIST luajit-2.1.1727870382.tar.gz 1082759 BLAKE2B ca2cca53238b1fcbb5a829b125f6b3efda3a863765027c8c224a01b95756255583e126ec04c115e7acc54314fb387ce1b09b9384acf0a852d51f887409bd702a SHA512 ac26594526f10e878874c02b2bbdfc6a0d1366c60456fbd09a75da5f565a2f81a1c73e385a7e7f0096a3923df5f4ac7f727100faced355bd05a9da0e95fbe1ef
-EBUILD luajit-2.1.1716656478.ebuild 1765 BLAKE2B 1e2960f12069fce84b46b1f06cc1129bd35c13e25ca3d9de5e1ccaed92ee0e827574c8f96faee5c32da1a2e3cd7335b94417ddcf0f299b4f1223b25bc98d3465 SHA512 3ed141f3339ba892fb2598b3c8d3f86760dfb5ea1c6efbf996cad9cb202faa9f5613426c5bf4dcfe741cf3b13f63bbf76bf651333eab414f4852a0622f629f64
-EBUILD luajit-2.1.1727870382-r1.ebuild 3187 BLAKE2B 7cbf9f9df02029d917ec8d58bca2bbbc9634690bf8340e7701168b8dea2fd916c3dfb7524b77af645e83fb8a791e876e61f264f4c658f550003c0254c8718e43 SHA512 55b8c952b89a039fa8f5148d94ecb118af7ba10e58b93edef79c8b1d4d0332b38e6e8a0aeea57a1fa631f3a01388d7217ac3284dd9cfffcf34b507db512a4353
-EBUILD luajit-2.1.9999999999.ebuild 3149 BLAKE2B 49acc6e064da6ecf1f3bfdea85c0bcc3d14da4a765476efd5f5bf4859df5baae1f42e112ba611cbf828a526b49e828f89420d4724001b7466c6841907ffc1ec8 SHA512 be175848bfad672baa5f8a02b4f9f1f3191fec64e5d1af72d3d6958660113d9d37afa7b255a1ef5f2e655ac46953106e6ef64840d3747dc77accae83c2c339b7
+DIST luajit-2.1.1731601260.tar.gz 1082678 BLAKE2B 07b8a9f1457db314785f9ab6ad87907b48a2dcee2a8a85e231779661ffe9b92e8b32cf790955537e86b519d61a8316848260fb83e7ba6746a816e2e0e59976e0 SHA512 4219017edd359bd5c92a37f1e3837c6ef8d9d8be89e53d80e110801e0eb7c8c2a74460376d1e3edef328e9d94f2eef9785e253027c67e1c91716e303e303a766
+EBUILD luajit-2.1.1716656478-r1.ebuild 1799 BLAKE2B af74188fa542c2da4d0bd5ff5be0ebebf2402853076171cb8bcb424e653a7be5140b79f1816a938e2d2dfd308c207b853fc47b218d39bedddc5d029075654e72 SHA512 049f4ba1645231c6aecdfc86fb7e0d7b510cc0af604740f34f05cd49b80d604d98a08ea9dc9306c8bf7bb7decf201482130ce2102829d1bd599339cdcd321213
+EBUILD luajit-2.1.1731601260.ebuild 3150 BLAKE2B 237a60cce70a65cd7fbf5e529df37018ecb340500199ed4b070861beeef7b5009a60fab366ec8647079211ed47c2cbe6db85e05abfabf88677e1628810f8ec33 SHA512 bd1239dfa7420f822d23cddcf08cde0c99af177bb32866082296993327138a30b76193b40f279dbbe8cd309915ce5b833768e2e3c7d87c66bcc10847db9ad680
+EBUILD luajit-2.1.9999999999.ebuild 3112 BLAKE2B 7f4298959edb9886869d040b9d655764f9f992bb994e5a4ca4cc3d7a7d5cb3cf3f58ee557500bcb47fa29803c1e1ce7188d490f056726b80207c126d933ee3fa SHA512 a35717219db9d85393235186c23719c2f9839945224e3e69a1f047aee90e6fa87cba48a062f749684a167373bc4748cd8986511c04a9f4c8e1171c4131c872ad
MISC metadata.xml 417 BLAKE2B dca79cd3a003ad462f7da8372af0e4012c826bc5b3001417f5b5c969f9ae9dc0cf5f6a5ac35c1badfa95769c46f701a9fa1220e2c4ecd1320cd3e904a657a4ce SHA512 812208e908c4775c7a6009764416007ab3bea124da44dca696425340848a8ff4eeae7128977162c0e679c485a9c27f03639c87854b0d513eec8bceb19d316e0d
diff --git a/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch b/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
deleted file mode 100644
index 98ae276fcc9f..000000000000
--- a/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# LJLIBD is traversed at runtime, should be relative to
-# PREFIX instead of DESTDIR/PREFIX
-#
-# https://github.com/LuaJIT/LuaJIT/issues/1303
-# https://bugs.gentoo.org/943395
-
---- a/Makefile
-+++ b/Makefile
-@@ -37,12 +37,13 @@
- DPREFIX= $(DESTDIR)$(PREFIX)
- INSTALL_BIN= $(DPREFIX)/bin
- INSTALL_LIB= $(DPREFIX)/$(MULTILIB)
--INSTALL_SHARE= $(DPREFIX)/share
-+INSTALL_SHARE_LOCAL= $(PREFIX)/share
-+INSTALL_SHARE= $(DESTDIR)$(INSTALL_SHARE_LOCAL)
- INSTALL_DEFINC= $(DPREFIX)/include/luajit-$(MMVERSION)
- INSTALL_INC= $(INSTALL_DEFINC)
-
--export INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(MMVERSION)
--INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit
-+export INSTALL_LJLIBD= $(INSTALL_SHARE_LOCAL)/luajit-$(MMVERSION)
-+INSTALL_JITLIB= $(DESTDIR)$(INSTALL_LJLIBD)/jit
- INSTALL_LMODD= $(INSTALL_SHARE)/lua
- INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER)
- INSTALL_CMODD= $(INSTALL_LIB)/lua
diff --git a/dev-lang/luajit/luajit-2.1.1716656478.ebuild b/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild
index e017c77d2323..424e0583af3a 100644
--- a/dev-lang/luajit/luajit-2.1.1716656478.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1716656478-r1.ebuild
@@ -42,6 +42,7 @@ _emake() {
TARGET_LD="$(tc-getCC)" \
TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
TARGET_LDFLAGS="${LDFLAGS}" \
+ TARGET_SHLDFLAGS="${LDFLAGS}" \
TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \
diff --git a/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
index c3beab8c9c1a..ad5125af9c87 100644
--- a/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1731601260.ebuild
@@ -32,7 +32,7 @@ if [[ ${VER_RELVER} == 9999999999 ]]; then
inherit git-r3
else
# Update this commit hash to bump a pinned-commit ebuild.
- GIT_COMMIT=97813fb924edf822455f91a5fbbdfdb349e5984f
+ GIT_COMMIT=fe71d0fb54ceadfb5b5f3b6baf29e486d97f6059
SRC_URI="https://github.com/LuaJIT/LuaJIT/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/LuaJIT-${GIT_COMMIT}"
@@ -43,7 +43,6 @@ LICENSE="MIT"
# this should probably be pkgmoved to 2.1 for sake of consistency.
SLOT="2/${PV}"
IUSE="lua52compat static-libs"
-PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
_emake() {
emake \
@@ -61,6 +60,7 @@ _emake() {
TARGET_LD="$(tc-getCC)" \
TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
TARGET_LDFLAGS="${LDFLAGS}" \
+ TARGET_SHLDFLAGS="${LDFLAGS}" \
TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \
diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
index a27f77162d26..7face85c3f9b 100644
--- a/dev-lang/luajit/luajit-2.1.9999999999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -43,7 +43,6 @@ LICENSE="MIT"
# this should probably be pkgmoved to 2.1 for sake of consistency.
SLOT="2/${PV}"
IUSE="lua52compat static-libs"
-PATCHES=( "${FILESDIR}/${PN}-2.1.1727870382-fix-ljlibd-prefix.patch" )
_emake() {
emake \
@@ -61,6 +60,7 @@ _emake() {
TARGET_LD="$(tc-getCC)" \
TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \
TARGET_LDFLAGS="${LDFLAGS}" \
+ TARGET_SHLDFLAGS="${LDFLAGS}" \
TARGET_AR="$(tc-getAR) rcus" \
BUILDMODE="$(usex static-libs mixed dynamic)" \
TARGET_STRIP="true" \