summaryrefslogtreecommitdiff
path: root/dev-lang/luajit
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-11-15 03:02:36 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-11-15 03:02:36 +0000
commit57d1fe5ae0c56e604db5d29bf7b62d685c42e043 (patch)
treebc1bdf3c531b7b4cef73b051dbb3cd439dee4a39 /dev-lang/luajit
parentd3c7d3e5f9607edef1a795ccc502ab3eb3121165 (diff)
gentoo auto-resync : 15:11:2024 - 03:02:36
Diffstat (limited to 'dev-lang/luajit')
-rw-r--r--dev-lang/luajit/Manifest5
-rw-r--r--dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch25
-rw-r--r--dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild (renamed from dev-lang/luajit/luajit-2.1.1727870382.ebuild)31
-rw-r--r--dev-lang/luajit/luajit-2.1.9999999999.ebuild31
4 files changed, 76 insertions, 16 deletions
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest
index e9a896c67a05..828a3494d3db 100644
--- a/dev-lang/luajit/Manifest
+++ b/dev-lang/luajit/Manifest
@@ -1,6 +1,7 @@
+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.ebuild 2357 BLAKE2B fc22a5e4d9f0d7a9458fc171f3f438d7a8d04a3182cc1ce5210ae7e8f05c4fa83f700ebb31298f075a978277991eac76abd67ab95a8a3f8d20025e2834d35033 SHA512 1ea5dec28a91f0549c72800513e1db36293aa89fa65513aa2de23c2421ebc3ac3cf4e1aa1608160e87a342168b62b89cfd6a7b6d461810c2e6fd58d65519cc6a
-EBUILD luajit-2.1.9999999999.ebuild 2319 BLAKE2B c215f9324d2528f6e5da26d87d119e1447cd28a0f1e9499f4262b85bd5a987f40fa221d63bab9ad8afdc261f0e15d753ca832408219d02e845b18baea1d2b65b SHA512 e1ac4499a26eb8a2d3bb666879ab2d10cb598a3c0d7e2fa541c8fd00446598d2783908b91409c8337a21c9d8ae57627d78110da4bacfeec2a207a20a132a7cc8
+EBUILD luajit-2.1.1727870382-r1.ebuild 3187 BLAKE2B 7cbf9f9df02029d917ec8d58bca2bbbc9634690bf8340e7701168b8dea2fd916c3dfb7524b77af645e83fb8a791e876e61f264f4c658f550003c0254c8718e43 SHA512 55b8c952b89a039fa8f5148d94ecb118af7ba10e58b93edef79c8b1d4d0332b38e6e8a0aeea57a1fa631f3a01388d7217ac3284dd9cfffcf34b507db512a4353
+EBUILD luajit-2.1.9999999999.ebuild 3149 BLAKE2B 49acc6e064da6ecf1f3bfdea85c0bcc3d14da4a765476efd5f5bf4859df5baae1f42e112ba611cbf828a526b49e828f89420d4724001b7466c6841907ffc1ec8 SHA512 be175848bfad672baa5f8a02b4f9f1f3191fec64e5d1af72d3d6958660113d9d37afa7b255a1ef5f2e655ac46953106e6ef64840d3747dc77accae83c2c339b7
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
new file mode 100644
index 000000000000..98ae276fcc9f
--- /dev/null
+++ b/dev-lang/luajit/files/luajit-2.1.1727870382-fix-ljlibd-prefix.patch
@@ -0,0 +1,25 @@
+# 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.1727870382.ebuild b/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
index 1a9014c337c4..c3beab8c9c1a 100644
--- a/dev-lang/luajit/luajit-2.1.1727870382.ebuild
+++ b/dev-lang/luajit/luajit-2.1.1727870382-r1.ebuild
@@ -14,19 +14,20 @@ EAPI=8
inherit toolchain-funcs
+# Split release channel (such as "2.1") from relver (such as "1727870382")
+VER_CHANNEL=${PV%.*}
+VER_RELVER=${PV##*.}
+
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="https://luajit.org/"
-if [[ ${PV} == 2.1.9999999999 ]]; then
- # This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
- # out, create a new ebuild for it.
- #
- # Upstream recommends pulling rolling releases from the v2.1 branch.
+if [[ ${VER_RELVER} == 9999999999 ]]; then
+ # Upstream recommends pulling rolling releases from versioned branches.
# > The old git master branch is phased out and stays pinned to the v2.0
# > branch. Please follow the versioned branches instead.
#
# See http://luajit.org/status.html for additional information.
- EGIT_BRANCH="v2.1"
+ EGIT_BRANCH="v${VER_CHANNEL}"
EGIT_REPO_URI="https://luajit.org/git/luajit.git"
inherit git-r3
else
@@ -42,6 +43,7 @@ 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 \
@@ -73,7 +75,22 @@ src_compile() {
src_install() {
_emake install
- dosym luajit-"${PV}" /usr/bin/luajit
+
+ # For tarballs downloaded from github, the relver is provided in
+ # ${S}/.relver, a file populated when generating the tarball as directed by
+ # .gitattributes. That file will contain the same relver as the relver
+ # in our version number.
+ #
+ # For the live build, this is not populated, but luajit's build process
+ # inspects the git repository directly with this command:
+ #
+ # git show -s --format=%ct
+ #
+ # In both cases, luajit puts the relver in src/luajit_relver.txt during
+ # the build. We read this file to ensure we're using the same source of
+ # truth as luajit's own build does when generating the binary's filename.
+ local relver="$(cat "${S}/src/luajit_relver.txt" || die 'error retrieving relver')"
+ dosym luajit-"${VER_CHANNEL}.${relver}" /usr/bin/luajit
HTML_DOCS="doc/." einstalldocs
}
diff --git a/dev-lang/luajit/luajit-2.1.9999999999.ebuild b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
index f4cd0a39d8e1..a27f77162d26 100644
--- a/dev-lang/luajit/luajit-2.1.9999999999.ebuild
+++ b/dev-lang/luajit/luajit-2.1.9999999999.ebuild
@@ -14,19 +14,20 @@ EAPI=8
inherit toolchain-funcs
+# Split release channel (such as "2.1") from relver (such as "1727870382")
+VER_CHANNEL=${PV%.*}
+VER_RELVER=${PV##*.}
+
DESCRIPTION="Just-In-Time Compiler for the Lua programming language"
HOMEPAGE="https://luajit.org/"
-if [[ ${PV} == 2.1.9999999999 ]]; then
- # This is the 2.1 rolling release live build. When a 2.2 or 3.x branch comes
- # out, create a new ebuild for it.
- #
- # Upstream recommends pulling rolling releases from the v2.1 branch.
+if [[ ${VER_RELVER} == 9999999999 ]]; then
+ # Upstream recommends pulling rolling releases from versioned branches.
# > The old git master branch is phased out and stays pinned to the v2.0
# > branch. Please follow the versioned branches instead.
#
# See http://luajit.org/status.html for additional information.
- EGIT_BRANCH="v2.1"
+ EGIT_BRANCH="v${VER_CHANNEL}"
EGIT_REPO_URI="https://luajit.org/git/luajit.git"
inherit git-r3
else
@@ -42,6 +43,7 @@ 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 \
@@ -73,7 +75,22 @@ src_compile() {
src_install() {
_emake install
- dosym luajit-"${PV}" /usr/bin/luajit
+
+ # For tarballs downloaded from github, the relver is provided in
+ # ${S}/.relver, a file populated when generating the tarball as directed by
+ # .gitattributes. That file will contain the same relver as the relver
+ # in our version number.
+ #
+ # For the live build, this is not populated, but luajit's build process
+ # inspects the git repository directly with this command:
+ #
+ # git show -s --format=%ct
+ #
+ # In both cases, luajit puts the relver in src/luajit_relver.txt during
+ # the build. We read this file to ensure we're using the same source of
+ # truth as luajit's own build does when generating the binary's filename.
+ local relver="$(cat "${S}/src/luajit_relver.txt" || die 'error retrieving relver')"
+ dosym luajit-"${VER_CHANNEL}.${relver}" /usr/bin/luajit
HTML_DOCS="doc/." einstalldocs
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-11 21:08:24 +0000