diff options
Diffstat (limited to 'sys-devel')
28 files changed, 29 insertions, 1894 deletions
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz Binary files differindex 9ebcbce649f6..636549a574a6 100644 --- a/sys-devel/Manifest.gz +++ b/sys-devel/Manifest.gz diff --git a/sys-devel/bison/Manifest b/sys-devel/bison/Manifest index 46770cac1b4e..ac0215f72d70 100644 --- a/sys-devel/bison/Manifest +++ b/sys-devel/bison/Manifest @@ -1,4 +1,4 @@ DIST bison-3.8.2.tar.xz 2817324 BLAKE2B e211b61494c911f55b72a8b70b5a48cdf4000ce9e675a1f1f52735bb8f57d93a3f8075341451263af9c9c531004907ae2b62b1873e7e4664c2cd26fa3b12271c SHA512 d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 DIST bison-3.8.2.tar.xz.sig 195 BLAKE2B b9bd21adb5115d3d3174c94223fbc9cd33afa0e9c1805008e49f77ff154fc2b656d8a9e9503dc5290658ae2948a2ca7c0dbc812f62aec268d8f8bfafb6349096 SHA512 8bb7743ca326e81a6c091b1413e3c09bd43c7eabbb80bac0638ccd52bdf7e3395cce300a86acd95f4637a9ec8a1b0e9a4d3d25d95ab0a8f03e57fd82eb87a7ac -EBUILD bison-3.8.2-r2.ebuild 2638 BLAKE2B 30da89b929d44e35a64251e316e8763219270b3fad380ebd7c1cd22883789485ce0a9f446f2d47b2955263be959bc035d6995d1e0b4eedff761e0202aef6660a SHA512 38e6f43b5fb486678b8d8aab7e0f88fdac6764ec1ae16860cc53c6287fbac0752b91fc247561eb16b79665938728f8fd33bc876703530a4cabeb3495593f212e +EBUILD bison-3.8.2-r2.ebuild 2970 BLAKE2B 7b5796960e076601115965949a9326b17baae2ce95be000c020bd89d98557a0bc7c1fb739b4aced5dc339f27e81e1721957fbc355825e6bbe29d96cdc116cc52 SHA512 87e0f448c0ec4438a5ed5cac410afea9ed1af097da5f72f5e5c4394c3e231dbf53f50c9a73b30d67f4189b04a69ac630e2b5480a98ab47dd5c7f69443451e3a2 MISC metadata.xml 387 BLAKE2B 68154e64265d54f0d48f427088369e7e4757adbecdb4a33a426940cac3d8680ec902460577d2fca55ad4febdf43b5713a0743051b89e7c7a1f918f5e93974152 SHA512 099f1a7dd7e95828cdd44a082d933637db8ba2a787b11791733615e20852ff43228f0744c65e8e552d15a0bcc874690d2ed53a4a1b564f6e923c12475f1b0708 diff --git a/sys-devel/bison/bison-3.8.2-r2.ebuild b/sys-devel/bison/bison-3.8.2-r2.ebuild index bdf5a076c80b..5b827b301fd4 100644 --- a/sys-devel/bison/bison-3.8.2-r2.ebuild +++ b/sys-devel/bison/bison-3.8.2-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -88,6 +88,14 @@ pkg_postinst() { # ensure to preserve the symlinks before app-alternatives/yacc # is installed if [[ ! -h ${EROOT}/usr/bin/yacc ]]; then + if [[ -e ${EROOT}/usr/bin/yacc ]] ; then + # bug #886123 + ewarn "${EROOT}/usr/bin/yacc exists but is not a symlink." + ewarn "This is expected during Prefix bootstrap and unsual otherwise." + ewarn "Moving away unexpected ${EROOT}/usr/bin/yacc to .bak." + mv "${EROOT}/usr/bin/yacc" "${EROOT}/usr/bin/yacc.bak" || die + fi + ln -s yacc.bison "${EROOT}/usr/bin/yacc" || die fi } diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest index 9ba86ab5295e..0b99176d97b4 100644 --- a/sys-devel/clang-common/Manifest +++ b/sys-devel/clang-common/Manifest @@ -7,11 +7,10 @@ DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef -EBUILD clang-common-15.0.6-r1.ebuild 4466 BLAKE2B 7abd03df2be81d2d63631facd99c92c40f9adbc265ea0da860c4dd31ba74fd1bedce28152534a1216f5001702d133840b6aceeaac04e28f417a6ab2bc37bb81c SHA512 c7965d4f162fc7e6ab79afca3c15faabccc7cf783e96cef61caab7cb7bc11a4d5a207dd84829ff04206c99bcceb7a29e225db760134e9d95e437da9e498f1af0 -EBUILD clang-common-15.0.6.9999.ebuild 4382 BLAKE2B f1f02175915bab974fd00560a2f5d2e15c2eddfe73734d98690fbbf9fef8690fdd86aa645e2d9d46818cdf5ad8b20e4466735fc5386c2bc798b610531cb483ff SHA512 486b642fcbe56d28964b4682c9e236d95cf8ea4769c2db6c6c57102a3f7b02a4466e89f4e5a8ca5b0b229d5d458d3fb306bdf92cc08c2dd7f7b973502461b855 +EBUILD clang-common-15.0.6-r1.ebuild 4634 BLAKE2B b687895409fc1b50a1802425e8e545d455652ddc9c40d05fa9de77c1ff306132858b4aad01341380cf738c0d562f3bb060d24d099e650ad30e94f92294e9db93 SHA512 b730aadb11b7a0c71dbf52c7c1077e5abe1ea3fb94613b9fe7bb5673ab8b44a4b4eaaeca9a5106cabbb04d691d58d9a750563f8e4d8ffd4a5752ab93bb9c11d3 EBUILD clang-common-15.0.6.ebuild 3509 BLAKE2B 70910eaf42d62c4e570f87d5eeef778c1457ed37832fd90978992e16437d1af48e70d5393fe4193055d048fea0cde3836782828560b6d65f288b5ed2dc056cdc SHA512 d2a107dde9888e718e087653ddf42d51c39f78ce348d3e9932e3db73ccebee4877aac3fca2ab9fb63028cefda30cd5c764e381b70abbf09e509a1de5f5cf7f44 -EBUILD clang-common-16.0.0.9999.ebuild 4519 BLAKE2B 4e300b5e2f17d1d0dcb77ba9f45eb49c7cbc0f2616d5ffb6be31b3a131c3364921850330ff44e52b8adc0e009a66504ce06c08c223d0e99a1a5b8e12b8757195 SHA512 e353f1e6b69c695d23f85f0c0b542658d3cdb37bb102ab0cf106c81545f03eafaa8d720d31535e37523e276bbdeb31e9c0fd8d9b0754b64404eb8ba15bbe380e +EBUILD clang-common-16.0.0.9999.ebuild 4687 BLAKE2B c96819baa94b958c4bbeb12f5bda0c67324b8db386d8d60e59fd354ce731a25468e2453e7f663335fc893c3de2dbb4b6fc0afe6e5e6bef36fb05e868f4ed6a8f SHA512 28f78ac41c4c53bfa7794a7dd71c2c31ad92830df0e94b73c9c34d91dd8101fb72b539535885e85c9fbb11bd21e6484f90722bf99123832b110e56bd136fd233 EBUILD clang-common-16.0.0_pre20230101-r1.ebuild 4525 BLAKE2B 64b9de66eceb3adf17543dc174250522e6bb894a2b2e74517193a9f9e60f13328976e11d37cf4fefcfbdb4404cd12f0f53e068c91d71d89fe06ef6e197e30ae6 SHA512 9e615c65eea5cc1816dc38ba1c9684a8a9307ec43967ed0a9cc7c65bd68b90d2e5c9b022856e80864478fa75cbab3f95d325b08840762bc5a60e37061c41656f EBUILD clang-common-16.0.0_pre20230101.ebuild 3569 BLAKE2B 5aaee932ed1421cb5dc595d2a236eb84e8df04922625e05c24d8e07f7d00589c9251b0eebaab0dc47858cc1e4206fe26487e9708e824c376b607ab8de09f871d SHA512 f05d7cd43849c81fce6f31c6a97c8122351e87f9a98950edfd6ae9fa32097036be52e31444000e9a1fecd3cf761bfd3d9999842a4f941883dafaedfb657cd946 -EBUILD clang-common-16.0.0_pre20230107.ebuild 4525 BLAKE2B 3356641a6690b5217d9207931fc5e21de62ad9a3d9d52846f15a5f6ceafe1a733684ce16b9d2f91edd735e6a4b2c041c6b7995e4aecb8f744516ad25917fc6d8 SHA512 c4af5d566d26e5c86ed467b932f76280c81ec20b3997e698e38035554be02f5de7188ed5f3c994938c2d07777dda4363527a38ca30f31bf05ada8f4ff08144bc +EBUILD clang-common-16.0.0_pre20230107.ebuild 4693 BLAKE2B 9bffb6fc64bda77d92667bc551e8af427ba3ca26158d09a8e607d57e763024cde1a62a4a495a8865361e64c5315a90cd8ccd71282581e11dea883d23ab8fbab8 SHA512 af3fba47bcf2668c0affd6a08b2fef1dcd04973bf5b4a4d314732728fbcb5c054d312be95c5b30fdf7c1ac740d6b265a97030ad0f673ebe0295919f6ed4bb600 MISC metadata.xml 735 BLAKE2B 12ea133df3d7eb9367a65e572ef91893e654d5b77caa27c66e4b5b41ba90ebc5e619eb78dfff2a67183d2c1cbfcf35fa903b2bb75604ce153d5cedfce5346e3c SHA512 8ed6b12d4f2aa1985897a8d81ce898dbc0d14ac222f3d0f259cbe80fbb8b2349dff7677627daeaf39a422f290200da4fac6348abc81c9e35da0ca73a11cfdd83 diff --git a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild index 7ec66f0dd663..047c2afbd37e 100644 --- a/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild +++ b/sys-devel/clang-common/clang-common-15.0.6-r1.ebuild @@ -91,6 +91,8 @@ src_install() { # Baseline hardening (bug #851111) newins - gentoo-hardened.cfg <<-EOF + # Some of these options are added unconditionally, regardless of + # USE=hardened, for parity with sys-devel/gcc. -fstack-clash-protection -fstack-protector-strong -fPIE @@ -113,6 +115,7 @@ src_install() { if use hardened ; then cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die + # Options below are conditional on USE=hardened. -D_GLIBCXX_ASSERTIONS # Analogue to GLIBCXX_ASSERTIONS diff --git a/sys-devel/clang-common/clang-common-15.0.6.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.6.9999.ebuild deleted file mode 100644 index 709c93681448..000000000000 --- a/sys-devel/clang-common/clang-common-15.0.6.9999.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit bash-completion-r1 llvm.org - -DESCRIPTION="Common files shared between multiple slots of clang" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" -IUSE=" - default-compiler-rt default-libcxx default-lld llvm-libunwind - hardened stricter -" - -PDEPEND=" - sys-devel/clang:* - default-compiler-rt? ( - sys-devel/clang-runtime[compiler-rt] - llvm-libunwind? ( sys-libs/llvm-libunwind ) - !llvm-libunwind? ( sys-libs/libunwind ) - ) - !default-compiler-rt? ( sys-devel/gcc ) - default-libcxx? ( >=sys-libs/libcxx-${PV} ) - !default-libcxx? ( sys-devel/gcc ) - default-lld? ( sys-devel/lld ) - !default-lld? ( sys-devel/binutils ) -" -IDEPEND=" - !default-compiler-rt? ( sys-devel/gcc-config ) - !default-libcxx? ( sys-devel/gcc-config ) -" - -LLVM_COMPONENTS=( clang/utils ) -llvm.org_set_globals - -pkg_pretend() { - [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return - - local flag missing_flags=() - for flag in default-{compiler-rt,libcxx,lld}; do - if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then - missing_flags+=( "${flag}" ) - fi - done - - if [[ ${missing_flags[@]} ]]; then - eerror "It seems that you have the following flags set on sys-devel/clang:" - eerror - eerror " ${missing_flags[*]}" - eerror - eerror "The default runtimes are now set via flags on sys-devel/clang-common." - eerror "The build is being aborted to prevent breakage. Please either set" - eerror "the respective flags on this ebuild, e.g.:" - eerror - eerror " sys-devel/clang-common ${missing_flags[*]}" - eerror - eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1." - die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common" - fi -} - -src_install() { - newbashcomp bash-autocomplete.sh clang - - insinto /etc/clang - newins - gentoo-runtimes.cfg <<-EOF - # This file is initially generated by sys-devel/clang-runtime. - # It is used to control the default runtimes using by clang. - - --rtlib=$(usex default-compiler-rt compiler-rt libgcc) - --unwindlib=$(usex default-compiler-rt libunwind libgcc) - --stdlib=$(usex default-libcxx libc++ libstdc++) - -fuse-ld=$(usex default-lld lld bfd) - EOF - - newins - gentoo-gcc-install.cfg <<-EOF - # This file is maintained by gcc-config. - # It is used to specify the selected GCC installation. - EOF - - newins - gentoo-common.cfg <<-EOF - # This file contains flags common to clang, clang++ and clang-cpp. - @gentoo-runtimes.cfg - @gentoo-gcc-install.cfg - @gentoo-hardened.cfg - EOF - - # Baseline hardening (bug #851111) - newins - gentoo-hardened.cfg <<-EOF - -fstack-clash-protection - -fstack-protector-strong - -fPIE - -include "${ESYSROOT}/usr/include/gentoo/fortify.h" - EOF - - dodir /usr/include/gentoo - - local fortify_level=$(usex hardened 3 2) - # We have to do this because glibc's headers warn if F_S is set - # without optimization and that would at the very least be very noisy - # during builds and at worst trigger many -Werror builds. - cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die - #ifndef _FORTIFY_SOURCE - #if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0 - #define _FORTIFY_SOURCE ${fortify_level} - #endif - #endif - EOF - - if use hardened ; then - cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die - -D_GLIBCXX_ASSERTIONS - - # Analogue to GLIBCXX_ASSERTIONS - # https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode - -D_LIBCPP_ENABLE_ASSERTIONS=1 - EOF - fi - - if use stricter; then - newins - gentoo-stricter.cfg <<-EOF - # This file increases the strictness of older clang versions - # to match the newest upstream version. - - # clang-16 defaults - -Werror=implicit-function-declaration - -Werror=implicit-int - -Werror=incompatible-function-pointer-types - EOF - - cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die - @gentoo-stricter.cfg - EOF - fi - - local tool - for tool in clang{,++,-cpp}; do - newins - "${tool}.cfg" <<-EOF - # This configuration file is used by ${tool} driver. - @gentoo-common.cfg - EOF - done -} - -pkg_preinst() { - if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc - then - local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) - if [[ -n ${gcc_path} ]]; then - cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF - --gcc-install-dir="${gcc_path%%:*}" - EOF - fi - fi -} diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild index 1b9640fcebe0..2fdd5cbe6a13 100644 --- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild @@ -91,6 +91,8 @@ src_install() { # Baseline hardening (bug #851111) newins - gentoo-hardened.cfg <<-EOF + # Some of these options are added unconditionally, regardless of + # USE=hardened, for parity with sys-devel/gcc. -fstack-clash-protection -fstack-protector-strong -fPIE @@ -113,6 +115,7 @@ src_install() { if use hardened ; then cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die + # Options below are conditional on USE=hardened. -D_GLIBCXX_ASSERTIONS # Analogue to GLIBCXX_ASSERTIONS diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild index 9fe06f311bb7..6f1eacac9cc2 100644 --- a/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0_pre20230107.ebuild @@ -91,6 +91,8 @@ src_install() { # Baseline hardening (bug #851111) newins - gentoo-hardened.cfg <<-EOF + # Some of these options are added unconditionally, regardless of + # USE=hardened, for parity with sys-devel/gcc. -fstack-clash-protection -fstack-protector-strong -fPIE @@ -113,6 +115,7 @@ src_install() { if use hardened ; then cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die + # Options below are conditional on USE=hardened. -D_GLIBCXX_ASSERTIONS # Analogue to GLIBCXX_ASSERTIONS diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest index 585a434c449d..7c9884f5a341 100644 --- a/sys-devel/clang-runtime/Manifest +++ b/sys-devel/clang-runtime/Manifest @@ -1,6 +1,5 @@ EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded -EBUILD clang-runtime-15.0.6.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed EBUILD clang-runtime-15.0.6.ebuild 759 BLAKE2B d7b481faffc4da0a6dc1b4e708322cd17cd497dc75363bdb89e7fbb1ecb2aecd9cbf91bdf816505476c7aca2ec7b6fb9ef178705e6b77361d21a7a270404a70a SHA512 8128acfc92b1601e93ffca1fd4233456f8a28fbc4cc65a1782da25df48abd3af82d0128b31f12b966ca02ab1eafcd28016c4443d9c7f1d28bc3f951cfff5e07f EBUILD clang-runtime-16.0.0.9999.ebuild 1369 BLAKE2B a25d32189f78e993706138f339ad0645e3042bd283ddc26b4189c117ea2368d0a1c2b09c2f5f538112bcad65fc14dc0d29f16e4d6ff98e3401c3bdb74d59d750 SHA512 c37860675576d51047f5347400753a19469ea0e2e6ff49a3a5ba6e35f5b33372c06ee2ac1e82aa4a681f35e8c186a1ff8eb25a9eccd0ee35e5ab3d57873f40e0 EBUILD clang-runtime-16.0.0_pre20230101.ebuild 1357 BLAKE2B 8bffc2e195aea4f0c5c13d8f730dbf7cf5afade08d6ca9915addb9a148d4fa28d01331461adc16221840095a8b94d997795e25fb01c68ca6260b24471abd2747 SHA512 cd391453ef4a5ef739d9897b25fc1899062c20e23dbb1bfa4ef33ada3a697ffaedaf6956ba82fd114b8f24a5c8de3d255b5d114c545968f0689bd6cb38b64ba6 diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.6.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.6.9999.ebuild deleted file mode 100644 index e4ff9326ddcb..000000000000 --- a/sys-devel/clang-runtime/clang-runtime-15.0.6.9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib-build - -DESCRIPTION="Meta-ebuild for clang runtime libraries" -HOMEPAGE="https://clang.llvm.org/" - -LICENSE="metapackage" -SLOT="$(ver_cut 1-3)" -KEYWORDS="" -IUSE="+compiler-rt libcxx openmp +sanitize" -REQUIRED_USE="sanitize? ( compiler-rt )" -PROPERTIES="live" - -RDEPEND=" - compiler-rt? ( - ~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?] - sanitize? ( - ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?] - ) - ) - libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] ) - openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] ) -" diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index 6b794718d035..5b8750ffe6bf 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -3,7 +3,6 @@ DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff63 DIST llvm-15.0.6-manpages.tar.bz2 229125 BLAKE2B 926c31b02e295fb2a58056fd75cd04017edcb9b01d23316f002e7d3a00ef77e84d6f04bf8387f1fe9a1d159c7d271248766d3205e747c4e9542bf93f209300da SHA512 94225b46013fab113ecdbe7c150dbb989eae2007c4ed338014fbff7e6e1dd7340eec58c560f22ac1b04df8e14678b33b372c9afd06c10943f099b1a7bb63a048 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c -DIST llvm-gentoo-patchset-15.0.2-r100.tar.xz 15916 BLAKE2B c48afb18c706292d55e028aae2be8f1bc7035ff527ca4f0b32c47d38cbf3022730cc21ca67f921c53d8535fc04c51fdaf63a4810a2c6b519fa33c08116259f30 SHA512 1051a0b2674d2b74c4ac75b734dbaba53507577ce6bd150b0f241b39c9a60b3bd4c420a90dddeee675005633714e5d634684eef22e43fc87e28c1d8c9229e5ee DIST llvm-gentoo-patchset-15.0.6-r1.tar.xz 20344 BLAKE2B ae43aea6ff2989f03f490939f9c05b5bb41d03205037adb4a13c928cede113eb113a5ac8406ef814bd9da21f298d64a9efdbd30adb89a969caad60954b46577e SHA512 c105ba86bd116130ff5aac64ba138c1b83fc50e81dc1293e45e311c64b7d1dfefddb7a8585c3d75091d70e15e1a0a179d8c646416e6a6a159edb12c5dcf59914 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6 @@ -15,7 +14,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b EBUILD clang-15.0.6-r1.ebuild 11954 BLAKE2B 5183c85d6e303ec5dae02e2dab25405b2220b3cc2d1236f0335002a9ca152f2980109a20cd3851ff2ca87225926c7da757dd5602cc6ce57c96b04f81da415ffc SHA512 7273c4de97260b85553664b39bab009215904aba985cb9d0608387aeff093e6c9200ec864fa55079ca09b811112a66b8aae7ed9dda0a40466610eba66f01bba5 -EBUILD clang-15.0.6.9999.ebuild 11887 BLAKE2B 54096f168b831260dd077223240e581562d0f85f2b251108b222e2e44926a67688d0aa7cf3e2ae301691f89e72219f9a61d87ae22c06e8cfbc69625a28a2f967 SHA512 c02594b7a0be16c064fc411ada88330ee124912effd732e7d0d8a5bd6bd8b0a51619ec7a73715f8cd17434dfd4d66c692449b95b70312b6b2386e5548db04307 EBUILD clang-16.0.0.9999.ebuild 11788 BLAKE2B 8571a5582459c195e95af5192b6093c5d705bbace8e1e09bfafb2b5a17cc0d34bb8716f34667d10d0725cf925522b51e7b0bdc5700a3c67f325e5e6f7aa39da4 SHA512 b71cdf2837390bf5dbed87310e221f0618699f1c43d56ca25427d5f27a569debf2cc160902807445ee319ea2216c0b8fe89a827d956d0cf306a548bc21f5ac0a EBUILD clang-16.0.0_pre20230101.ebuild 11888 BLAKE2B bfa7c91e90034714f5ac42ec29c8fa6bfcb82c06bf92a15e374b483089e629d0261d18ea1c66356efed270a28c46aba27a48b98866721aef033c7ae174f4ec8e SHA512 8565434cd90020a51331ca8716a1a65a52a09bb0fed0fa7934600b548ee8cf03fdeef32ddcdee9c6c3b8096f11335674c2e6632354f41c80887a4b8b89c807f3 EBUILD clang-16.0.0_pre20230107.ebuild 11888 BLAKE2B bfa7c91e90034714f5ac42ec29c8fa6bfcb82c06bf92a15e374b483089e629d0261d18ea1c66356efed270a28c46aba27a48b98866721aef033c7ae174f4ec8e SHA512 8565434cd90020a51331ca8716a1a65a52a09bb0fed0fa7934600b548ee8cf03fdeef32ddcdee9c6c3b8096f11335674c2e6632354f41c80887a4b8b89c807f3 diff --git a/sys-devel/clang/clang-15.0.6.9999.ebuild b/sys-devel/clang/clang-15.0.6.9999.ebuild deleted file mode 100644 index d563878ba0b7..000000000000 --- a/sys-devel/clang/clang-15.0.6.9999.ebuild +++ /dev/null @@ -1,467 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake llvm llvm.org multilib multilib-minimal \ - prefix python-single-r1 toolchain-funcs - -DESCRIPTION="C language family frontend for LLVM" -HOMEPAGE="https://llvm.org/" - -# MSVCSetupApi.h: MIT -# sorttable.js: MIT - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" -SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" -KEYWORDS="" -IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -DEPEND=" - ~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}] - static-analyzer? ( dev-lang/perl:* ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) -" - -RDEPEND=" - ${PYTHON_DEPS} - ${DEPEND} - >=sys-devel/clang-common-${PV} -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - doc? ( $(python_gen_cond_dep ' - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) - xml? ( virtual/pkgconfig ) -" -PDEPEND=" - sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR} - ~sys-devel/clang-runtime-${PV} -" - -LLVM_COMPONENTS=( - clang clang-tools-extra cmake - llvm/lib/Transforms/Hello -) -LLVM_MANPAGES=1 -LLVM_TEST_COMPONENTS=( - llvm/lib/Testing/Support - llvm/utils/{lit,llvm-lit,unittest} - llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} -) -LLVM_PATCHSET=15.0.2-r100 -LLVM_USE_TARGETS=llvm -llvm.org_set_globals - -# Multilib notes: -# 1. ABI_* flags control ABIs libclang* is built for only. -# 2. clang is always capable of compiling code for all ABIs for enabled -# target. However, you will need appropriate crt* files (installed -# e.g. by sys-devel/gcc and sys-libs/glibc). -# 3. ${CHOST}-clang wrappers are always installed for all ABIs included -# in the current profile (i.e. alike supported by sys-devel/gcc). -# -# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need -# multilib clang* libraries (not runtime, not wrappers). - -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - # create extra parent dir for relative CLANG_RESOURCE_DIR access - mkdir -p x/y || die - BUILD_DIR=${WORKDIR}/x/y/clang - - llvm.org_src_prepare - - # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch) - eprefixify \ - lib/Lex/InitHeaderSearch.cpp \ - lib/Driver/ToolChains/Darwin.cpp || die -} - -check_distribution_components() { - if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then - local all_targets=() my_targets=() l - cd "${BUILD_DIR}" || die - - while read -r l; do - if [[ ${l} == install-*-stripped:* ]]; then - l=${l#install-} - l=${l%%-stripped*} - - case ${l} in - # meta-targets - clang-libraries|distribution) - continue - ;; - # tools - clang|clangd|clang-*) - ;; - # static libraries - clang*|findAllSymbols) - continue - ;; - # conditional to USE=doc - docs-clang-html|docs-clang-tools-html) - use doc || continue - ;; - esac - - all_targets+=( "${l}" ) - fi - done < <(${NINJA} -t targets all) - - while read -r l; do - my_targets+=( "${l}" ) - done < <(get_distribution_components $"\n") - - local add=() remove=() - for l in "${all_targets[@]}"; do - if ! has "${l}" "${my_targets[@]}"; then - add+=( "${l}" ) - fi - done - for l in "${my_targets[@]}"; do - if ! has "${l}" "${all_targets[@]}"; then - remove+=( "${l}" ) - fi - done - - if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then - eqawarn "get_distribution_components() is outdated!" - eqawarn " Add: ${add[*]}" - eqawarn "Remove: ${remove[*]}" - fi - cd - >/dev/null || die - fi -} - -get_distribution_components() { - local sep=${1-;} - - local out=( - # common stuff - clang-cmake-exports - clang-headers - clang-resource-headers - libclang-headers - - aarch64-resource-headers - arm-common-resource-headers - arm-resource-headers - core-resource-headers - cuda-resource-headers - hexagon-resource-headers - hip-resource-headers - hlsl-resource-headers - mips-resource-headers - opencl-resource-headers - openmp-resource-headers - ppc-htm-resource-headers - ppc-resource-headers - riscv-resource-headers - systemz-resource-headers - utility-resource-headers - ve-resource-headers - webassembly-resource-headers - windows-resource-headers - x86-resource-headers - - # libs - clang-cpp - libclang - ) - - if multilib_is_native_abi; then - out+=( - # common stuff - bash-autocomplete - libclang-python-bindings - - # tools - c-index-test - clang - clang-format - clang-offload-bundler - clang-offload-packager - clang-offload-wrapper - clang-refactor - clang-repl - clang-rename - clang-scan-deps - diagtool - hmaptool - ) - - if use extra; then - out+=( - # extra tools - clang-apply-replacements - clang-change-namespace - clang-doc - clang-include-fixer - clang-move - clang-pseudo - clang-query - clang-reorder-fields - clang-tidy - clang-tidy-headers - clangd - find-all-symbols - modularize - pp-trace - ) - fi - - if llvm_are_manpages_built; then - out+=( docs-clang-man ) - use extra && out+=( docs-clang-tools-man ) - fi - - if use doc; then - out+=( docs-clang-html ) - use extra && out+=( docs-clang-tools-html ) - fi - - use static-analyzer && out+=( - clang-check - clang-extdef-mapping - scan-build - scan-build-py - scan-view - ) - fi - - printf "%s${sep}" "${out[@]}" -} - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man" - -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" - # relative to bindir - -DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_VERSION}" - - -DBUILD_SHARED_LIBS=OFF - -DCLANG_LINK_CLANG_DYLIB=ON - -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) - - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - # these are not propagated reliably, so redefine them - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml) - # libgomp support fails to find headers without explicit -I - # furthermore, it provides only syntax checking - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp - - # disable using CUDA to autodetect GPU, just build for all - -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON - - -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie) - - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) - - -DPython3_EXECUTABLE="${PYTHON}" - ) - - if ! use elibc_musl; then - mycmakeargs+=( - -DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double) - ) - fi - - use test && mycmakeargs+=( - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${BUILD_DIR}/bin/llvm-lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - if multilib_is_native_abi; then - local build_docs=OFF - if llvm_are_manpages_built; then - build_docs=ON - mycmakeargs+=( - -DLLVM_BUILD_DOCS=ON - -DLLVM_ENABLE_SPHINX=ON - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html" - -DSPHINX_WARNINGS_AS_ERRORS=OFF - ) - if use extra; then - mycmakeargs+=( - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra" - ) - fi - fi - mycmakeargs+=( - -DCLANG_INCLUDE_DOCS=${build_docs} - ) - fi - if multilib_native_use extra; then - mycmakeargs+=( - -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra - -DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs} - ) - else - mycmakeargs+=( - -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF - ) - fi - - if [[ -n ${EPREFIX} ]]; then - mycmakeargs+=( - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr" - ) - fi - - if tc-is-cross-compiler; then - [[ -x "/usr/bin/clang-tblgen" ]] \ - || die "/usr/bin/clang-tblgen not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen - ) - fi - - # LLVM can have very high memory consumption while linking, - # exhausting the limit on 32-bit linker executable - use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure - - multilib_is_native_abi && check_distribution_components -} - -multilib_src_compile() { - cmake_build distribution - - # provide a symlink for tests - if [[ ! -L ${WORKDIR}/lib/clang ]]; then - mkdir -p "${WORKDIR}"/lib || die - ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - local test_targets=( check-clang ) - if multilib_native_use extra; then - test_targets+=( - check-clang-tools - check-clangd - ) - fi - cmake_build "${test_targets[@]}" -} - -src_install() { - MULTILIB_WRAPPED_HEADERS=( - /usr/include/clang/Config/config.h - ) - - multilib-minimal_src_install - - # Move runtime headers to /usr/lib/clang, where they belong - mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die - # move (remaining) wrapped headers back - if use extra; then - mv "${T}"/clang-tidy "${ED}"/usr/include/ || die - fi - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die - - # Apply CHOST and version suffix to clang tools - local clang_tools=( clang clang++ clang-cl clang-cpp ) - local abi i - - # cmake gives us: - # - clang-X - # - clang -> clang-X - # - clang++, clang-cl, clang-cpp -> clang - # we want to have: - # - clang-X - # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X - # - clang, clang++, clang-cl, clang-cpp -> clang*-X - # also in CHOST variant - for i in "${clang_tools[@]:1}"; do - rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die - dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}" - dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" - done - - # now create target symlinks for all supported ABIs - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") - for i in "${clang_tools[@]}"; do - dosym "${i}-${LLVM_MAJOR}" \ - "/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}" - dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \ - "/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}" - done - done -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-distribution - - # move headers to /usr/include for wrapping & ABI mismatch checks - # (also drop the version suffix from runtime headers) - rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die - if multilib_native_use extra; then - # don't wrap clang-tidy headers, the list is too long - # (they're fine for non-native ABI but enabling the targets is problematic) - mv "${ED}"/usr/include/clang-tidy "${T}/" || die - fi -} - -multilib_src_install_all() { - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view - fi - - docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man" - llvm_install_manpages - # match 'html' non-compression - use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" - # +x for some reason; TODO: investigate - use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1" -} - -pkg_postinst() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi - - elog "You can find additional utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang" - if use extra; then - elog "Some of them are vim integration scripts (with instructions inside)." - elog "The run-clang-tidy.py script requires the following additional package:" - elog " dev-python/pyyaml" - fi -} - -pkg_postrm() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow clean all - fi -} diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 34cf12afdd19..9d6d6255d581 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,9 +1,5 @@ AUX distcc-3.0-xinetd.patch 558 BLAKE2B a381f2282c71f0eb28dc218cd57a2a914f02ffedad068c8cb7a510ae0cbf0a200de38e2bb31918ce5e10960359e1452365f36393c804984db1054410156e4b61 SHA512 1c0aa31606e1ce828ad52c9fff672d9e13a00494b8a3441095aca101d76f0f296308e359330a85745e2c60533eb1dcf82cea3feff2d0a3154b204d56735f0d14 AUX distcc-3.2_rc1-socks5.patch 5462 BLAKE2B 5c18de909306bf0fa24690fae618c193396f5d27ef77cb9341bda69e3f8319f3b779c760af27cb19e9a6f88a46f02fe888d4bf4fbaef6419beae239964c4ee47 SHA512 707b6ad02bb7ff1507cfbfbb4cee673d5f0dc776006e9b7e801deabccf05c6057b33ea43c6a3ddd1756b8d07ff1d5e3087b635f15285195ba795b8679ebdc860 -AUX distcc-3.3.2-freedesktop.patch 4210 BLAKE2B 7c1500df8cd8568d68c51a3d14eb7240f16adabf9c664b3295171901f4781a9d7b9b9510e577ca0b85abaf21b9783dd9fa98f351089dc98f52f6182bb841c658 SHA512 7454df35d134dff9f5640f7a1a4241b99fe4c6051682af185657837f25cb870c27885ec9be74b5f01075801542decb54daf7db5d80fbdbecf5c8c721a6ee4e7c -AUX distcc-3.3.3-gcc-10-fix.patch 1378 BLAKE2B 4c91ceddba6ed1745ab564a505e354e8b54b59cc73077ac74367e7dbac53aa0953c58a6fd4550253beb183081d739f0b52cdb9f89e376ee425d9d9d34e5ea72d SHA512 cf2ba6b3a840bde6acb4d389e5f8aec6413cc2608d4c9786f4bc6ea746966cbde7653cdfb92b21050f938c36fee2e43722f6b65204878fca1d72ffb6c07ba1e0 -AUX distcc-3.3.3-no-rewrite-chost.patch 895 BLAKE2B 6c8faa72b297403c493cf4ff35455344690e612afe3151d1ac30cc085b947c37eec5d95de8dec948f0f6912b5274306df1192098b54702750e02a4d1dbcf5a72 SHA512 42bc8067911da35c1b35ac03f9ad863201c20289ae3ee36f5d1bcde1ccf3e0190f7f2d089b3f1b076f2a901b806b59b982736f6fd3e10edbadd345364a08d354 -AUX distcc-3.3.3-py38.patch 2129 BLAKE2B a81c190d73ddf8c679640696be9aa66bd0f3095c03af431864cc8e5cba2cf74d2525065c4bd53fc7258dcaeba5a7ed20995b11fe08c8b02164e3cfa520c83819 SHA512 958c099906be21d094bdda04445dbc5471d519e198d7f9c0d619f819978e57dee3ca664a2df048398e551a31cb107ffa7bdcd003ec0c979441440f8dcfb33dc1 AUX distcc-3.4-pump-tests.patch 5922 BLAKE2B 17e755c3a6c04465a6c0be1e2657eb92d3a25e871eb62750d4a379290c01c6939ad55feb76a76b35b66d366aedaa64e4b7d63143be412a93a22448d33c819271 SHA512 8d2a6e5a5ac219fad327919344d68274243337fabd6361ee6355be658e2503d6d3657d8adb285dc40105b0916096bb9b21e93f544fb7342dcf9ac03c70c6a4fc AUX distcc-config 5218 BLAKE2B 41d483481e483217ed6313b4f82ed66c4f006070c269bc5ee1283db9c000d12ab29a90d1813df2a590f87c02520e312c35901a7d3f1364480b68bb02d668d51d SHA512 fe3dee7a89ec16e103b52d3555d483b42e4cbe716e3e77f792c543fb2c82eca5f6b8e0d2809f16c805d55263471108ff2dea1f4a5d55826f67f8b94239aca946 AUX distcc-hardened.patch 1084 BLAKE2B 4b78fce2ab19b3832006a8b0092d3d38df07ce8225eb367c90256a158a41121e09269cd4bf59a1fc450db58eafe09e757f6e3ca4ae074a4567676701228c8289 SHA512 d1150dc83bf89c332f8c0bd01e15f52f95d71868733bd2e5430a5377f1a4aaa2b5b6e0cd488d33d9b94ce18b0eeeadf4af719db536b001b50e4d482b35c7e057 @@ -11,9 +7,6 @@ AUX distccd.confd 1328 BLAKE2B d6a4756afbe7813733227091028e1db570371750bd22dedbf AUX distccd.initd 374 BLAKE2B 48011f19225536311701250470011bc1c1be16f2400831964dd5e28920d4a0c955565a15b5014118e6fa65f4ac12c99d2f2dc6a63c1aa5863b0ef9633953ff82 SHA512 f707bdb15066e4eab4481c6be7e482e81f58586456123b42ddc3e92b0d7973b81975e3670166e20d0814b0c0d7441bec7788e9bd16af5fa9746380895b23bf65 AUX distccd.service-1 234 BLAKE2B 0ab7f90e6f7274fd9fe72df6a58e5323b2d65e91ca8805c549f9f92fa41a3099ea3f0a422270ca0ffe37d682d435da513552e6b7c33617c767909577cc83f85a SHA512 c2aa1b5e0d34c6b8c20d3fb83b8328e6859cefc9f3f98130701f7448fe896f5c80e29091fc4bbab01d1f600c0258b790571d86e7057dc4cfe799b53aef92a1bc AUX distccd.service.conf 186 BLAKE2B b3776e30ded7777be2610f07acec0f70a3cfb7718be149ad5bebd58538add7efead69368020c30610ec33a87ab4d3b3f0123d347f6d0d4abd74f3c714b039955 SHA512 19bf25757ba724ba4e728797b8c6fccabb8b95d2945f0e3c216303a04a4e7470507dcf8535657954f265ed5f067f32dcb3fb6558e9958a86de76b1e66e2b31b6 -DIST distcc-3.3.3.tar.gz 1195666 BLAKE2B b393fdb20eb555dec794bf55c1287dd804a576e0a5db9f2fa84c3924a40185a193231aea807353918430297c9c83c7592aaaafd521cf73c92a72bf30b8a69caa SHA512 d5e7fc67f49ee640cef753038b5c0ebcbbac61c6ac29f20ee4736b045a89979ced765717c46383a4fadc50a4fe34e94e58e307509144414a9ca19eb4cc68a135 DIST distcc-3.4.tar.gz 1239519 BLAKE2B 8dc9baa6b1f65f2bb3621e4e643d7d15d55e2338de4d6a7f20a572d9ec280925b4421a294f40c9fcfba8d4193a6bd1871eb8caf13dd2c2a8a81834671f6bc8bc SHA512 de09329fdfa25e08a9b9529190ddaa9ceccb34c8655692edb86f367a8db4a71b750c6e928cb8e5a670f51fbbc02fd1c8524f72e01b3ebaacc1106dc676d18eef -EBUILD distcc-3.3.3-r3.ebuild 5402 BLAKE2B c4a34731c92f579bd15102a7741b17025cb39b678ed5f55e08eead12c8d9bc97d6ee9f16d49ce33a41b4f0b8e73f189acbb4e731d4948a6a61c003afc88c42f2 SHA512 35f93a143892c10695b74ac72a51345ee8b29baef2a8571db0661c4cb5179dfb27af2483d98f4aa9705424fb99e52608b66dc81d85a341436ceba5b9c27eeb79 EBUILD distcc-3.4-r1.ebuild 5224 BLAKE2B ac97e36e8fc3acf764fda6fd148499ce0c188db29d097d4f75f173886b44e4b6617b5cb683bf85b8943d23532e3e9b1149d877f3ba01a38107b57f91cf2e7a40 SHA512 534c0d4cce5525f32552cdb22ff0e7e797b5f8f0898135ecf87e478afa70519d704e84c896df58501599571504d41de1bb66259a7d93f361fb4176b17f57503f -EBUILD distcc-3.4.ebuild 5119 BLAKE2B 26ad52bb78388b7056b71b8e59379d7984c0e71b6130ca6e246b4bbd96de92e027abcb7f609e6c4700583871cc1dee73f67f050907282d5b5afca75659bea1a0 SHA512 8c60027e0ac98fd7f190d753618ee5bb71b6ea5743de09880871bd725a14ad2dd9c151dc1c2379aabfec024fe0caba5973f0614ca1f4a40a2b54ab65c2f355a6 -MISC metadata.xml 352 BLAKE2B 0fd64221801cd6b1b6a4a9cc0f6ddd0060928bfe270345cbf96b8a1fe6ee546b387652771f086844923a21c6ac7fe8f0aeb76580e6f3983b7fa28863364d0830 SHA512 fc3c1d1c159a607d7caefdd7360797411fa95c280012507acb99de47f1b312dbc78cd8e8cd93e8cfee9d92ad50810e644ce0f3d818785a30bcb760569246c618 +MISC metadata.xml 430 BLAKE2B 6e7c7b3cbb7009bd40528f114ec88491dab2a7d7c50469684298cb9ab816903f2befd5b6c5d6c6c829f768faa896cb4786242a099310a18837011d0433adccad SHA512 7baf41e27b6e8179050dac0c4aefd481ca3d45df1fe848ee6cdfca435739646e5cd647ed0aa8157544c81c27012e68c64e86bda47c9d7464d22828b4d660ce2e diff --git a/sys-devel/distcc/distcc-3.3.3-r3.ebuild b/sys-devel/distcc/distcc-3.3.3-r3.ebuild deleted file mode 100644 index c535bb1a9fe3..000000000000 --- a/sys-devel/distcc/distcc-3.3.3-r3.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools flag-o-matic prefix python-single-r1 systemd \ - toolchain-funcs xdg-utils - -DESCRIPTION="Distribute compilation of C code across several machines on a network" -HOMEPAGE="https://github.com/distcc/distcc" -SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/popt - gssapi? ( net-libs/libgssglue ) - gtk? ( x11-libs/gtk+:2 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) -" -DEPEND="${RDEPEND} - sys-libs/binutils-libs" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig" -RDEPEND+=" - acct-user/distcc - dev-util/shadowman - >=sys-devel/gcc-config-1.4.1 - selinux? ( sec-policy/selinux-distcc ) - xinetd? ( sys-apps/xinetd )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-3.0-xinetd.patch" - # bug #255188 - eapply "${FILESDIR}/${PN}-3.3.2-freedesktop.patch" - # SOCKSv5 support needed for Portage, bug #537616 - eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch" - # backport py3.8 fixes - eapply "${FILESDIR}/${P}-py38.patch" - # gcc-10 fix, #707502 - eapply "${FILESDIR}/${P}-gcc-10-fix.patch" - # unbreak CHOST prefix, https://bugs.gentoo.org/773652 - eapply "${FILESDIR}/${P}-no-rewrite-chost.patch" - eapply_user - - # Bugs #120001, #167844 and probably more. See patch for description. - use hardened && eapply "${FILESDIR}/distcc-hardened.patch" - - sed -i \ - -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ - -e "s:@PYTHON@:${EPYTHON}:" \ - pump.in || die "sed failed" - - sed \ - -e "s:@EPREFIX@:${EPREFIX:-/}:" \ - -e "s:@libdir@:/usr/lib:" \ - "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die - - # TODO: gdb tests fail due to gdb failing to find .c file - sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die - - hprefixify update-distcc-symlinks.py src/{serve,daemon}.c - python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" - eautoreconf -} - -src_configure() { - local myconf=( - --disable-Werror - --libdir=/usr/lib - $(use_enable ipv6 rfc2553) - $(use_with gtk) - --without-gnome - $(use_with gssapi auth) - $(use_with zeroconf avahi) - ) - - econf "${myconf[@]}" -} - -src_test() { - # sandbox breaks some tests, and hangs some too - # retest once #590084 is fixed - local -x SANDBOX_ON=0 - emake -j1 check -} - -src_install() { - # override GZIP_BIN to stop it from compressing manpages - emake -j1 DESTDIR="${D}" GZIP_BIN=false install - python_optimize - - newinitd "${FILESDIR}/distccd.initd" distccd - systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service - systemd_install_serviced "${FILESDIR}/distccd.service.conf" - - cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die - if use zeroconf; then - cat >> "${T}/distccd" <<-EOF || die - - # Enable zeroconf support in distccd - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" - EOF - - sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die - fi - doconfd "${T}/distccd" - - newenvd - 02distcc <<-EOF || die - # This file is managed by distcc-config; use it to change these settings. - # DISTCC_LOG and DISTCC_DIR should not be set. - DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" - DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" - DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" - DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" - DISTCC_SSH="${DISTCC_SSH}" - UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" - DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" - DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" - EOF - - keepdir /usr/lib/distcc - - dobin "${T}/distcc-config" - - if use gtk; then - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" - einfo "This is to have a little sensability in naming schemes between distccmon programs" - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die - dosym distccmon-gui /usr/bin/distccmon-gnome - fi - - if use xinetd; then - insinto /etc/xinetd.d - newins "doc/example/xinetd" distcc - fi - - insinto /usr/share/shadowman/tools - newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" - newins - distccd <<<"${EPREFIX}/usr/lib/distcc" - - rm -r "${ED}/etc/default" || die - rm "${ED}/etc/distcc/clients.allow" || die - rm "${ED}/etc/distcc/commands.allow.sh" || die -} - -pkg_postinst() { - # remove the old paths when switching from libXX to lib - if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ - -d ${EROOT}/usr/$(get_libdir)/distcc ]]; then - rm -r -f "${EROOT}/usr/$(get_libdir)/distcc" || die - fi - - if [[ -z ${ROOT} ]]; then - eselect compiler-shadow update distcc - eselect compiler-shadow update distccd - fi - - elog - elog "Tips on using distcc with Gentoo can be found at" - elog "https://wiki.gentoo.org/wiki/Distcc" - elog - elog "distcc-pump is known to cause breakage with multiple packages." - elog "Do NOT enable it globally." - elog - elog "To use the distccmon programs with Gentoo you should use this command:" - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" - - if use gtk; then - elog "Or:" - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" - fi -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then - eselect compiler-shadow remove distcc - fi -} diff --git a/sys-devel/distcc/distcc-3.4.ebuild b/sys-devel/distcc/distcc-3.4.ebuild deleted file mode 100644 index dc60b2b2ff1e..000000000000 --- a/sys-devel/distcc/distcc-3.4.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit autotools flag-o-matic prefix python-single-r1 systemd \ - toolchain-funcs xdg-utils - -DESCRIPTION="Distribute compilation of C code across several machines on a network" -HOMEPAGE="https://github.com/distcc/distcc" -SRC_URI="https://github.com/distcc/distcc/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="gssapi gtk hardened ipv6 selinux xinetd zeroconf" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-libs/popt - gssapi? ( net-libs/libgssglue ) - gtk? ( x11-libs/gtk+:3 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) -" -DEPEND="${RDEPEND} - sys-libs/binutils-libs" -BDEPEND=" - sys-devel/autoconf-archive - virtual/pkgconfig" -RDEPEND+=" - acct-user/distcc - dev-util/shadowman - >=sys-devel/gcc-config-1.4.1 - selinux? ( sec-policy/selinux-distcc ) - xinetd? ( sys-apps/xinetd )" - -src_prepare() { - eapply "${FILESDIR}/${PN}-3.0-xinetd.patch" - # SOCKSv5 support needed for Portage, bug #537616 - eapply "${FILESDIR}/${PN}-3.2_rc1-socks5.patch" - eapply_user - - # Bugs #120001, #167844 and probably more. See patch for description. - use hardened && eapply "${FILESDIR}/distcc-hardened.patch" - - sed -i \ - -e "/PATH/s:\$distcc_location:${EPREFIX}/usr/lib/distcc/bin:" \ - -e "s:@PYTHON@:${EPYTHON}:" \ - pump.in || die "sed failed" - - sed \ - -e "s:@EPREFIX@:${EPREFIX:-/}:" \ - -e "s:@libdir@:/usr/lib:" \ - "${FILESDIR}/distcc-config" > "${T}/distcc-config" || die - - # TODO: gdb tests fail due to gdb failing to find .c file - sed -i -e '/Gdb.*Case,/d' test/testdistcc.py || die - - hprefixify update-distcc-symlinks.py src/{serve,daemon}.c - python_fix_shebang update-distcc-symlinks.py "${T}/distcc-config" - eautoreconf -} - -src_configure() { - local myconf=( - --disable-Werror - --libdir="${EPREFIX}"/usr/lib - $(use_enable ipv6 rfc2553) - $(use_with gtk) - --without-gnome - $(use_with gssapi auth) - $(use_with zeroconf avahi) - ) - - econf "${myconf[@]}" -} - -src_test() { - # sandbox breaks some tests, and hangs some too - # retest once #590084 is fixed - local -x SANDBOX_ON=0 - emake -j1 check -} - -src_install() { - # override GZIP_BIN to stop it from compressing manpages - emake -j1 DESTDIR="${D}" GZIP_BIN=false install - python_optimize - - newinitd "${FILESDIR}/distccd.initd" distccd - systemd_newunit "${FILESDIR}/distccd.service-1" distccd.service - systemd_install_serviced "${FILESDIR}/distccd.service.conf" - - cp "${FILESDIR}/distccd.confd" "${T}/distccd" || die - if use zeroconf; then - cat >> "${T}/distccd" <<-EOF || die - - # Enable zeroconf support in distccd - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" - EOF - - sed -i '/ExecStart/ s|$| --zeroconf|' "${D}$(systemd_get_systemunitdir)"/distccd.service || die - fi - doconfd "${T}/distccd" - - newenvd - 02distcc <<-EOF || die - # This file is managed by distcc-config; use it to change these settings. - # DISTCC_LOG and DISTCC_DIR should not be set. - DISTCC_VERBOSE="${DISTCC_VERBOSE:-0}" - DISTCC_FALLBACK="${DISTCC_FALLBACK:-1}" - DISTCC_SAVE_TEMPS="${DISTCC_SAVE_TEMPS:-0}" - DISTCC_TCP_CORK="${DISTCC_TCP_CORK}" - DISTCC_SSH="${DISTCC_SSH}" - UNCACHED_ERR_FD="${UNCACHED_ERR_FD}" - DISTCC_ENABLE_DISCREPANCY_EMAIL="${DISTCC_ENABLE_DISCREPANCY_EMAIL}" - DCC_EMAILLOG_WHOM_TO_BLAME="${DCC_EMAILLOG_WHOM_TO_BLAME}" - EOF - - keepdir /usr/lib/distcc - - dobin "${T}/distcc-config" - - if use gtk; then - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" - einfo "This is to have a little sensability in naming schemes between distccmon programs" - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die - dosym distccmon-gui /usr/bin/distccmon-gnome - fi - - if use xinetd; then - insinto /etc/xinetd.d - newins "doc/example/xinetd" distcc - fi - - insinto /usr/share/shadowman/tools - newins - distcc <<<"${EPREFIX}/usr/lib/distcc/bin" - newins - distccd <<<"${EPREFIX}/usr/lib/distcc" - - rm -r "${ED}/etc/default" || die - rm "${ED}/etc/distcc/clients.allow" || die - rm "${ED}/etc/distcc/commands.allow.sh" || die -} - -pkg_postinst() { - # remove the old paths when switching from libXX to lib - if [[ $(get_libdir) != lib && ${SYMLINK_LIB} != yes && \ - -d ${EROOT}/usr/$(get_libdir)/distcc ]]; then - rm -r -f "${EROOT}/usr/$(get_libdir)/distcc" || die - fi - - if [[ -z ${ROOT} ]]; then - eselect compiler-shadow update distcc - eselect compiler-shadow update distccd - fi - - elog - elog "Tips on using distcc with Gentoo can be found at" - elog "https://wiki.gentoo.org/wiki/Distcc" - elog - elog "distcc-pump is known to cause breakage with multiple packages." - elog "Do NOT enable it globally." - elog - elog "To use the distccmon programs with Gentoo you should use this command:" - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-text 5" - - if use gtk; then - elog "Or:" - elog "# DISTCC_DIR=\"${DISTCC_DIR:-${BUILD_PREFIX}/.distcc}\" distccmon-gnome" - fi -} - -pkg_prerm() { - if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]]; then - eselect compiler-shadow remove distcc - fi -} diff --git a/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch b/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch deleted file mode 100644 index 7b735ebec7f9..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.2-freedesktop.patch +++ /dev/null @@ -1,112 +0,0 @@ -From d852c808d6f470031f40edec9ebe980afc69b9b9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Sat, 8 Dec 2018 12:50:07 +0100 -Subject: [PATCH] Fix desktop spec compliance of distccmon-gnome install - ---- - Makefile.in | 18 ++++++++++-------- - gnome/distccmon-gnome.desktop | 7 +++---- - ...mon-gnome-icon.png => distccmon-gnome.png} | Bin - src/mon-gnome.c | 2 +- - 4 files changed, 14 insertions(+), 13 deletions(-) - rename gnome/{distccmon-gnome-icon.png => distccmon-gnome.png} (100%) - -diff --git a/Makefile.in b/Makefile.in -index 6e1e467..1106559 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,13 +52,14 @@ mandir = @mandir@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datarootdir)/pixmaps -+desktopdir = $(datarootdir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DLIBDIR="\"${libdir}\"" -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -387,7 +388,7 @@ man_HTML = man/distcc_1.html man/distccd_1.html man/distccmon_text_1.html \ - man/lsdistcc_1.html man/pump_1.html man/include_server_1.html - MEN = $(man1_MEN) - --gnome_data = gnome/distccmon-gnome-icon.png \ -+gnome_data = gnome/distccmon-gnome.png \ - gnome/distccmon-gnome.desktop - - popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ -@@ -1033,7 +1034,8 @@ showpaths: - @echo " programs $(DESTDIR)$(bindir)" - @echo " sbin programs $(DESTDIR)$(sbindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icon file $(DESTDIR)$(icondir)" -+ @echo " application file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1129,10 +1131,10 @@ install-example: $(example_DOCS) - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) "$(DESTDIR)$(icondir)" -+ $(mkinstalldirs) "$(DESTDIR)$(desktopdir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.png "$(DESTDIR)$(icondir)" -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop "$(DESTDIR)$(desktopdir)" - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff --git a/gnome/distccmon-gnome.desktop b/gnome/distccmon-gnome.desktop -index bd1fa26..7205f5e 100644 ---- a/gnome/distccmon-gnome.desktop -+++ b/gnome/distccmon-gnome.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 -+Version=1.0 - Exec=distccmon-gnome - Name=distcc monitor - Name[sv]=distcc övervakare -@@ -8,9 +7,9 @@ GenericName=Distributed Compile Monitor - GenericName[sv]=Distribuerad kompilerings-övervakare - Comment=Graphical view of distributed compile tasks - Comment[sv]=Grafisk vy av distribuerade kompileringsuppgifter --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;GTK;Development; - StartupNotify=true -diff --git a/gnome/distccmon-gnome-icon.png b/gnome/distccmon-gnome.png -similarity index 100% -rename from gnome/distccmon-gnome-icon.png -rename to gnome/distccmon-gnome.png -diff --git a/src/mon-gnome.c b/src/mon-gnome.c -index 24681d0..bfc286d 100644 ---- a/src/mon-gnome.c -+++ b/src/mon-gnome.c -@@ -599,7 +599,7 @@ static GtkWidget * dcc_gnome_make_mainwin (void) - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome.png", - NULL); - #endif - --- -2.20.0.rc2 - diff --git a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch b/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch deleted file mode 100644 index 2c0bce6c82b6..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-gcc-10-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001 -From: Romain Geissler <romain.geissler@amadeus.com> -Date: Mon, 27 Jan 2020 09:28:43 +0000 -Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf - https://gcc.gnu.org/gcc-10/porting_to.html) - -This fixes the following link error I see when I use the latest gcc 10 -git branch: -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here -collect2: error: ld returned 1 exit status ---- - src/stats.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stats.h b/src/stats.h -index 9bde285..74d4690 100644 ---- a/src/stats.h -+++ b/src/stats.h -@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, - STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, - STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; - --const char *stats_text[20]; -+extern const char *stats_text[20]; - - int dcc_stats_init(void); - void dcc_stats_init_kid(void); diff --git a/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch b/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch deleted file mode 100644 index dafaa90759b4..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-no-rewrite-chost.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c2471d4cf3e2ef2556c150d52860b4e8f04e4994 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Mon, 1 Mar 2021 22:13:36 +0200 -Subject: [PATCH] distcc: fix i686 cross compile - -[mgorny: disable toolchain prefix rewriting code that workarounds some - Debian invention and breaks everything else] - ---- - src/compile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/compile.c b/src/compile.c -index 25df355..e5d655b 100644 ---- a/src/compile.c -+++ b/src/compile.c -@@ -572,7 +572,7 @@ static int dcc_gcc_rewrite_fqn(char **argv) - if (!newcmd) - return -ENOMEM; - -- if ((t = strstr(target_with_vendor, "-pc-"))) { -+ if (0 && (t = strstr(target_with_vendor, "-pc-"))) { - memcpy(newcmd, target_with_vendor, t - target_with_vendor); - strcat(newcmd, t + strlen("-pc")); - } else --- -2.26.2 - diff --git a/sys-devel/distcc/files/distcc-3.3.3-py38.patch b/sys-devel/distcc/files/distcc-3.3.3-py38.patch deleted file mode 100644 index 1ba5fee7d87e..000000000000 --- a/sys-devel/distcc/files/distcc-3.3.3-py38.patch +++ /dev/null @@ -1,53 +0,0 @@ -From c52a023b8a17e4346c66a8fddee69b40b327eae7 Mon Sep 17 00:00:00 2001 -From: MartB <mart.b@outlook.de> -Date: Thu, 28 Nov 2019 21:00:59 +0100 -Subject: [PATCH] Replace time.clock() with time.perf_counter() - -.clock() got removed in python 3.8 and was marked as deprecated since 3.3 -(https://github.com/python/cpython/pull/13270) ---- - include_server/parse_file.py | 4 ++-- - include_server/statistics.py | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/include_server/parse_file.py b/include_server/parse_file.py -index d1dcc74..f5d78b7 100755 ---- a/include_server/parse_file.py -+++ b/include_server/parse_file.py -@@ -272,7 +272,7 @@ def Parse(self, filepath, symbol_table): - - assert isinstance(filepath, str) - self.filepath = filepath -- parse_file_start_time = time.clock() -+ parse_file_start_time = time.perf_counter() - statistics.parse_file_counter += 1 - - includepath_map_index = self.includepath_map.Index -@@ -338,6 +338,6 @@ def Parse(self, filepath, symbol_table): - expr_includes, next_includes) - - -- statistics.parse_file_total_time += time.clock() - parse_file_start_time -+ statistics.parse_file_total_time += time.perf_counter() - parse_file_start_time - - return (quote_includes, angle_includes, expr_includes, next_includes) -diff --git a/include_server/statistics.py b/include_server/statistics.py -index 9677af3..7bc9cb8 100755 ---- a/include_server/statistics.py -+++ b/include_server/statistics.py -@@ -62,13 +62,13 @@ def StartTiming(): - global start_time, translation_unit_counter - """Mark the start of a request to find an include closure.""" - translation_unit_counter += 1 -- start_time = time.clock() -+ start_time = time.perf_counter() - - - def EndTiming(): - """Mark the end of an include closure calculation.""" - global translation_unit_time, min_time, max_time, total_time -- translation_unit_time = time.clock() - start_time -+ translation_unit_time = time.perf_counter() - start_time - min_time = min(translation_unit_time, min_time) - max_time = max(translation_unit_time, max_time) - total_time += translation_unit_time diff --git a/sys-devel/distcc/metadata.xml b/sys-devel/distcc/metadata.xml index b39e2f4ab899..8e23cf8fbb58 100644 --- a/sys-devel/distcc/metadata.xml +++ b/sys-devel/distcc/metadata.xml @@ -8,4 +8,7 @@ <use> <flag name="gssapi">Enable support for <pkg>net-libs/libgssglue</pkg></flag> </use> + <upstream> + <remote-id type="github">distcc/distcc</remote-id> + </upstream> </pkgmetadata> diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest index 4ac47da385fd..467ba8fe17a2 100644 --- a/sys-devel/gdb/Manifest +++ b/sys-devel/gdb/Manifest @@ -6,7 +6,7 @@ DIST gdb-12.1.tar.xz 22470332 BLAKE2B 7f6f853d1640908cf2c79932cdc1ba02549a07721c DIST gdb-weekly-13.0.50.20221217.tar.xz 24801944 BLAKE2B 87c395665bfd5901bdac35d5abc5e2aa206805e7bbe484db7306f4e2b786db0114d442323fb224ae8920c5f13d0c9408dea8f0d0ccb98bacab96db7997df3ede SHA512 734139d50cdd98fa33b2ae473137bc389d5231119ceec99fa4c9004af277a065727a2f5dfa07aa7881f78138a90a7451cbfb87514a7cfd50415b90e369f124b9 DIST gdb-weekly-13.0.90.20230110.tar.xz 24802804 BLAKE2B d13bc0ce3bfd0197be31610385014df815c72a86f34b44beced0882267e8b5eecdd50545a85d84c5648771bb9a01b7e63680a424ad36e4d23c15470af6270f21 SHA512 d0c186c661b4648668213a5210f10d09ccbceb077e9e61a88cb1431e8feae4ad2ce74365024bb5f282f78225e118e808c5df30af9c46c4c368a41d4385f8918f EBUILD gdb-12.1-r2.ebuild 8226 BLAKE2B b2fe4c11d7bfbf0e40405da13fd993b31cb4b6c6c7e1e2b9aebd650bae2d031e13c48086410a084c4374327622d1f3f58a4d605abcaa897fabffbc820b2ff07c SHA512 064a3811457709a61a4c53a0fbbd3d656c3a518232840f75d42df9bdc3e437260deb90423d6eebed0a0a92efb5c407911ec80d0d86606732702b6288ddbf3f22 -EBUILD gdb-12.1-r3.ebuild 8244 BLAKE2B e33d74b051fc95f9ae38021b11e132d0e89bdc0926a1d21aea7d8e2bb94a58fccad7368357873f5f72a811b91d7d5320135589c1542194796e71d989c94929cd SHA512 6e9ec4bb3f1539cae2797d133738755ed468d61d11507263702b7cb8f609a62fe19cabb07612143be76d3c6733364d529ea2041099657ed7fb506c6851152dc0 +EBUILD gdb-12.1-r3.ebuild 8268 BLAKE2B 5db20c3383b95b892b33dfe1eee0578ccfcc87e41b80ebf721b200d929494c19c284062be30a3b90ed8a3730467be757416843c122019ae894379d2692b3a5d1 SHA512 9357725526f2f79b5dafcaa00e2c0ff3a933a25e558b270fa38b2c30377dc43d85ad1f2b4600fcb2d3289c2273834a2b244586ae0a2de1155b0f1ec4de2ebc3b EBUILD gdb-13.0.50_p20221217.ebuild 8302 BLAKE2B 1dec1064650d913aeb135cb0a871936659785c33caad47e373dc5d40f6d9c51d561e869d01baac7d7e272731a177277a61cf5800fd50bbd36ed5269fbe68d906 SHA512 1eab8e31de1366e46ab8eb2d1088e321938cfb917a3fda4e2ba7c095d348fa0afaa60dc36fe5ff66aaa75df4db399a4ded78ec3335c90c9c3b54c9559a9df4dd EBUILD gdb-13.0.90_p20230110.ebuild 8414 BLAKE2B b4538828bdd77f4919c507821fbd45863acf13ee4802a73e49cd585fcdcdf524b999559c2aea1c7b02a1564979b28a2eb2e3029f1b10232dd36e7391281566e0 SHA512 e1c97921aa155840ebaaca7b236b602ce007e4902cae976274c4c9862107e4ece94ac72a0ca9e712b716a0dfabf9d24198fbbc13d83783307a01fefc33da8718 EBUILD gdb-9999.ebuild 8414 BLAKE2B b4538828bdd77f4919c507821fbd45863acf13ee4802a73e49cd585fcdcdf524b999559c2aea1c7b02a1564979b28a2eb2e3029f1b10232dd36e7391281566e0 SHA512 e1c97921aa155840ebaaca7b236b602ce007e4902cae976274c4c9862107e4ece94ac72a0ca9e712b716a0dfabf9d24198fbbc13d83783307a01fefc33da8718 diff --git a/sys-devel/gdb/gdb-12.1-r3.ebuild b/sys-devel/gdb/gdb-12.1-r3.ebuild index 8665f715d490..9cb86c2bb7b8 100644 --- a/sys-devel/gdb/gdb-12.1-r3.ebuild +++ b/sys-devel/gdb/gdb-12.1-r3.ebuild @@ -47,7 +47,7 @@ if [[ ${PV} != 9999* ]] ; then KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi -IUSE="cet guile lzma multitarget nls +python +server source-highlight test vanilla xml xxhash" +IUSE="cet guile lzma multitarget nls +python +server sim source-highlight test vanilla xml xxhash" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # In fact, gdb's test suite needs some work to get passing. @@ -199,6 +199,7 @@ src_configure() { $(use_with xml expat) $(use_with lzma) $(use_enable nls) + $(use_enable sim) $(use_enable source-highlight) $(use multitarget && echo --enable-targets=all) $(use_with python python "${EPYTHON}") diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest index 711d78563989..0de6d3daebae 100644 --- a/sys-devel/lld/Manifest +++ b/sys-devel/lld/Manifest @@ -7,7 +7,6 @@ DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B ba5b56979e55cdcc340294289ad31bcd1f331e4f93a4e76c185eb4a662abeaae0b54af59fd39d9a93d06410d20b0dc5c2600dcfd8d35260b152b2ceb7a3b56a9 SHA512 b3973f16c1973763e523c065016bce46e743c76bfa257d623af86b9231b0732e1b67b695fe6d9deb2ed6534cd8eb37de9de46ab46d3789aa2634bc54e7197657 -EBUILD lld-15.0.6.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698 EBUILD lld-15.0.6.ebuild 2094 BLAKE2B aeec8f68e077b99b19ac53adca8a1d6e4858892fa511834dac8ad7e4f173cda779ef723c4bfcd252aba7d6e04ebbcde9c764496b413208dbaa31ee2b0dd52555 SHA512 028e2be6594734de7d986d02c9d68e2ac3075019fd3752ae6bdbea277d0659c2b4a04ca0e6c7b3228d27193c60b5a91066e69675968ba14e9d29d719a6f244a9 EBUILD lld-16.0.0.9999.ebuild 2029 BLAKE2B 11f5ed949a1bee56186364445e5a64a64b7e4b51c10664cab20dfed1f22e3809ac10a474e1cf0991f38b1d0f47cee8dfbf601af5500480d928a8f186925b1db5 SHA512 7a92f13d78403f0e44781392446e63dd4cbab564872f5156fa53ba7b04eae6ddcb0f7c809e45080dff92bcaf6d1eff1ee8e6dd4991d51c1d6dc0a0c724f7b304 EBUILD lld-16.0.0_pre20230101.ebuild 2029 BLAKE2B d4790c6a33351f4018d7b8e68735ed3319daa0de15cbfa16d258e53cba7da1ef1db96bde5ecd7ecd861e87f4c5d984a1252405f030f1fff4d27fc76d200e3bbf SHA512 a1125b3210877fb03cae6ac1213ceb90cfed451b69f1b646ee6b0a7e47efd0fbfcd017ad3cf5e26274e4b4bceb6d9593d8c25476d83a334a7ef2a35797f667e6 diff --git a/sys-devel/lld/lld-15.0.6.9999.ebuild b/sys-devel/lld/lld-15.0.6.9999.ebuild deleted file mode 100644 index 366775e1368b..000000000000 --- a/sys-devel/lld/lld-15.0.6.9999.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake flag-o-matic llvm llvm.org python-any-r1 - -DESCRIPTION="The LLVM linker (link editor)" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" -KEYWORDS="" -IUSE="debug test" -RESTRICT="!test? ( test )" - -DEPEND=" - ~sys-devel/llvm-${PV} - sys-libs/zlib:= -" -RDEPEND=" - ${DEPEND} - !sys-devel/lld:0 -" -BDEPEND=" - test? ( - >=dev-util/cmake-3.16 - $(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]") - ) -" -PDEPEND=" - >=sys-devel/lld-toolchain-symlinks-15-r2:${LLVM_MAJOR} -" - -LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o ) -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) -llvm.org_set_globals - -python_check_deps() { - python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]" -} - -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - use test && python-any-r1_pkg_setup -} - -src_unpack() { - llvm.org_src_unpack - - # Directory ${WORKDIR}/llvm does not exist with USE="-test", - # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below, - # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system - # (lld/MachO/CMakeLists.txt) and is expected to be resolvable - # to existent directory ${WORKDIR}/libunwind/include. - mkdir -p "${WORKDIR}/llvm" || die -} - -src_configure() { - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - - use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152 - - local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}" - -DBUILD_SHARED_LIBS=ON - -DLLVM_INCLUDE_TESTS=$(usex test) - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - ) - use test && mycmakeargs+=( - -DLLVM_BUILD_TESTS=ON - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DPython3_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure -} - -src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-lld -} diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest index b7bb116ee4f7..94527d748ecb 100644 --- a/sys-devel/llvm-common/Manifest +++ b/sys-devel/llvm-common/Manifest @@ -7,7 +7,6 @@ DIST llvm-project-b20dd2b186fdc76828219b705a2b58f5830f4b9d.tar.gz 175044630 BLAK DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f EBUILD llvm-common-13.0.1.ebuild 607 BLAKE2B 01e55167e8a1a1568105090883f42c0c56c496eaa3ae179d1e44acd1d2f59977a6ce0d4d9c5bbbec38df5afc5cce7aff77a38c1618d415f431c4a413ea90bbf1 SHA512 4a5370e4e43bc5268ab32bcf4ae328890aeeab293da8fe74f3b52504ce57e5adc36de5240ff91e54a35f1f48840df7d821fd94600b1193c676c55590379bb8fe EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f -EBUILD llvm-common-15.0.6.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164 EBUILD llvm-common-15.0.6.ebuild 601 BLAKE2B 3dd38d17640ed52ff0be26db026475a9d0e7e1acebe95043bc6e0e63e32ff4f03c5637a9dcce25987f673962447feb4aa015f8b5b5cb33553dc1a4f843b75399 SHA512 e8a93a72d06810cface48cce2d8f8a890cdf009939a96350a23fe407b064c05a3016c663d11a3866dc2dd0fd87599b5ac234895c8c42c902e9b0cdb37dba7b62 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164 EBUILD llvm-common-16.0.0_pre20230101.ebuild 530 BLAKE2B 8475e3b53197e4d4632f635af86038889c0e93161819f3b655a570f8b3b774f392a786c67320845ca7be620bcd22acfd0349ec9376435deff1f4333c993abeb3 SHA512 2f899fd29442895532c45eb8c97e1bdf19aaef19406382b81ebad16cb9eb6d4181a637a10d090060557f1d0b33dc579828c2c5c5d5ad02d0c5a4a3cca256caef diff --git a/sys-devel/llvm-common/llvm-common-15.0.6.9999.ebuild b/sys-devel/llvm-common/llvm-common-15.0.6.9999.ebuild deleted file mode 100644 index df37476f6fbc..000000000000 --- a/sys-devel/llvm-common/llvm-common-15.0.6.9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit llvm.org - -DESCRIPTION="Common files shared between multiple slots of LLVM" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - !sys-devel/llvm:0 -" - -LLVM_COMPONENTS=( llvm/utils/vim ) -llvm.org_set_globals - -src_install() { - insinto /usr/share/vim/vimfiles - doins -r */ - # some users may find it useful - newdoc README README.vim - dodoc vimrc -} diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 99b8716e9d75..36892e1e874a 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -4,7 +4,6 @@ DIST llvm-15.0.6-manpages.tar.bz2 229125 BLAKE2B 926c31b02e295fb2a58056fd75cd040 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c DIST llvm-gentoo-patchset-15.0.6-r1.tar.xz 20344 BLAKE2B ae43aea6ff2989f03f490939f9c05b5bb41d03205037adb4a13c928cede113eb113a5ac8406ef814bd9da21f298d64a9efdbd30adb89a969caad60954b46577e SHA512 c105ba86bd116130ff5aac64ba138c1b83fc50e81dc1293e45e311c64b7d1dfefddb7a8585c3d75091d70e15e1a0a179d8c646416e6a6a159edb12c5dcf59914 -DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6 DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949 @@ -15,7 +14,6 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b EBUILD llvm-13.0.1.ebuild 12004 BLAKE2B 18e03c138b0626e20f853d747a9198b4e7a075d463ebe430970a7d22b358c0904956a7caf3c6493a8bff33023c8bc6839abdf4e76183e6e1192ad291953be070 SHA512 026c908326d756b1832721443cfc364b0f913ffc4fa28c75ed9a36960fa46773d00aa9399a4dfe9027a4b5d5d4375a31d332319e99c22ee44dc678216825cb96 EBUILD llvm-14.0.6-r2.ebuild 12379 BLAKE2B 4bd06fdd9b1d80271b1a4f9d15e1490366ba93552b27869dbc44102ca83aad332b342842d1336ee7c8cda6be59bad5ddde94786da366aa54526e8d12d830bf79 SHA512 51f33f6bea4c485aac87493fc9ba3653c0b53cec9381d09af1903aba53aa0989018fa1837f4ff90e76cc0650051c7bfe1dcf41478bed034ca472d767c1747b3f EBUILD llvm-15.0.6-r1.ebuild 12550 BLAKE2B 98707805676dc39cae622f39d00c3109dfd8a30fc34c6da38e14e8cf07a948a51d4c306acac2bc3c3f37c84b86f975b1c97601eef71dfe010d2bce182baa382e SHA512 79cf600ab6450d29450df81cd24ad74f4a4ab8bdf9cc75b560dbc1093d11d1b34ae9b1d41b56341cb9bc26891b8c4cbb0ff6cf5560f2292d68134c8bd269bfcc -EBUILD llvm-15.0.6.9999.ebuild 12468 BLAKE2B 2707dd2084950f249c86461d401fff3798ac0cc43d8d1303a4293e8b468eabd334e395afc2993320724036a1c1ad5a4f4ccfb0831d8b9a07b2aef37662225d50 SHA512 f7174f0bf39bb5608bbcbc40fddcb26ef6af1c0567f2164884e934c8e1b7e42850f96cfad968ed8c101b2674ba2ad338ad4eb94f602c647902bc3a57d4745763 EBUILD llvm-16.0.0.9999.ebuild 12342 BLAKE2B eedcd526ae09a0794853832a29e8ab80d5f4d4fa7d7af235d21742fe03a7d4ffcdd8fad0891b192c1546d7e07f37c8aac2ba243e720cf842677a56485f3e2c68 SHA512 666c4fe74b5739c9e158eeef7aa5c7dd1be5acec0decdf2ec761d63caabd8ae2d47dca0ad4d2b13bc6a4660c8abde1bcc6f1b3bb5683235c995939fb858d7b33 EBUILD llvm-16.0.0_pre20230101.ebuild 12348 BLAKE2B 8f85e3586a4759dc88499fc95697f2e1a783af79f5ccd12b0400f0bb6850a60964b7a3d29d8627ff23d719e4e9ccaeca88119885e566d9bb7938fb58e61de74d SHA512 daf29febc07f608202b49002d514e4b08de2e871e907fcd996a3bc583420129d97b9bba65199122bbcf8183ffc2f7dc12abf7e6f582910d30ded4c4ebe5183cd EBUILD llvm-16.0.0_pre20230107.ebuild 12348 BLAKE2B 8f85e3586a4759dc88499fc95697f2e1a783af79f5ccd12b0400f0bb6850a60964b7a3d29d8627ff23d719e4e9ccaeca88119885e566d9bb7938fb58e61de74d SHA512 daf29febc07f608202b49002d514e4b08de2e871e907fcd996a3bc583420129d97b9bba65199122bbcf8183ffc2f7dc12abf7e6f582910d30ded4c4ebe5183cd diff --git a/sys-devel/llvm/llvm-15.0.6.9999.ebuild b/sys-devel/llvm/llvm-15.0.6.9999.ebuild deleted file mode 100644 index da0c1604bb7f..000000000000 --- a/sys-devel/llvm/llvm-15.0.6.9999.ebuild +++ /dev/null @@ -1,521 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..11} ) -inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ - toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="https://llvm.org/" - -# Additional licenses: -# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD. -# 2. xxhash: BSD. -# 3. MD5 code: public-domain. -# 4. ConvertUTF.h: TODO. - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc" -SLOT="${LLVM_MAJOR}/${LLVM_SOABI}" -KEYWORDS="" -IUSE=" - +binutils-plugin debug doc exegesis libedit +libffi ncurses test xar - xml z3 zstd -" -RESTRICT="!test? ( test )" - -RDEPEND=" - sys-libs/zlib:0=[${MULTILIB_USEDEP}] - binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) - exegesis? ( dev-libs/libpfm:= ) - libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) - libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) - xar? ( app-arch/xar ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - binutils-plugin? ( sys-libs/binutils-libs ) -" -BDEPEND=" - ${PYTHON_DEPS} - dev-lang/perl - >=dev-util/cmake-3.16 - sys-devel/gnuconfig - kernel_Darwin? ( - <sys-libs/libcxx-${LLVM_VERSION}.9999 - >=sys-devel/binutils-apple-5.1 - ) - doc? ( $(python_gen_any_dep ' - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') ) - libffi? ( virtual/pkgconfig ) -" -# There are no file collisions between these versions but having :0 -# installed means llvm-config there will take precedence. -RDEPEND=" - ${RDEPEND} - !sys-devel/llvm:0 -" -PDEPEND=" - sys-devel/llvm-common - sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR} - binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} ) -" - -LLVM_COMPONENTS=( llvm cmake third-party ) -LLVM_MANPAGES=1 -LLVM_PATCHSET=9999-r3 -LLVM_USE_TARGETS=provide -llvm.org_set_globals - -python_check_deps() { - use doc || return 0 - - python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" && - python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -check_uptodate() { - local prod_targets=( - $(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \ - | tail -n +2 | head -n -1) - ) - local all_targets=( - lib/Target/*/ - ) - all_targets=( "${all_targets[@]#lib/Target/}" ) - all_targets=( "${all_targets[@]%/}" ) - - local exp_targets=() i - for i in "${all_targets[@]}"; do - has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" ) - done - - if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then - eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}" - eqawarn "Expected: ${exp_targets[*]}" - eqawarn - fi - - if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then - eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!" - eqawarn " Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}" - eqawarn "Expected: ${prod_targets[*]}" - fi -} - -check_distribution_components() { - if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then - local all_targets=() my_targets=() l - cd "${BUILD_DIR}" || die - - while read -r l; do - if [[ ${l} == install-*-stripped:* ]]; then - l=${l#install-} - l=${l%%-stripped*} - - case ${l} in - # shared libs - LLVM|LLVMgold) - ;; - # TableGen lib + deps - LLVMDemangle|LLVMSupport|LLVMTableGen) - ;; - # static libs - LLVM*) - continue - ;; - # meta-targets - distribution|llvm-libraries) - continue - ;; - # used only w/ USE=doc - docs-llvm-html) - use doc || continue - ;; - esac - - all_targets+=( "${l}" ) - fi - done < <(${NINJA} -t targets all) - - while read -r l; do - my_targets+=( "${l}" ) - done < <(get_distribution_components $"\n") - - local add=() remove=() - for l in "${all_targets[@]}"; do - if ! has "${l}" "${my_targets[@]}"; then - add+=( "${l}" ) - fi - done - for l in "${my_targets[@]}"; do - if ! has "${l}" "${all_targets[@]}"; then - remove+=( "${l}" ) - fi - done - - if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then - eqawarn "get_distribution_components() is outdated!" - eqawarn " Add: ${add[*]}" - eqawarn "Remove: ${remove[*]}" - fi - cd - >/dev/null || die - fi -} - -src_prepare() { - # disable use of SDK on OSX, bug #568758 - sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die - - # Update config.guess to support more systems - cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die - - # Verify that the ebuild is up-to-date - check_uptodate - - llvm.org_src_prepare -} - -get_distribution_components() { - local sep=${1-;} - - local out=( - # shared libs - LLVM - LTO - Remarks - - # tools - llvm-config - - # common stuff - cmake-exports - llvm-headers - - # libraries needed for clang-tblgen - LLVMDemangle - LLVMSupport - LLVMTableGen - ) - - if multilib_is_native_abi; then - out+=( - # utilities - llvm-tblgen - FileCheck - llvm-PerfectShuffle - count - not - yaml-bench - UnicodeNameMappingGenerator - - # tools - bugpoint - dsymutil - llc - lli - lli-child-target - llvm-addr2line - llvm-ar - llvm-as - llvm-bcanalyzer - llvm-bitcode-strip - llvm-c-test - llvm-cat - llvm-cfi-verify - llvm-config - llvm-cov - llvm-cvtres - llvm-cxxdump - llvm-cxxfilt - llvm-cxxmap - llvm-debuginfod - llvm-debuginfod-find - llvm-diff - llvm-dis - llvm-dlltool - llvm-dwarfdump - llvm-dwarfutil - llvm-dwp - llvm-exegesis - llvm-extract - llvm-gsymutil - llvm-ifs - llvm-install-name-tool - llvm-jitlink - llvm-jitlink-executor - llvm-lib - llvm-libtool-darwin - llvm-link - llvm-lipo - llvm-lto - llvm-lto2 - llvm-mc - llvm-mca - llvm-ml - llvm-modextract - llvm-mt - llvm-nm - llvm-objcopy - llvm-objdump - llvm-opt-report - llvm-otool - llvm-pdbutil - llvm-profdata - llvm-profgen - llvm-ranlib - llvm-rc - llvm-readelf - llvm-readobj - llvm-reduce - llvm-remark-size-diff - llvm-rtdyld - llvm-sim - llvm-size - llvm-split - llvm-stress - llvm-strings - llvm-strip - llvm-symbolizer - llvm-tapi-diff - llvm-tli-checker - llvm-undname - llvm-windres - llvm-xray - obj2yaml - opt - sancov - sanstats - split-file - verify-uselistorder - yaml2obj - - # python modules - opt-viewer - ) - - if llvm_are_manpages_built; then - out+=( - # manpages - docs-dsymutil-man - docs-llvm-dwarfdump-man - docs-llvm-man - ) - fi - use doc && out+=( - docs-llvm-html - ) - - use binutils-plugin && out+=( - LLVMgold - ) - fi - - printf "%s${sep}" "${out[@]}" -} - -multilib_src_configure() { - local ffi_cflags ffi_ldflags - if use libffi; then - ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi) - ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi) - fi - - local libdir=$(get_libdir) - local mycmakeargs=( - # 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/${LLVM_MAJOR}" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - - -DBUILD_SHARED_LIBS=OFF - -DLLVM_BUILD_LLVM_DYLIB=ON - -DLLVM_LINK_LLVM_DYLIB=ON - -DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components) - - # cheap hack: LLVM combines both anyway, and the only difference - # is that the former list is explicitly verified at cmake time - -DLLVM_TARGETS_TO_BUILD="" - -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" - -DLLVM_BUILD_TESTS=$(usex test) - - -DLLVM_ENABLE_FFI=$(usex libffi) - -DLLVM_ENABLE_LIBEDIT=$(usex libedit) - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - -DLLVM_ENABLE_LIBXML2=$(usex xml) - -DLLVM_ENABLE_ASSERTIONS=$(usex debug) - -DLLVM_ENABLE_LIBPFM=$(usex exegesis) - -DLLVM_ENABLE_EH=ON - -DLLVM_ENABLE_RTTI=ON - -DLLVM_ENABLE_Z3_SOLVER=$(usex z3) - -DLLVM_ENABLE_ZSTD=$(usex zstd) - - -DLLVM_HOST_TRIPLE="${CHOST}" - - -DFFI_INCLUDE_DIR="${ffi_cflags#-I}" - -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}" - # used only for llvm-objdump tool - -DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0) - - -DPython3_EXECUTABLE="${PYTHON}" - - # disable OCaml bindings (now in dev-ml/llvm-ocaml) - -DOCAMLFIND=NO - ) - - if [[ $(tc-get-cxx-stdlib) == libc++ ]]; 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. - mycmakeargs+=( - -DLLVM_VERSION_SUFFIX="libcxx" - -DLLVM_ENABLE_LIBCXX=ON - ) - fi - -# Note: go bindings have no CMake rules at the moment -# but let's kill the check in case they are introduced -# if ! multilib_is_native_abi || ! use go; then - mycmakeargs+=( - -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND - ) -# fi - - use test && mycmakeargs+=( - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - if multilib_is_native_abi; then - local build_docs=OFF - if llvm_are_manpages_built; then - build_docs=ON - mycmakeargs+=( - -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 - ) - fi - - mycmakeargs+=( - -DLLVM_BUILD_DOCS=${build_docs} - -DLLVM_ENABLE_OCAMLDOC=OFF - -DLLVM_ENABLE_SPHINX=${build_docs} - -DLLVM_ENABLE_DOXYGEN=OFF - -DLLVM_INSTALL_UTILS=ON - ) - use binutils-plugin && mycmakeargs+=( - -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include - ) - fi - - if tc-is-cross-compiler; then - local tblgen="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen" - [[ -x "${tblgen}" ]] \ - || die "${tblgen} not found or usable" - mycmakeargs+=( - -DCMAKE_CROSSCOMPILING=ON - -DLLVM_TABLEGEN="${tblgen}" - ) - fi - - # workaround BMI bug in gcc-7 (fixed in 7.4) - # https://bugs.gentoo.org/649880 - # apply only to x86, https://bugs.gentoo.org/650506 - if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] && - [[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]] - then - local CFLAGS="${CFLAGS} -mno-bmi" - local CXXFLAGS="${CXXFLAGS} -mno-bmi" - fi - - # LLVM can have very high memory consumption while linking, - # exhausting the limit on 32-bit linker executable - use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory" - - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - cmake_src_configure - - 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 -} - -multilib_src_compile() { - tc-env_build cmake_build distribution - - pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld - pax-mark m "${BUILD_DIR}"/bin/lli - pax-mark m "${BUILD_DIR}"/bin/lli-child-target - - if use test; then - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests - pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests - pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests - fi -} - -multilib_src_test() { - # respect TMPDIR! - local -x LIT_PRESERVES_TMP=1 - cmake_build check -} - -src_install() { - local MULTILIB_CHOST_TOOLS=( - /usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config - ) - - local MULTILIB_WRAPPED_HEADERS=( - /usr/include/llvm/Config/llvm-config.h - ) - - local LLVM_LDPATHS=() - multilib-minimal_src_install - - # move wrapped headers back - mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-distribution - - # move headers to /usr/include for wrapping - rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die - - LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" ) -} - -multilib_src_install_all() { - local revord=$(( 9999 - ${LLVM_MAJOR} )) - newenvd - "60llvm-${revord}" <<-_EOF_ - PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin" - # we need to duplicate it in ROOTPATH for Portage to respect... - 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/${LLVM_MAJOR}/share/man" - llvm_install_manpages -} - -pkg_postinst() { - elog "You can find additional opt-viewer utility scripts in:" - 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)" - elog " dev-python/pyyaml (for all of them)" -} |