commit: 175836287f5f0b91f09445dcdcd2f0b340cc7699 Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> AuthorDate: Fri Sep 6 11:56:33 2019 +0000 Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> CommitDate: Mon Sep 9 06:10:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17583628
sci-physics/root: switch back to builtin LLVM Using external LLVM never really worked and can cause crashes if ROOT is used with anything else that dynamically links against LLVM, such as media-libs/mesa[llvm]. The bundled version of clang is also API incompatible with vanilla clang and doesn't work as a compiler with the applied patches that are required to make the cling C/C++ interpreter work. More information can be found in the links below: Bug: https://bugs.gentoo.org/564302 Bug: https://bugs.gentoo.org/687212 Bug: https://sft.its.cern.ch/jira/browse/ROOT-9965 Bug: https://sft.its.cern.ch/jira/browse/ROOT-10287 Bug: https://cern.service-now.com/service-portal/view-incident.do?n=INC1242141 (requires authentication) Bug: https://bugs.freedesktop.org/show_bug.cgi?id=93103 Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1441957 (restricted) Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org> .../root/{root-6.16.00-r3.ebuild => root-6.16.00-r4.ebuild} | 8 ++------ .../root/{root-6.18.00-r2.ebuild => root-6.18.00-r3.ebuild} | 8 ++------ sci-physics/root/root-9999.ebuild | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sci-physics/root/root-6.16.00-r3.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild similarity index 97% rename from sci-physics/root/root-6.16.00-r3.ebuild rename to sci-physics/root/root-6.16.00-r4.ebuild index c57209cefee..ba820931192 100644 --- a/sci-physics/root/root-6.16.00-r3.ebuild +++ b/sci-physics/root/root-6.16.00-r4.ebuild @@ -9,7 +9,7 @@ FORTRAN_NEEDED="fortran" PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - llvm prefix python-single-r1 toolchain-funcs + prefix python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern"; @@ -46,7 +46,6 @@ CDEPEND=" media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= - sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( @@ -113,8 +112,6 @@ PATCHES=( ) pkg_setup() { - LLVM_MAX_SLOT=5 llvm_pkg_setup - use fortran && fortran-2_pkg_setup use python && python-single-r1_pkg_setup @@ -149,7 +146,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")" -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" @@ -161,7 +157,7 @@ src_configure() { -Dgnuinstall=OFF -Dshared=ON -Dsoversion=ON - -Dbuiltin_llvm=OFF + -Dbuiltin_llvm=ON -Dbuiltin_clang=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF diff --git a/sci-physics/root/root-6.18.00-r2.ebuild b/sci-physics/root/root-6.18.00-r3.ebuild similarity index 97% rename from sci-physics/root/root-6.18.00-r2.ebuild rename to sci-physics/root/root-6.18.00-r3.ebuild index 18d23f22fd5..5756097c758 100644 --- a/sci-physics/root/root-6.18.00-r2.ebuild +++ b/sci-physics/root/root-6.18.00-r3.ebuild @@ -9,7 +9,7 @@ FORTRAN_NEEDED="fortran" PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - llvm prefix python-single-r1 toolchain-funcs + prefix python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern"; @@ -45,7 +45,6 @@ CDEPEND=" media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= - sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( @@ -107,8 +106,6 @@ PATCHES=( ) pkg_setup() { - LLVM_MAX_SLOT=5 llvm_pkg_setup - use fortran && fortran-2_pkg_setup use python && python-single-r1_pkg_setup @@ -144,7 +141,6 @@ src_configure() { -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")" -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" @@ -156,7 +152,7 @@ src_configure() { -Dgnuinstall=OFF -Dshared=ON -Dsoversion=ON - -Dbuiltin_llvm=OFF + -Dbuiltin_llvm=ON -Dbuiltin_clang=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index e841fafab73..c1e5b490ea2 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -9,7 +9,7 @@ FORTRAN_NEEDED="fortran" PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit cmake-utils cuda eapi7-ver elisp-common eutils fortran-2 \ - llvm prefix python-single-r1 toolchain-funcs + prefix python-single-r1 toolchain-funcs DESCRIPTION="C++ data analysis framework and interpreter from CERN" HOMEPAGE="https://root.cern"; @@ -57,7 +57,6 @@ CDEPEND=" media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0= - sys-devel/llvm:5= sys-libs/ncurses:= sys-libs/zlib X? ( @@ -118,8 +117,6 @@ PATCHES=( ) pkg_setup() { - LLVM_MAX_SLOT=5 llvm_pkg_setup - use fortran && fortran-2_pkg_setup use python && python-single-r1_pkg_setup @@ -149,7 +146,6 @@ src_configure() { -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) - -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")" -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" @@ -161,7 +157,7 @@ src_configure() { -Dgnuinstall=OFF -Dshared=ON -Dsoversion=ON - -Dbuiltin_llvm=OFF + -Dbuiltin_llvm=ON -Dbuiltin_clang=ON -Dbuiltin_afterimage=OFF -Dbuiltin_cfitsio=OFF
