Gentoo Archives: gentoo-commits

From: Marco Leise <marco.leise@×××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/dlang:master commit in: dev-lang/ldc2/
Date: Mon, 23 Dec 2019 16:56:39
Message-Id: 1576939606.1d5b5e9126a455a974b6e6c21f6cdee09e952b8f.mleise@gentoo
1 commit: 1d5b5e9126a455a974b6e6c21f6cdee09e952b8f
2 Author: Marco Leise <marco.leise <AT> gmx <DOT> de>
3 AuthorDate: Sat Dec 21 14:46:46 2019 +0000
4 Commit: Marco Leise <marco.leise <AT> gmx <DOT> de>
5 CommitDate: Sat Dec 21 14:46:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/user/dlang.git/commit/?id=1d5b5e91
7
8 Fixes #80: eninja fails in installing phase with ACCESS DENIED
9
10 Signed-off-by: Marco Leise <marco.leise <AT> gmx.de>
11
12 dev-lang/ldc2/ldc2-1.18.0.ebuild | 9 ++++-----
13 1 file changed, 4 insertions(+), 5 deletions(-)
14
15 diff --git a/dev-lang/ldc2/ldc2-1.18.0.ebuild b/dev-lang/ldc2/ldc2-1.18.0.ebuild
16 index 0c75a56..d15013d 100644
17 --- a/dev-lang/ldc2/ldc2-1.18.0.ebuild
18 +++ b/dev-lang/ldc2/ldc2-1.18.0.ebuild
19 @@ -1,9 +1,9 @@
20 # Copyright 1999-2019 Gentoo Authors
21 # Distributed under the terms of the GNU General Public License v2
22
23 -EAPI=6
24 +EAPI=7
25
26 -inherit multilib-build cmake-utils ninja-utils eapi7-ver llvm
27 +inherit multilib-build cmake-utils llvm
28
29 MY_PV="${PV//_/-}"
30 MY_P="ldc-${MY_PV}-src"
31 @@ -54,7 +54,6 @@ d_src_configure() {
32 # Make sure libphobos2 is installed into ldc2's directory.
33 export LIBDIR_${ABI}="${LIBDIR_HOST}"
34 local mycmakeargs=(
35 - -G Ninja
36 -DD_VERSION=2
37 -DCMAKE_INSTALL_PREFIX=/usr/lib/ldc2/$(ver_cut 1-2)
38 -DD_COMPILER="${DMD}"
39 @@ -67,11 +66,11 @@ d_src_configure() {
40 }
41
42 d_src_compile() {
43 - eninja -C "${BUILD_DIR}"
44 + cmake-utils_src_make
45 }
46
47 d_src_install() {
48 - eninja -C "${BUILD_DIR}" install
49 + cmake-utils_src_install
50
51 rm -rf "${ED}"/usr/share/bash-completion
52 }