From 7b5e4e1f63da7fb63fba5f1a9fc41866c8ae5b2f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Oct 2022 19:24:36 +0100 Subject: gentoo auto-resync : 07:10:2022 - 19:24:35 --- sys-devel/llvm/Manifest | 6 ++-- sys-devel/llvm/llvm-15.0.2.9999.ebuild | 36 +++++++++---------- sys-devel/llvm/llvm-16.0.0.9999.ebuild | 51 ++++++++++++++++----------- sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild | 51 ++++++++++++++++----------- 4 files changed, 81 insertions(+), 63 deletions(-) (limited to 'sys-devel/llvm') diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index f703da3d6143..3b29185788a6 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -13,8 +13,8 @@ DIST llvm-project-5a0722e0469894564dd9b0ee1d4f8c291d09c776.tar.gz 169164627 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD llvm-13.0.1.ebuild 12256 BLAKE2B 83ef68f6be3b12fa62709fb23820300e6f464f687e326fa82dca6b04c08f6f0271e4f03ff11f16e9e3c4fc43c0ee98180961ef0f6c0f856e1bb4029c7edf2481 SHA512 42fe5df50c6abd3dafefea09a46533a225ba5aa713f791438a546503b62af89f5fc10da9fa470ee7527aed3f6c2d22295ad4c33baec39dd56516ab9327e60ee7 EBUILD llvm-14.0.6-r2.ebuild 12630 BLAKE2B c02086c457a56c1fed1919284cd241325cdcf842f09767f1679e20fe9ffb61e20bb119e90dd3fb1b182720d6db972e0a7a3025b26fc67728af99b8981eb4d3db SHA512 244d61c979ef1187e3036fe066e16d42776375bbf9a0d6e0c08b0dbb0a71d6c44245a1ee5439f60cf5bab573f57d38980d115561a24a3e5f01373a90df2f2429 -EBUILD llvm-15.0.2.9999.ebuild 12509 BLAKE2B 25e2f036db2aa6f4f4bc512267407550e64dfb20f051ec97495c723a0517e9b66ee1fcf90a2481e1f0c37a3b95399da131f139a2d662d5e6648bf82c9dcd1339 SHA512 e1975cfbce9072a28ad9939514a158f3612bf19046f422e01e04ee959dfa6f54a771e6d5d8587d27d988dc77f0256c6a211e80de59c1559a6f91577d4ccc98a8 +EBUILD llvm-15.0.2.9999.ebuild 12616 BLAKE2B 0407ccf4279ea208508d1671fe06cc07cc0209e884f8a440d358e04ab681fec337485a0f4180e6b08bb5cd6a75ce31ffd6c48101b30f76c426bf2bb1e7e1a12a SHA512 922580e53bc68e63cbb053cfd14bfed196fd20c2b8d82c26365cf39d4fab01bbab7d1a7a3372865945d353b3c2ca5428e570d717e6061493ba223896e3fd84ae EBUILD llvm-15.0.2.ebuild 12598 BLAKE2B 2335885f1495582eda8b6568613a2eb29b04be9ffac5a5d48f2708761c31c8c3a5634686dbf01975686e7cf00543265dc822ba57a5eb52afe1920512e58a376d SHA512 486929435d52f45cf4deead80ef7c17cadbc40ba0ac8714db0e58d6249a95f783f905246226380e2ba17617c68c831cd8a66422a6bba6fe63a2cebdc706b04cd -EBUILD llvm-16.0.0.9999.ebuild 12627 BLAKE2B fa766375f04a3741844df87bdd0f30f4c2b84c8e297ccbee034ebecca8523e39bd68cc138cd68689dae4f98fdba407ecab673d25955783c47f41c5a757f9d9e6 SHA512 8331b2567a78c1791a0fa0e9ec396951b747fdd291ca289347ec8f8459d1a12e86d59c9c485a701128111893b3f6724b4a64e5970c92664aab33030a2f2fee9d -EBUILD llvm-16.0.0_pre20221006.ebuild 12627 BLAKE2B fa766375f04a3741844df87bdd0f30f4c2b84c8e297ccbee034ebecca8523e39bd68cc138cd68689dae4f98fdba407ecab673d25955783c47f41c5a757f9d9e6 SHA512 8331b2567a78c1791a0fa0e9ec396951b747fdd291ca289347ec8f8459d1a12e86d59c9c485a701128111893b3f6724b4a64e5970c92664aab33030a2f2fee9d +EBUILD llvm-16.0.0.9999.ebuild 13007 BLAKE2B e653c26c152524a9589d5dcc8ff9859c4fa3a8751d7162ad0d66e1fed5364704dbbbb7ec0fb1a53ec6630847aa36c881252579f86b12904abc566b908bf8052a SHA512 e3f124969ef67456a2e3593e95c91f2592d2370556faa8208cbfefbd5b5669558b453adac0a3d7c389d0994310276805fb12daaed99017008b7691396c3ec242 +EBUILD llvm-16.0.0_pre20221006.ebuild 13007 BLAKE2B e653c26c152524a9589d5dcc8ff9859c4fa3a8751d7162ad0d66e1fed5364704dbbbb7ec0fb1a53ec6630847aa36c881252579f86b12904abc566b908bf8052a SHA512 e3f124969ef67456a2e3593e95c91f2592d2370556faa8208cbfefbd5b5669558b453adac0a3d7c389d0994310276805fb12daaed99017008b7691396c3ec242 MISC metadata.xml 2654 BLAKE2B c27983265b6c9b33200ee42565648f30a6cc9c51be53a1cb82a3353d7c1f7aa9c9501c58254280c2880ff2d4992b4834e4b5e2f1c9b1c60e9b21945f234b9973 SHA512 b331d9186908762907f5713b00e357785b62afbee83afefac8701beb1a20f7ebd68df4a030bb82c6f9164719d4ccfcaf16c189833ad40e9f5900c36247d9cff2 diff --git a/sys-devel/llvm/llvm-15.0.2.9999.ebuild b/sys-devel/llvm/llvm-15.0.2.9999.ebuild index 0adf1193a4ea..010e27a1349e 100644 --- a/sys-devel/llvm/llvm-15.0.2.9999.ebuild +++ b/sys-devel/llvm/llvm-15.0.2.9999.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://llvm.org/" # 4. ConvertUTF.h: TODO. LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="$(ver_cut 1)" +SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" KEYWORDS="" IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3" RESTRICT="!test? ( test )" @@ -43,7 +43,7 @@ BDEPEND=" >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( - =sys-devel/binutils-apple-5.1 ) doc? ( $(python_gen_any_dep ' @@ -60,8 +60,8 @@ RDEPEND=" " PDEPEND=" sys-devel/llvm-common - sys-devel/llvm-toolchain-symlinks:${SLOT} - binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} ) + sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR} + binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} ) " LLVM_COMPONENTS=( llvm cmake third-party ) @@ -342,7 +342,7 @@ multilib_src_configure() { # disable appending VCS revision to the version to improve # direct cache hit ratio -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=OFF @@ -406,7 +406,7 @@ multilib_src_configure() { if llvm_are_manpages_built; then build_docs=ON mycmakeargs+=( - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF ) @@ -425,7 +425,7 @@ multilib_src_configure() { fi if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" + local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" [[ -x "${tblgen}" ]] \ || die "${tblgen} not found or usable" mycmakeargs+=( @@ -452,7 +452,7 @@ multilib_src_configure() { use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" cmake_src_configure - grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=$(ver_cut 1)$" \ + grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \ CMakeCache.txt || die "Incorrect version, did you update _LLVM_MASTER_MAJOR?" multilib_is_native_abi && check_distribution_components @@ -480,7 +480,7 @@ multilib_src_test() { src_install() { local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config + /usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config ) local MULTILIB_WRAPPED_HEADERS=( @@ -491,7 +491,7 @@ src_install() { multilib-minimal_src_install # move wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die } multilib_src_install() { @@ -499,28 +499,28 @@ multilib_src_install() { # move headers to /usr/include for wrapping rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) + LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" ) } multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) + local revord=$(( 9999 - ${LLVM_MAJOR} )) newenvd - "60llvm-${revord}" <<-_EOF_ - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" + PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" + MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" _EOF_ - docompress "/usr/lib/llvm/${SLOT}/share/man" + docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man" llvm_install_manpages } pkg_postinst() { elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" + elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer" elog "To use these scripts, you will need Python along with the following" elog "packages:" elog " dev-python/pygments (for opt-viewer)" diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild index b306d267303c..fef201259b9f 100644 --- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild +++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake llvm.org multilib multilib-minimal pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" @@ -17,7 +17,7 @@ HOMEPAGE="https://llvm.org/" # 4. ConvertUTF.h: TODO. LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="$(ver_cut 1)" +SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" KEYWORDS="" IUSE=" +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar @@ -47,7 +47,7 @@ BDEPEND=" >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( - =sys-devel/binutils-apple-5.1 ) doc? ( $(python_gen_any_dep ' @@ -64,8 +64,8 @@ RDEPEND=" " PDEPEND=" sys-devel/llvm-common - sys-devel/llvm-toolchain-symlinks:${SLOT} - binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} ) + sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR} + binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} ) " LLVM_COMPONENTS=( llvm cmake third-party ) @@ -347,7 +347,7 @@ multilib_src_configure() { # disable appending VCS revision to the version to improve # direct cache hit ratio -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=OFF @@ -385,15 +385,24 @@ multilib_src_configure() { -DOCAMLFIND=NO ) + local suffix= + if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then + # the ABI of the main branch is not stable, so let's include + # the commit id in the SOVERSION to contain the breakage + suffix+="git${EGIT_VERSION::8}" + fi if is_libcxx_linked; then # Smart hack: alter version suffix -> SOVERSION when linking # against libc++. This way we won't end up mixing LLVM libc++ # libraries with libstdc++ clang, and the other way around. + suffix+="+libcxx" mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" -DLLVM_ENABLE_LIBCXX=ON ) fi + mycmakeargs+=( + -DLLVM_VERSION_SUFFIX="${suffix}" + ) # Note: go bindings have no CMake rules at the moment # but let's kill the check in case they are introduced @@ -412,7 +421,7 @@ multilib_src_configure() { if llvm_are_manpages_built; then build_docs=ON mycmakeargs+=( - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF ) @@ -431,7 +440,7 @@ multilib_src_configure() { fi if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" + local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" [[ -x "${tblgen}" ]] \ || die "${tblgen} not found or usable" mycmakeargs+=( @@ -458,7 +467,7 @@ multilib_src_configure() { use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" cmake_src_configure - grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=$(ver_cut 1)$" \ + grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \ CMakeCache.txt || die "Incorrect version, did you update _LLVM_MASTER_MAJOR?" multilib_is_native_abi && check_distribution_components @@ -486,7 +495,7 @@ multilib_src_test() { src_install() { local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config + /usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config ) local MULTILIB_WRAPPED_HEADERS=( @@ -497,7 +506,7 @@ src_install() { multilib-minimal_src_install # move wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die } multilib_src_install() { @@ -505,28 +514,28 @@ multilib_src_install() { # move headers to /usr/include for wrapping rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) + LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" ) } multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) + local revord=$(( 9999 - ${LLVM_MAJOR} )) newenvd - "60llvm-${revord}" <<-_EOF_ - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" + PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" + MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" _EOF_ - docompress "/usr/lib/llvm/${SLOT}/share/man" + docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man" llvm_install_manpages } pkg_postinst() { elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" + elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer" elog "To use these scripts, you will need Python along with the following" elog "packages:" elog " dev-python/pygments (for opt-viewer)" diff --git a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild index b306d267303c..fef201259b9f 100644 --- a/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild +++ b/sys-devel/llvm/llvm-16.0.0_pre20221006.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake llvm.org multilib multilib-minimal pax-utils \ - python-any-r1 toolchain-funcs +inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ + toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="https://llvm.org/" @@ -17,7 +17,7 @@ HOMEPAGE="https://llvm.org/" # 4. ConvertUTF.h: TODO. LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="$(ver_cut 1)" +SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" KEYWORDS="" IUSE=" +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar @@ -47,7 +47,7 @@ BDEPEND=" >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( - =sys-devel/binutils-apple-5.1 ) doc? ( $(python_gen_any_dep ' @@ -64,8 +64,8 @@ RDEPEND=" " PDEPEND=" sys-devel/llvm-common - sys-devel/llvm-toolchain-symlinks:${SLOT} - binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} ) + sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR} + binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} ) " LLVM_COMPONENTS=( llvm cmake third-party ) @@ -347,7 +347,7 @@ multilib_src_configure() { # disable appending VCS revision to the version to improve # direct cache hit ratio -DLLVM_APPEND_VC_REV=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" -DLLVM_LIBDIR_SUFFIX=${libdir#lib} -DBUILD_SHARED_LIBS=OFF @@ -385,15 +385,24 @@ multilib_src_configure() { -DOCAMLFIND=NO ) + local suffix= + if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then + # the ABI of the main branch is not stable, so let's include + # the commit id in the SOVERSION to contain the breakage + suffix+="git${EGIT_VERSION::8}" + fi if is_libcxx_linked; then # Smart hack: alter version suffix -> SOVERSION when linking # against libc++. This way we won't end up mixing LLVM libc++ # libraries with libstdc++ clang, and the other way around. + suffix+="+libcxx" mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" -DLLVM_ENABLE_LIBCXX=ON ) fi + mycmakeargs+=( + -DLLVM_VERSION_SUFFIX="${suffix}" + ) # Note: go bindings have no CMake rules at the moment # but let's kill the check in case they are introduced @@ -412,7 +421,7 @@ multilib_src_configure() { if llvm_are_manpages_built; then build_docs=ON mycmakeargs+=( - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" -DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" -DSPHINX_WARNINGS_AS_ERRORS=OFF ) @@ -431,7 +440,7 @@ multilib_src_configure() { fi if tc-is-cross-compiler; then - local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen" + local tblgen="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" [[ -x "${tblgen}" ]] \ || die "${tblgen} not found or usable" mycmakeargs+=( @@ -458,7 +467,7 @@ multilib_src_configure() { use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" cmake_src_configure - grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=$(ver_cut 1)$" \ + grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \ CMakeCache.txt || die "Incorrect version, did you update _LLVM_MASTER_MAJOR?" multilib_is_native_abi && check_distribution_components @@ -486,7 +495,7 @@ multilib_src_test() { src_install() { local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${SLOT}/bin/llvm-config + /usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config ) local MULTILIB_WRAPPED_HEADERS=( @@ -497,7 +506,7 @@ src_install() { multilib-minimal_src_install # move wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die + mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die } multilib_src_install() { @@ -505,28 +514,28 @@ multilib_src_install() { # move headers to /usr/include for wrapping rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die + mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" ) + LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" ) } multilib_src_install_all() { - local revord=$(( 9999 - ${SLOT} )) + local revord=$(( 9999 - ${LLVM_MAJOR} )) newenvd - "60llvm-${revord}" <<-_EOF_ - PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" + PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" # we need to duplicate it in ROOTPATH for Portage to respect... - ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin" - MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" + MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )" _EOF_ - docompress "/usr/lib/llvm/${SLOT}/share/man" + docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man" llvm_install_manpages } pkg_postinst() { elog "You can find additional opt-viewer utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer" + elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer" elog "To use these scripts, you will need Python along with the following" elog "packages:" elog " dev-python/pygments (for opt-viewer)" -- cgit v1.2.3