From 5100490af6233af32c49fe6d27fb7dc66b010c4d Mon Sep 17 00:00:00 2001 From: Marcin Deranek Date: Thu, 20 Feb 2020 21:28:40 +0100 Subject: Sync with portage --- dev-lang/luajit/Manifest | 3 +- dev-lang/luajit/files/luac.jit | 32 ---------- dev-lang/luajit/luajit-2.1.9999.ebuild | 107 +++++++-------------------------- 3 files changed, 24 insertions(+), 118 deletions(-) delete mode 100644 dev-lang/luajit/files/luac.jit (limited to 'dev-lang') diff --git a/dev-lang/luajit/Manifest b/dev-lang/luajit/Manifest index 3817a98..db48589 100644 --- a/dev-lang/luajit/Manifest +++ b/dev-lang/luajit/Manifest @@ -1,2 +1 @@ -AUX luac.jit 455 SHA256 9bcc73a9d762823fea1fe1d9f82f1285b932b9345eed13c1bcf725b66e8f4f00 SHA512 af40effccdda9dc4ef2906b284af1d248072bb4d85833da699698bc7dd766e8b5c4cbd082ed583a87129f458e531c71ceac7ef64272fefaee4f4017e16ffda18 WHIRLPOOL 5dccce9b7dc1ccba9c7621b981b15e0e9dcfaf7c3acb18d34fe20ea921c83248049cdabe26eb1b9fa03b6e772fd74ddefeda61e0c6cff6291477fc52c5c4a40d -EBUILD luajit-2.1.9999.ebuild 3178 SHA256 712b661d2c24f483c228450f1f88f7368c6409cc9d0bb21098bbdbd3b40b043b SHA512 e9694393e9eeddb1a427da1c773565666fa1385ae129e09159e10d54909d77e44653ec551d4e5ff26e29e96e25531e38c66086475a2d61a15888687627ebe44e WHIRLPOOL 4c7289f64a6b26e216e716adec7ac4bb920a6ee5958fb0a4034f96b54e116b59f888f400558bfda5f6a2b0343c88e95934ae909a238608a7647c400c233cd059 +EBUILD luajit-2.1.9999.ebuild 1208 BLAKE2B fe2159983909b6177d38ee0643d67ddd61ee9cd8abd9b9aef62c4df76ef6017e328921cb8b8ca30b4b2c57f77651df0153b36f41f3c36f5053c9cdd5325d7731 SHA512 24ba23d3c2cbfc13b0f7c2bdf7894add1d13307e9e17ae594c08e0895681188ca49528b09af087c794f42d0c7e33c633e38bb77a91e3550f3c31323461cb547b diff --git a/dev-lang/luajit/files/luac.jit b/dev-lang/luajit/files/luac.jit deleted file mode 100644 index 2f70064..0000000 --- a/dev-lang/luajit/files/luac.jit +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env sh -help() { - echo "This binary is only wrapper for LuaJIT-not-ready software" - echo "You should use 'luajit -b' if you want to compile bytecode manually." - exit 0; -} - -out="luac.out" -i=1; -if [[ ${#} = 0 ]]; then help; fi -for args in "${@}"; do -case $args in - -o) - shift ${i} - out="${1}" - shift 1 - i=0 - ;; - -v) - luajit -v - exit 0; - ;; - -p) - out="/dev/null" - ;; - --help) - help - ;; -esac -let i=${i}+1 -done; -luajit -b "${@}" "${out}" diff --git a/dev-lang/luajit/luajit-2.1.9999.ebuild b/dev-lang/luajit/luajit-2.1.9999.ebuild index 43e3bb4..c0cb360 100644 --- a/dev-lang/luajit/luajit-2.1.9999.ebuild +++ b/dev-lang/luajit/luajit-2.1.9999.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# $Header: This ebuild is from Lua overlay; Bumped by mva; $ -EAPI="5" +EAPI=6 -inherit base multilib pax-utils versionator toolchain-funcs flag-o-matic check-reqs git-r3 +inherit pax-utils toolchain-funcs versionator git-r3 +#MY_PV="$(get_version_component_range 1-4)" +#MY_PV="${MY_PV/_beta/-beta}" MY_PV="2.1.0-beta3" DESCRIPTION="Just-In-Time Compiler for the Lua programming language" @@ -15,99 +16,37 @@ EGIT_REPO_URI="https://luajit.org/git/luajit-2.0.git" EGIT_BRANCH="v2.1" LICENSE="MIT" +# this should probably be pkgmoved to 2.0 for sake of consistency. SLOT="2" KEYWORDS="" -IUSE="debug lua52compat +optimization" - -HTML_DOCS=( "doc/" ) - -check_req() { - if use optimization; then - CHECKREQS_MEMORY="200M" - ewarn "Optimized (amalgamated) build wants at least 200MB of RAM" - ewarn "If you have no such RAM - try to disable 'optimization' flag" - check-reqs_pkg_${1} - fi -} - -pkg_pretend() { - check_req pretend -} - -pkg_setup() { - check_req setup -} - -src_prepare(){ - # fixing prefix and version - sed -r \ - -e "s|( PREFIX)=.*|\1=/usr|" \ - -e "s|( MULTILIB)=.*|\1=$(get_libdir)|" \ - -i Makefile || die "failed to fix prefix in Makefile" - - use debug && ( - sed -r \ - -e 's/#(CCDEBUG= -g)/\1 -ggdb/' \ - -i src/Makefile || die "Failed to enable debug" - ) -} - -src_compile() { - local opt; - use optimization && opt="amalg"; - - if gcc-fullversion 4 7 3 && gcc-specs-pie && has ccache ${FEATURES}; then - # It is three ways to avoid compilation breaking - # in case, when user use gcc-4.7.3+pie+ccache: - # a) append -fPIC to CFLAGS, to use it even for temporary - # build-time only static host/* bins and luajit binary itself. - # b) append -nopie to LDFLAGS - # (for same binaries and same reason) - # c) disable ccache (even in per-package basis). - # This will slow down amalgamated build, but is prefered and - # recommended by upstream method. - # So, since it is impossible to use method "c" directly from - # ebuild, I choose method "a" - # (since it is more secure on hardened systems, imho) + - # + ewarn user, that he really should disable ccache. - -# append-ldflags -nopie - append-cflags -fPIC - - ewarn "As we detected, that you're using gcc-4.7.3+pie+ccache," - ewarn "we need to either:" - ewarn " a) add -fPIC to CFLAGS, or" - ewarn " b) add -nopie to LDFLAGS, or" - ewarn " c) disable ccache (even on per-package basis)." - ewarn "" - ewarn "We suggest you to use variant 'c' and disable it via" - ewarn "/etc/portage/{,package.}env (read portage manual)" - ewarn "" - ewarn "But, since we can't do that from ebuild, we'll continue" - ewarn "with -fPIC (variant 'a') for now, since it gives more security" - ewarn "on hardened systems (in our opinion)." - ewarn "" - ewarn "But, anyway, we still *HIGHLY* recommend you" - ewarn "to disable ccache instead." - fi +IUSE="lua52compat static-libs" +_emake() { emake \ Q= \ + PREFIX="${EPREFIX}/usr" \ + MULTILIB="$(get_libdir)" \ + DESTDIR="${D}" \ HOST_CC="$(tc-getBUILD_CC)" \ STATIC_CC="$(tc-getCC)" \ DYNAMIC_CC="$(tc-getCC) -fPIC" \ TARGET_LD="$(tc-getCC)" \ TARGET_AR="$(tc-getAR) rcus" \ + BUILDMODE="$(usex static-libs mixed dynamic)" \ TARGET_STRIP="true" \ - XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" \ - "${opt}" + INSTALL_LIB="${ED%/}/usr/$(get_libdir)" \ + "$@" } -src_install() { - default - base_src_install_docs +src_compile() { + _emake XCFLAGS="$(usex lua52compat "-DLUAJIT_ENABLE_LUA52COMPAT" "")" +} + +src_install(){ + _emake install - host-is-pax && pax-mark m "${ED}usr/bin/${PN}-${MY_PV}" dosym "${PN}-${MY_PV}" "/usr/bin/${PN}" - dobin "${FILESDIR}/luac.jit" + pax-mark m "${ED}usr/bin/luajit-${MY_PV}" + + HTML_DOCS="doc/." einstalldocs } -- cgit v1.2.3