summaryrefslogtreecommitdiff
path: root/llvm-core
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-12-19 06:30:51 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-12-19 06:30:51 +0000
commitf8bb2d659372d0add11c589dcb006d0b7f8822ae (patch)
tree5d64f4f593db363260360200660abcd8ff00d1c6 /llvm-core
parentf57e008aa126ccdca95f7424e4d24a1a83a49682 (diff)
gentoo auto-resync : 19:12:2024 - 06:30:51HEADmaster
Diffstat (limited to 'llvm-core')
-rw-r--r--llvm-core/Manifest.gzbin2204 -> 2205 bytes
-rw-r--r--llvm-core/clang/Manifest4
-rw-r--r--llvm-core/clang/clang-19.1.6.ebuild2
-rw-r--r--llvm-core/clang/clang-20.0.0.9999.ebuild2
-rw-r--r--llvm-core/lld/Manifest4
-rw-r--r--llvm-core/lld/lld-19.1.6.ebuild5
-rw-r--r--llvm-core/lld/lld-20.0.0.9999.ebuild5
-rw-r--r--llvm-core/lldb/Manifest4
-rw-r--r--llvm-core/lldb/lldb-19.1.6.ebuild7
-rw-r--r--llvm-core/lldb/lldb-20.0.0.9999.ebuild7
10 files changed, 20 insertions, 20 deletions
diff --git a/llvm-core/Manifest.gz b/llvm-core/Manifest.gz
index 487384b22b23..1dacb7322be7 100644
--- a/llvm-core/Manifest.gz
+++ b/llvm-core/Manifest.gz
Binary files differ
diff --git a/llvm-core/clang/Manifest b/llvm-core/clang/Manifest
index 6218e2d0927d..8eda7441463e 100644
--- a/llvm-core/clang/Manifest
+++ b/llvm-core/clang/Manifest
@@ -29,8 +29,8 @@ EBUILD clang-17.0.6.ebuild 12151 BLAKE2B 0b859a5758a1154481d74ad9ac9b357f8d9c111
EBUILD clang-18.1.8-r6.ebuild 12348 BLAKE2B 7de8282b907372ee528cdd7ccddd33173511d7afdfd29f71fab8756ad50cf9d8ffd31e058b09804248dbf5ae32039fefdefdf19ed5c82bcb90da6b93e39a5dda SHA512 8c26142aae44d0a0b2915e52c18a9699992d1fe8290915908766df1791cfecf3cc4579f09983d2fd7e5d52d8d396e3964b31e8bb65050911d4f13b2e0880a21d
EBUILD clang-19.1.4.ebuild 11937 BLAKE2B c4f5811584b91a2614dab6c523e0b85d87802c02094de15ecb147d3bd4b9e2711b4f199e715763a036b33822d657a727d495a8ebd5e453c76532870babf860ab SHA512 2be32758ece476bd72d33a707439a58c68a494a84eed92a4d18de9c72d8ffc4def7e86fe105eff2d4543ae3a0ac762dff722376e0304cdd23808c1d6f70efaf7
EBUILD clang-19.1.5.ebuild 11944 BLAKE2B 13f5ee3a957aa3a7ba0afbb8b80a3a4f9c33c6e49f54c4cb27687aa6a66e5a0e6733f3df66cc96fca3dbd690965dec30f9c067f4496b50a87c019a3f764e8adb SHA512 773c7c55f07d8295163f28a7c4ad7c0dfc46facf3c24a9aa6d3eb77fb2bdf79269ff74fbbf0e5ecb4976691ef5c5bd8ec90d8fadc20b8a24ea78d0e2a835e384
-EBUILD clang-19.1.6.ebuild 11944 BLAKE2B 13f5ee3a957aa3a7ba0afbb8b80a3a4f9c33c6e49f54c4cb27687aa6a66e5a0e6733f3df66cc96fca3dbd690965dec30f9c067f4496b50a87c019a3f764e8adb SHA512 773c7c55f07d8295163f28a7c4ad7c0dfc46facf3c24a9aa6d3eb77fb2bdf79269ff74fbbf0e5ecb4976691ef5c5bd8ec90d8fadc20b8a24ea78d0e2a835e384
-EBUILD clang-20.0.0.9999.ebuild 11866 BLAKE2B eda65bf170c38c46a93c51d1a57fdef86e665da4c0e0e9ed872380d4bd1375b5971460a194572d7ae0e1249d2e92dcb5b499d93328f117a8afabe0a02b194910 SHA512 e6d2522b43b6887fce1321dfa761a211b24f9b44255b1410451bf9439edc932f882a3d9d25bbae3f668d11672a962cf15f419a20b90cd68c15402b2612559c0d
+EBUILD clang-19.1.6.ebuild 11919 BLAKE2B fe634745aa28088663c1a5e212daf5e4780bd86b74996b044d76665c7639402905e8e3ec4b717336b27e5bbf1a1c9f36280c8cec3affa0c1c5fa4ad1edf1ed62 SHA512 1cd6060b474770fa2f15a14026b3df8ece5a1df5f9c965051df272a86e2610679ad0b6007f61270d9cd7f1442f9864cd8730c0ae4b45423ff1966c002fb7dafc
+EBUILD clang-20.0.0.9999.ebuild 11841 BLAKE2B b47a051794d10e2449c819ccdbd80d956af7efc92f4c3e9c6063ae56cb6f9a1bc6ccfdafb2e2e97d036783c66bf17aed02f4cfeac5e882457d4f960a0375d36c SHA512 f9b5e996033b36d8380ca0ee6fb3659c63b568bd6fecf59e545969d0984ceb19645b597b0426ff39cc6c596abc3194474fb9fbb1c756d28d43f14855e56d53f3
EBUILD clang-20.0.0_pre20241207.ebuild 11866 BLAKE2B eda65bf170c38c46a93c51d1a57fdef86e665da4c0e0e9ed872380d4bd1375b5971460a194572d7ae0e1249d2e92dcb5b499d93328f117a8afabe0a02b194910 SHA512 e6d2522b43b6887fce1321dfa761a211b24f9b44255b1410451bf9439edc932f882a3d9d25bbae3f668d11672a962cf15f419a20b90cd68c15402b2612559c0d
EBUILD clang-20.0.0_pre20241215.ebuild 11866 BLAKE2B eda65bf170c38c46a93c51d1a57fdef86e665da4c0e0e9ed872380d4bd1375b5971460a194572d7ae0e1249d2e92dcb5b499d93328f117a8afabe0a02b194910 SHA512 e6d2522b43b6887fce1321dfa761a211b24f9b44255b1410451bf9439edc932f882a3d9d25bbae3f668d11672a962cf15f419a20b90cd68c15402b2612559c0d
MISC metadata.xml 1318 BLAKE2B 704c1a64297b25da1b2e0eec23cbdf4791273da1babf23292160b6163d43438e62fe214df7afa09232893599951918440954c17a9bfa0c6f829a7d706f564192 SHA512 4677ad146739dd41e025a2335eec353a3d35ac8db7482948fee611566d84b41c4e6bdd75bc3d78f8933d4d9818a36bf222e1aa89e52f945501ff918479fea3b6
diff --git a/llvm-core/clang/clang-19.1.6.ebuild b/llvm-core/clang/clang-19.1.6.ebuild
index c994c37fe3eb..3d00c48770d8 100644
--- a/llvm-core/clang/clang-19.1.6.ebuild
+++ b/llvm-core/clang/clang-19.1.6.ebuild
@@ -258,7 +258,7 @@ multilib_src_configure() {
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
- -DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
+ -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
# relative to bindir
-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
diff --git a/llvm-core/clang/clang-20.0.0.9999.ebuild b/llvm-core/clang/clang-20.0.0.9999.ebuild
index e85ebda1b26b..ffc1eb222985 100644
--- a/llvm-core/clang/clang-20.0.0.9999.ebuild
+++ b/llvm-core/clang/clang-20.0.0.9999.ebuild
@@ -257,7 +257,7 @@ multilib_src_configure() {
-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
- -DLLVM_CMAKE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/cmake"
+ -DLLVM_ROOT="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
# relative to bindir
-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
diff --git a/llvm-core/lld/Manifest b/llvm-core/lld/Manifest
index 138a695b9d2f..03f306765f35 100644
--- a/llvm-core/lld/Manifest
+++ b/llvm-core/lld/Manifest
@@ -21,8 +21,8 @@ EBUILD lld-17.0.6.ebuild 2363 BLAKE2B 3702f00318c42fb88eef3722c6ec5f1d51293b9489
EBUILD lld-18.1.8.ebuild 2276 BLAKE2B 7454575fedce90695a0b22d05e14763ab2591d964f2431653e5f1c1a3a86e0f678c356d0d549c7906954ee4881b3bcb1c1ec7facdcd33eff6acf1b24217e742d SHA512 7a96dc2fbf28420ae14aa48b7075f3a0b189ab89ccbd1123cb463f3c0710228b9935d43447ad57f5470bba980d4454e0f980b2e545d76fcf785b6fcc9b1b891e
EBUILD lld-19.1.4.ebuild 2287 BLAKE2B 0df95e45ad69a33384d282a491f51b392f44617ad5ebadfd75394dbb73e60d3b912f00e31d60271c9da7ebf258ec63b92f4a09bb924bafc35e61f00a50550d8e SHA512 2aec86ba5a7060c67f389aa56c6d909a9b6e49bfd3a488edb1c858860de1894c24bafc55124a09eda8ed66a859f0c74f8de58360ca45d8c89e428d1f7b125d8a
EBUILD lld-19.1.5.ebuild 2294 BLAKE2B 255bbea5156dd3e24d53c825a7fd4f6d636ce1d8ba0b557e0e7d68d07dc961a1e3c3f72e04581f234da72714231c51161bb3edd63f36d9fa102c2f17685aa687 SHA512 222be4f05b28c590da1c5ff31c109a208909f68d7382a8f5ef19e740f0c646d967c4d8f01dda7050faf0e26ea0fbf2e50004fb70e97d28ab6ab911298623dfd8
-EBUILD lld-19.1.6.ebuild 2294 BLAKE2B 255bbea5156dd3e24d53c825a7fd4f6d636ce1d8ba0b557e0e7d68d07dc961a1e3c3f72e04581f234da72714231c51161bb3edd63f36d9fa102c2f17685aa687 SHA512 222be4f05b28c590da1c5ff31c109a208909f68d7382a8f5ef19e740f0c646d967c4d8f01dda7050faf0e26ea0fbf2e50004fb70e97d28ab6ab911298623dfd8
-EBUILD lld-20.0.0.9999.ebuild 2197 BLAKE2B 88fe1ffd047add158fc80f80e2afd91edc1a7de6b99653a1e8a193d178c1792ae737edbf076021c76425f0873c14249a51850db9168d95bcff80f457b9dc909a SHA512 900ddf4c79ca20248751cb4e79117a0c3c987e985c9511b7021d0eec4921054a34e1e31b4588e3cfb98f4af123f09c75b799db89e636aae74e7a01819639bdb1
+EBUILD lld-19.1.6.ebuild 2302 BLAKE2B 681f76c0bac1dfa081423b960995153d5ec1cacfe9552989cd6577ce5115b74ef267cfa10dd3f43be5fbda03c1764505828eb9416bd86b59271b59725e1e1c06 SHA512 d27508e239be5bb04228eb7fbb465132d5dc0f35324f8380e3b9eeb58d441331998f83e69d22bc8e4fabfb972e9b7cd865208589a3da49683bba0880bd06a0d6
+EBUILD lld-20.0.0.9999.ebuild 2205 BLAKE2B 4b8050f1ee43d65bd8d5e9c6797b09a9ed96dfbcb2198f8f8d74d709ca1d75786df5ea0a2ba52b009ee63a23fb6a0e76c2d67938b3f9dbd574f4b60192483edd SHA512 8fb7a760501080dd8cedaa9cdd123230973ba13dc26e955a36ec5e3db5084329f0599c7dbf482f99b3db3effdc11ee4fb2dd1daaa8fd173f0ad0ad97355e0313
EBUILD lld-20.0.0_pre20241207.ebuild 2197 BLAKE2B 88fe1ffd047add158fc80f80e2afd91edc1a7de6b99653a1e8a193d178c1792ae737edbf076021c76425f0873c14249a51850db9168d95bcff80f457b9dc909a SHA512 900ddf4c79ca20248751cb4e79117a0c3c987e985c9511b7021d0eec4921054a34e1e31b4588e3cfb98f4af123f09c75b799db89e636aae74e7a01819639bdb1
EBUILD lld-20.0.0_pre20241215.ebuild 2197 BLAKE2B 88fe1ffd047add158fc80f80e2afd91edc1a7de6b99653a1e8a193d178c1792ae737edbf076021c76425f0873c14249a51850db9168d95bcff80f457b9dc909a SHA512 900ddf4c79ca20248751cb4e79117a0c3c987e985c9511b7021d0eec4921054a34e1e31b4588e3cfb98f4af123f09c75b799db89e636aae74e7a01819639bdb1
MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/llvm-core/lld/lld-19.1.6.ebuild b/llvm-core/lld/lld-19.1.6.ebuild
index c0c93823f1c3..17bb40d57eb8 100644
--- a/llvm-core/lld/lld-19.1.6.ebuild
+++ b/llvm-core/lld/lld-19.1.6.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/"
@@ -57,8 +57,6 @@ src_unpack() {
}
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
@@ -66,6 +64,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
-DLLVM_ENABLE_ZLIB=FORCE_ON
diff --git a/llvm-core/lld/lld-20.0.0.9999.ebuild b/llvm-core/lld/lld-20.0.0.9999.ebuild
index d2c02ed66153..bf9436647cb3 100644
--- a/llvm-core/lld/lld-20.0.0.9999.ebuild
+++ b/llvm-core/lld/lld-20.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-any-r1 toolchain-funcs
+inherit cmake flag-o-matic llvm.org python-any-r1 toolchain-funcs
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/"
@@ -56,8 +56,6 @@ src_unpack() {
}
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
@@ -65,6 +63,7 @@ src_configure() {
local mycmakeargs=(
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
-DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
-DLLVM_ENABLE_ZLIB=FORCE_ON
diff --git a/llvm-core/lldb/Manifest b/llvm-core/lldb/Manifest
index 0950bc36b1af..9b5c72711c84 100644
--- a/llvm-core/lldb/Manifest
+++ b/llvm-core/lldb/Manifest
@@ -21,8 +21,8 @@ EBUILD lldb-17.0.6.ebuild 2713 BLAKE2B 9e7fb3435023cdc979113fafc31783202caac3306
EBUILD lldb-18.1.8.ebuild 2639 BLAKE2B 0e034b0e700f2a2fe01829397307d1eb5299032639203de6caab42ba1dafa20afd8e9648e1af2b7f7a8432efb727c7c4267d9b54861949f41a00378ba8f7e002 SHA512 0477301082571f70ba584ee79e0529a1b6de98b826d4c021801d34453c52cc7281ca869ff0adb470cddeca3e6cdfbca2149139edcde603d550757b87f096bec5
EBUILD lldb-19.1.4.ebuild 2616 BLAKE2B c426f8f5c52a347d99f197b543a56bd8b513f431b724a54d422494328b4e32136fb16eefbf89023c7d9d96444f26baa497e4643e0349bc9f5fd7750f955fe120 SHA512 bfbfe146a2fc670e69b3e844c8ee579bbc6eb5d6814c8af180e619811a39d3609ef86b2fad4db718f44b7bd8aba89eb075d3d8f10de858559b767986f4e77b3b
EBUILD lldb-19.1.5.ebuild 2620 BLAKE2B 3ba4f564692b1669a09b91ab5fbdbd92c6cb15858869e2a21f83e95bd16e60fd9cb8acc9b0dbfe1eb4c16fe68687333b4869325c75a4d343192e58a460e7bb83 SHA512 9bec7e21df2a014f815ef01b6bdbd838de7b16460cad2cfb4c62792af56546b970ee37f65ec5fa350c71ad8b15300cb28e7a153aeedd6911155a7a86216927fb
-EBUILD lldb-19.1.6.ebuild 2620 BLAKE2B 3ba4f564692b1669a09b91ab5fbdbd92c6cb15858869e2a21f83e95bd16e60fd9cb8acc9b0dbfe1eb4c16fe68687333b4869325c75a4d343192e58a460e7bb83 SHA512 9bec7e21df2a014f815ef01b6bdbd838de7b16460cad2cfb4c62792af56546b970ee37f65ec5fa350c71ad8b15300cb28e7a153aeedd6911155a7a86216927fb
-EBUILD lldb-20.0.0.9999.ebuild 2579 BLAKE2B 68a4de83ebe123181d8666cdf6e53cffa397036d3f8dc4d9aba6cbd9973c9bc3acaec25d85bc3be9730614155127ea1269f26742db168eedca7f611a736da704 SHA512 c62c3d3e77eb0bf76ee320dfc027cb7561f098cbefd38ae630e20ca25153f951ede1db72a023c6780ef110af0118f131f38f21d31e59a725510e3042cdefe77b
+EBUILD lldb-19.1.6.ebuild 2685 BLAKE2B f73f46ff6f7733944ceb201babc166cea5e720bff3206e26001dcda50f171e109735be812abea5e4acfde634532ada0235ea039af71fff0a03763dc7643e1028 SHA512 58e1f5d38a1619f58e4862827fb9934dfbb317a0e8ea3908f4d78acfa994365e0fff86d0b92c104d9fd5d3b7216a9ebbc7c31afb21f25852572f2a2eafe71ef0
+EBUILD lldb-20.0.0.9999.ebuild 2644 BLAKE2B 7703deeb33b35d0121ceb4693a9baa02f8b587f8e1a2ecaab19a52af627ff6ddba7fc5b913bc9d5929e282d971cfb8f70d9eb1e3ba84524594c42053ae72861a SHA512 5db4f73515da98807ca0a5544b22a0eee7174623614431ccb4267a43dc3823cfaacc2a8e5dc2f116e15414606bbef012855942935561f303bf25ed01e983ebb5
EBUILD lldb-20.0.0_pre20241207.ebuild 2579 BLAKE2B 68a4de83ebe123181d8666cdf6e53cffa397036d3f8dc4d9aba6cbd9973c9bc3acaec25d85bc3be9730614155127ea1269f26742db168eedca7f611a736da704 SHA512 c62c3d3e77eb0bf76ee320dfc027cb7561f098cbefd38ae630e20ca25153f951ede1db72a023c6780ef110af0118f131f38f21d31e59a725510e3042cdefe77b
EBUILD lldb-20.0.0_pre20241215.ebuild 2579 BLAKE2B 68a4de83ebe123181d8666cdf6e53cffa397036d3f8dc4d9aba6cbd9973c9bc3acaec25d85bc3be9730614155127ea1269f26742db168eedca7f611a736da704 SHA512 c62c3d3e77eb0bf76ee320dfc027cb7561f098cbefd38ae630e20ca25153f951ede1db72a023c6780ef110af0118f131f38f21d31e59a725510e3042cdefe77b
MISC metadata.xml 495 BLAKE2B ec88d478d3395663bf03f0a9d2f75bcbabe4eaa63142fbc1851e5a2a4d6519dfa13e401adc1db2bc9fb1456dbe8ac7665a6f675886658478aa394879850f4862 SHA512 f6dd4237b66fc6b6a70c25f5bc67e8734f5c88c15276fe18dd2471075acbbdd14101357d9d3a8bd9eda7c79339b757b751eb300d619c2e3b43348f512ede6ee4
diff --git a/llvm-core/lldb/lldb-19.1.6.ebuild b/llvm-core/lldb/lldb-19.1.6.ebuild
index 7dcc08c2d4d3..dd08468f9d99 100644
--- a/llvm-core/lldb/lldb-19.1.6.ebuild
+++ b/llvm-core/lldb/lldb-19.1.6.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
+inherit cmake flag-o-matic llvm.org python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/"
@@ -53,8 +53,6 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
filter-lto
@@ -62,6 +60,9 @@ src_configure() {
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
local mycmakeargs=(
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
-DLLDB_ENABLE_CURSES=$(usex ncurses)
-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-DLLDB_ENABLE_PYTHON=$(usex python)
diff --git a/llvm-core/lldb/lldb-20.0.0.9999.ebuild b/llvm-core/lldb/lldb-20.0.0.9999.ebuild
index 97524be6f088..06c04e9dfe8a 100644
--- a/llvm-core/lldb/lldb-20.0.0.9999.ebuild
+++ b/llvm-core/lldb/lldb-20.0.0.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm.org llvm-utils python-single-r1
+inherit cmake flag-o-matic llvm.org python-single-r1
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/"
@@ -52,8 +52,6 @@ LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
llvm.org_set_globals
src_configure() {
- llvm_prepend_path "${LLVM_MAJOR}"
-
# bug #858389 (https://github.com/llvm/llvm-project/issues/83636)
filter-lto
@@ -61,6 +59,9 @@ src_configure() {
use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
local mycmakeargs=(
+ -DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+ -DClang_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
-DLLDB_ENABLE_CURSES=$(usex ncurses)
-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-DLLDB_ENABLE_PYTHON=$(usex python)