Skip to content

Commit

Permalink
sys-devel/llvm: move dev-lang/perl to BDEPEND wrt #694460
Browse files Browse the repository at this point in the history
dev-lang/perl is a build time dependency of llvm, only during cross
compile it must be run by the host (CBUILD) and not the target (CHOST).
Moving it to BDEPEND solves the issue of dev-lang/perl and friends
getting pulled into the dependency graph as compile time dependencies
during cross compile. BDEPEND has been introduced in EAPI=7, so the fix
is only possible for >=llvm-9.x

Closes: https://bugs.gentoo.org/694460
Signed-off-by: Steffen Kuhn <[email protected]>
Closes: gentoo#12941
Signed-off-by: Michał Górny <[email protected]>
  • Loading branch information
stefson authored and mgorny committed Sep 16, 2019
1 parent 19ee212 commit 17d1001
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sys-devel/llvm/llvm-10.0.0.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ RDEPEND="
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
dev-lang/perl
|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
Expand All @@ -75,6 +74,7 @@ DEPEND="${RDEPEND}
# installed means llvm-config there will take precedence.
RDEPEND="${RDEPEND}
!sys-devel/llvm:0"
BDEPEND="dev-lang/perl"
PDEPEND="sys-devel/llvm-common
gold? ( >=sys-devel/llvmgold-${SLOT} )"

Expand Down
2 changes: 1 addition & 1 deletion sys-devel/llvm/llvm-9.0.0.9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ RDEPEND="
z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${RDEPEND}
dev-lang/perl
|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
Expand All @@ -73,6 +72,7 @@ DEPEND="${RDEPEND}
# installed means llvm-config there will take precedence.
RDEPEND="${RDEPEND}
!sys-devel/llvm:0"
BDEPEND="dev-lang/perl"
PDEPEND="sys-devel/llvm-common
gold? ( >=sys-devel/llvmgold-${SLOT} )"

Expand Down

0 comments on commit 17d1001

Please sign in to comment.