diff options
| author | Marcin Deranek <marcin.deranek@booking.com> | 2021-08-14 15:37:18 +0200 |
|---|---|---|
| committer | Marcin Deranek <marcin.deranek@booking.com> | 2021-08-14 15:37:18 +0200 |
| commit | c99ca2a1c90bfebfb96679c2fa98a64bf4513a0f (patch) | |
| tree | 963f8818f8d22671dc1bd16e11aa91e41969fa86 /dev-lang | |
| parent | 0e9eb12e74ba6f82031cd513de1148f5c0cfef73 (diff) | |
| download | portage-c99ca2a1c90bfebfb96679c2fa98a64bf4513a0f.tar.gz portage-c99ca2a1c90bfebfb96679c2fa98a64bf4513a0f.tar.bz2 portage-c99ca2a1c90bfebfb96679c2fa98a64bf4513a0f.zip | |
Sync with Gentoo including a few fixes
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/luajit/Manifest | 3 | ||||
| -rw-r--r-- | dev-lang/luajit/luajit-2.1.9999.ebuild | 33 |
2 files changed, 24 insertions, 12 deletions
diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index 1571243..ec89a26 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -1 +1,2 @@ -EBUILD luajit-2.1.9999.ebuild 1176 BLAKE2B d32e9f050c2a00f118d150a586c21736faa62b27d0e5382d1dce3d4f2f87c1c241955119b7ac7f41a47a4a8fd8ba2f726115f0cc84627ac1204c1b2ce8e679a9 SHA512 fdf55a2b12da42953f3b13f8bff7b577852fd527a7e8713ce7048e0eddb2c013a7e10da714f306dd66234c45990f8f50366fbee8bdd3532f3eb5607cb7cdf92d +EBUILD luajit-2.1.9999.ebuild 1459 BLAKE2B c20388522ee63c18372cfd37dbcadd2fb09737cf0448d21ae67e44b2f3a20af7d7b24b2d0b9050e14aa7baa2cfe7e526d50cf3ad1b5cf16fc702250e8540d990 SHA512 f490c2c2c742f3f2906acd68972881865f569092c01906b7b12a48ca037aac2b58c907c5614fcb8762ddaa55a52bd7e9ab87bfacb5a62dc8243403db5319c322 +MISC metadata.xml 398 BLAKE2B 6941b48638e5d80e8b5d7990494cf19e1d87aeff7bd2df03a15bf044dfd99451a7b42a572a6c818dbbde92ed72499b88820d4f6e8b0f9aa540487b90642f4c91 SHA512 2bf6483f8280d24be5c9358852e165db8c16eb6e46926abcb1fe960d48ec8334a2f28aef45fb62e0a8ddbdf8bb3381f2c64f8128204a9fbed209703fbfd6ef37 diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index 5993d07..be4e333 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -1,52 +1,63 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit pax-utils toolchain-funcs git-r3 -#MY_PV="$(ver_cut 1-4)" -#MY_PV="${MY_PV/_beta/-beta}" -MY_PV="2.1.0-beta3" +MY_PV="$(ver_cut 1-5)" +MY_PV="${MY_PV/_beta/-beta}" +MY_P="LuaJIT-${MY_PV}" DESCRIPTION="Just-In-Time Compiler for the Lua programming language" -HOMEPAGE="http://luajit.org/" +HOMEPAGE="https://luajit.org/" SRC_URI="" -EGIT_REPO_URI="https://luajit.org/git/luajit-2.0.git" +EGIT_REPO_URI="https://luajit.org/git/luajit.git" EGIT_BRANCH="v2.1" +EGIT_CHECKOUT_DIR="${MY_P}" LICENSE="MIT" # this should probably be pkgmoved to 2.0 for sake of consistency. SLOT="2" -KEYWORDS="" +KEYWORDS="~arm64 -hppa -riscv -sparc" IUSE="lua52compat static-libs" +S="${WORKDIR}/${MY_P}" + _emake() { emake \ Q= \ PREFIX="${EPREFIX}/usr" \ MULTILIB="$(get_libdir)" \ DESTDIR="${D}" \ + CFLAGS="" \ + LDFLAGS="" \ HOST_CC="$(tc-getBUILD_CC)" \ + HOST_CFLAGS="${BUILD_CPPFLAGS} ${BUILD_CFLAGS}" \ + HOST_LDFLAGS="${BUILD_LDFLAGS}" \ STATIC_CC="$(tc-getCC)" \ DYNAMIC_CC="$(tc-getCC) -fPIC" \ TARGET_LD="$(tc-getCC)" \ + TARGET_CFLAGS="${CPPFLAGS} ${CFLAGS}" \ + TARGET_LDFLAGS="${LDFLAGS}" \ TARGET_AR="$(tc-getAR) rcus" \ BUILDMODE="$(usex static-libs mixed dynamic)" \ TARGET_STRIP="true" \ - INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ + INSTALL_LIB="${ED}/usr/$(get_libdir)" \ + RELVER=$(ver_cut 3) \ + PREREL= \ "$@" } src_compile() { + tc-export_build_env _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" } -src_install(){ +src_install() { _emake install - dosym "${PN}-${MY_PV}" "/usr/bin/${PN}" - pax-mark m "${ED}usr/bin/luajit-${MY_PV}" + pax-mark m "${ED}/usr/bin/luajit-${MY_PV}" HTML_DOCS="doc/." einstalldocs } |