commit: af79c1ba88221c2e88a0881ac162a0e0599611e2 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> AuthorDate: Tue Aug 6 05:22:48 2019 +0000 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> CommitDate: Tue Aug 6 05:29:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af79c1ba
dev-lang/moarvm: Fix installation to /lib re bug #639538 This fixes the installation of libmoar.so to use /usr/lib64 etc instead of /lib64 This additionally fixes the issue where the installation to /lib64 under EAPI7, for some reason, results in no installation of the .so, as mentioned in bug #504720 Closes: https://bugs.gentoo.org/639538 Bug: https://bugs.gentoo.org/504720 Package-Manager: Portage-2.3.66, Repoman-2.3.16 Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org> ...rvm-2018.12.ebuild => moarvm-2018.06-r1.ebuild} | 8 ++- dev-lang/moarvm/moarvm-2018.06.ebuild | 57 ---------------------- ...rvm-2018.08.ebuild => moarvm-2018.08-r1.ebuild} | 10 ++-- ...rvm-2018.09.ebuild => moarvm-2018.09-r1.ebuild} | 10 ++-- ...rvm-2018.12.ebuild => moarvm-2018.12-r1.ebuild} | 8 ++- ...rvm-2019.03.ebuild => moarvm-2019.03-r1.ebuild} | 8 ++- ...rvm-2019.07.ebuild => moarvm-2019.07-r1.ebuild} | 8 ++- ...2019.07.1.ebuild => moarvm-2019.07.1-r1.ebuild} | 8 ++- dev-lang/moarvm/moarvm-9999.ebuild | 8 ++- 9 files changed, 50 insertions(+), 75 deletions(-) diff --git a/dev-lang/moarvm/moarvm-2018.12.ebuild b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild similarity index 87% copy from dev-lang/moarvm/moarvm-2018.12.ebuild copy to dev-lang/moarvm/moarvm-2018.06-r1.ebuild index de8b1e480a4..a6b22e70714 100644 --- a/dev-lang/moarvm/moarvm-2018.12.ebuild +++ b/dev-lang/moarvm/moarvm-2018.06-r1.ebuild @@ -38,12 +38,16 @@ RESTRICT=test src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix=/usr" + "--prefix=${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir=$(get_libdir)" + "--libdir=${libdir}" "--compiler=$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2018.06.ebuild b/dev-lang/moarvm/moarvm-2018.06.ebuild deleted file mode 100644 index 1e5dbdd984e..00000000000 --- a/dev-lang/moarvm/moarvm-2018.06.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -MY_PN="MoarVM" -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"; - inherit git-r3 - KEYWORDS="" - S="${WORKDIR}/${P}" -else - SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"; - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" -fi - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="http://moarvm.org"; -LICENSE="Artistic-2" -SLOT="0" -IUSE="asan clang debug doc +jit static-libs optimize ubsan" - -RDEPEND="dev-libs/libatomic_ops - dev-libs/libuv - dev-lang/lua:= - virtual/libffi" -DEPEND="${RDEPEND} - clang? ( >=sys-devel/clang-3.1 ) - dev-lang/perl" - -DOCS=( CREDITS README.markdown ) - -# Tests are conducted via nqp -RESTRICT=test - -src_configure() { - use doc && DOCS+=( docs/* ) - local myconfigargs=( - "--prefix=/usr" - "--has-libuv" - "--has-libatomic_ops" - "--has-libffi" - "--libdir=$(get_libdir)" - "--compiler=$(usex clang clang gcc)" - "$(usex asan --asan)" - "$(usex debug --debug --no-debug)" - "$(usex optimize --optimize= --no-optimize)" - "$(usex static-libs --static)" - "$(usex ubsan --ubsan)" - ) - use optimize && filter-flags '-O*' - - perl Configure.pl "${myconfigargs[@]}" || die -} diff --git a/dev-lang/moarvm/moarvm-2018.08.ebuild b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild similarity index 85% rename from dev-lang/moarvm/moarvm-2018.08.ebuild rename to dev-lang/moarvm/moarvm-2018.08-r1.ebuild index 1e5dbdd984e..a6b22e70714 100644 --- a/dev-lang/moarvm/moarvm-2018.08.ebuild +++ b/dev-lang/moarvm/moarvm-2018.08-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,12 +38,16 @@ RESTRICT=test src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix=/usr" + "--prefix=${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir=$(get_libdir)" + "--libdir=${libdir}" "--compiler=$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2018.09.ebuild b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild similarity index 85% rename from dev-lang/moarvm/moarvm-2018.09.ebuild rename to dev-lang/moarvm/moarvm-2018.09-r1.ebuild index 55ae9205a86..a6b22e70714 100644 --- a/dev-lang/moarvm/moarvm-2018.09.ebuild +++ b/dev-lang/moarvm/moarvm-2018.09-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -38,12 +38,16 @@ RESTRICT=test src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix=/usr" + "--prefix=${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir=$(get_libdir)" + "--libdir=${libdir}" "--compiler=$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2018.12.ebuild b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild similarity index 87% rename from dev-lang/moarvm/moarvm-2018.12.ebuild rename to dev-lang/moarvm/moarvm-2018.12-r1.ebuild index de8b1e480a4..a6b22e70714 100644 --- a/dev-lang/moarvm/moarvm-2018.12.ebuild +++ b/dev-lang/moarvm/moarvm-2018.12-r1.ebuild @@ -38,12 +38,16 @@ RESTRICT=test src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix=/usr" + "--prefix=${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir=$(get_libdir)" + "--libdir=${libdir}" "--compiler=$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2019.03.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild similarity index 87% rename from dev-lang/moarvm/moarvm-2019.03.ebuild rename to dev-lang/moarvm/moarvm-2019.03-r1.ebuild index 6acaeabca78..eb788374664 100644 --- a/dev-lang/moarvm/moarvm-2019.03.ebuild +++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild @@ -38,12 +38,16 @@ RESTRICT=test src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix=/usr" + "--prefix=${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir=$(get_libdir)" + "--libdir=${libdir}" "--compiler=$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2019.07.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild similarity index 87% rename from dev-lang/moarvm/moarvm-2019.07.ebuild rename to dev-lang/moarvm/moarvm-2019.07-r1.ebuild index 316046a745e..bc5d5b1fa0a 100644 --- a/dev-lang/moarvm/moarvm-2019.07.ebuild +++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild @@ -43,12 +43,16 @@ PATCHES="${FILESDIR}/fix-quoting.patch" src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT%/}/usr" + local libdir="${EROOT%/}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix" "/usr" + "--prefix" "${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir" "$(get_libdir)" + "--libdir" "${libdir}" "--compiler" "$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-2019.07.1.ebuild b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild similarity index 89% rename from dev-lang/moarvm/moarvm-2019.07.1.ebuild rename to dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild index 575bf022807..2183e45ce3d 100644 --- a/dev-lang/moarvm/moarvm-2019.07.1.ebuild +++ b/dev-lang/moarvm/moarvm-2019.07.1-r1.ebuild @@ -49,12 +49,16 @@ src_prepare() { src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT}/usr" + local libdir="${EROOT}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix" "/usr" + "--prefix" "${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir" "$(get_libdir)" + "--libdir" "${libdir}" "--compiler" "$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)" diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild index 575bf022807..2183e45ce3d 100644 --- a/dev-lang/moarvm/moarvm-9999.ebuild +++ b/dev-lang/moarvm/moarvm-9999.ebuild @@ -49,12 +49,16 @@ src_prepare() { src_configure() { use doc && DOCS+=( docs/* ) + local prefix="${EROOT}/usr" + local libdir="${EROOT}/usr/$(get_libdir)" + einfo "--prefix '${prefix}'" + einfo "--libdir '${libdir}'" local myconfigargs=( - "--prefix" "/usr" + "--prefix" "${prefix}" "--has-libuv" "--has-libatomic_ops" "--has-libffi" - "--libdir" "$(get_libdir)" + "--libdir" "${libdir}" "--compiler" "$(usex clang clang gcc)" "$(usex asan --asan)" "$(usex debug --debug --no-debug)"
