diff options
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/Manifest.gz | bin | 69619 -> 69611 bytes | |||
-rw-r--r-- | dev-util/hip/Manifest | 2 | ||||
-rw-r--r-- | dev-util/hip/hip-5.7.1.ebuild | 1 | ||||
-rw-r--r-- | dev-util/hipcc/Manifest | 1 | ||||
-rw-r--r-- | dev-util/hipcc/hipcc-5.7.1-r1.ebuild | 27 | ||||
-rw-r--r-- | dev-util/perf/Manifest | 9 | ||||
-rw-r--r-- | dev-util/perf/perf-6.3-r1.ebuild | 278 | ||||
-rw-r--r-- | dev-util/perf/perf-6.3.ebuild | 1 | ||||
-rw-r--r-- | dev-util/perf/perf-6.5.ebuild | 1 | ||||
-rw-r--r-- | dev-util/perf/perf-6.6.ebuild (renamed from dev-util/perf/perf-6.4-r1.ebuild) | 15 |
10 files changed, 37 insertions, 298 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 4d9bdc73c439..c1ee9cc4ad52 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest index c42a0f945458..3a0ccd3cf45e 100644 --- a/dev-util/hip/Manifest +++ b/dev-util/hip/Manifest @@ -54,5 +54,5 @@ EBUILD hip-5.1.3-r4.ebuild 6638 BLAKE2B 4ccc536736e737f0066ab4f200a5ea76a9f16ede EBUILD hip-5.3.3-r3.ebuild 5346 BLAKE2B 4f5c0570e8a4ff65ac0b11bc555e2f81f7c6e56cc3ff86de894536b3b0597c049216a9d4184e25471999c4cf73b8f774daf1bb46d613c830bcc0d8c445f85b74 SHA512 9a54281155f14f467286d132ec405b90703b94760b8f4e268aed77b4a47d8a195febef3200068d0e5905cf7078fb92e2252b6ab7a3b86e40d330449315c0cf4d EBUILD hip-5.4.3.ebuild 5239 BLAKE2B 74d5423c5f7c01f15c5583b2c53420b1780fa7fdb11581fef2f0570be11a2047a43881a13b41b333905faaafab7dee15e1fb4af96703829cdab7d547e2cb5796 SHA512 7b2f5abfbc2ded1751b3d32349eb81715468125e9a9cc64522b725ed9a92f0dbf6e575fd1b84ab5234532badbf3a6b0c4d3a5b375384665ab413b22c54a5ee3e EBUILD hip-5.5.1.ebuild 5244 BLAKE2B aa1f937c5f2651ad3e79898ffc427696253c619583cd1450f1a3e7b9a7448e0d750f5df72a87458dfe6107f2f8846bc2b9b064d54b0b849fc3812a4f268c4af1 SHA512 94cad30f1f0e3e376a5902c83a151d3fe2a7b72b45747672e96b9d13dedadc7184c8f714789ff3e436133ffb8a7d58e8194471c843c694d3d39c348fd7d5a3ab -EBUILD hip-5.7.1.ebuild 2078 BLAKE2B a5f6c582218c88d0df738cfb7fb5f5bc3ea68ef17309ecd7f8bdf0c8e07c48e5b09d492233a257b5ed3b07b4d6fa500a1c565295828372fec6f5732073836d21 SHA512 67b3a459df0f822a38178beb28fb0376f5af4bf39df4711b1d34b0bc233d647911510f1e2037f6acfe5ca4e33fdba0eda82f6cede6fd544f55ea9377242a29bd +EBUILD hip-5.7.1.ebuild 2099 BLAKE2B 6ba5a8612ae642efafecd654775564ea2dfe6f8b9d9099d60ee60a0504758731d89a56a56b8895ebb8adf94a4ebd8f530f5a027bb14110e2a8b0277d5f891313 SHA512 a2197c7bb895783c7823e9025381193428360c15575f1ab173c76cd7ddac2c7c57582ad7e69fda4d593cb410be7360da687fab7927f3381f8fdbc5f7db80ef8e MISC metadata.xml 729 BLAKE2B 92e36c42f6d8335e5a8e3a86b591ff9e6306e0d187644620fab7f8f7ddd00156ee91ff49184ffbe379e509f2096c51c421575a69de7abea3c0b372fdcec52ccb SHA512 84fc8234a5fdf54bf43228c2144d809a461862fb45fea24bf366ee5937df3882c3332429938792981e37dbb4cda6e5d7e05ac5deaded34d8bcce1eb53df8d0fd diff --git a/dev-util/hip/hip-5.7.1.ebuild b/dev-util/hip/hip-5.7.1.ebuild index 53bce91a3f33..0bba0d2f560b 100644 --- a/dev-util/hip/hip-5.7.1.ebuild +++ b/dev-util/hip/hip-5.7.1.ebuild @@ -26,6 +26,7 @@ DEPEND=" >=dev-util/rocminfo-5 sys-devel/clang:${LLVM_MAX_SLOT} dev-libs/rocm-comgr:${SLOT} + x11-base/xorg-proto virtual/opengl " RDEPEND="${DEPEND} diff --git a/dev-util/hipcc/Manifest b/dev-util/hipcc/Manifest index 509738f123cd..f68dee6a2c91 100644 --- a/dev-util/hipcc/Manifest +++ b/dev-util/hipcc/Manifest @@ -1,3 +1,4 @@ DIST hipcc-5.7.1.tar.gz 36589 BLAKE2B a8ae6bd9f0f985d78119223b67b5b35b8d1ee38edb7e43c1e77752d203fe2c8b669b3bcff0cec661054d8cb24f799e7784a49eb0664bdd1dc2bf024ce026c175 SHA512 2d232c8dd4a47de6e0cff9d37b4e63a26cb1809ef2ff3a119c15e992cae96ffc2f4d8c1ddffd8732dea3a3d589a93e177f424a6174f982908aa50904e265432a +EBUILD hipcc-5.7.1-r1.ebuild 660 BLAKE2B 69b76125c382e37f48d618319650f5e2de52622fc41b44d6e20a32fa8accbcaa3bc02ad58a416e574502ac03f6340e5deabe527fc02f2b7a388ced2aeaa844cd SHA512 22f0a81f4e002257b2e1a9ad66144ab1b9adbcb0f9e55cfb3b69a29e11bbd854b802f8fd3085c175f64df58019c53aea9fa83dc93deb936a09d638cfe0291923 EBUILD hipcc-5.7.1.ebuild 514 BLAKE2B 85396696876960c47075dcf519c27d3dcb57c4154ba359a47222cb171c60a8a2532640d4f4e49e6f8d29a341faefa194ee28dd3075f867fee84d2880dbb63f0a SHA512 3fe23c89a253bb064417cee9f5766f7aebab482272245b06fe099fceacd59d79eb93102082cd22a1dab0b536ed24981e0542660628ea09479084b575907a1036 MISC metadata.xml 845 BLAKE2B 108a9ee40f02d5e190f4d1ee11eea32aaec844c63811265d52046bdb266f6cddfb1774419feace41aaa2bacfd01581847f655aa5fc49536968c54e7f023d49ae SHA512 2b7bbe1205b4a07b81e6c0f4cc2c224a573a03004ce808b4d1ef51ea1b0bec770545b7c46530a1b18222cd67854f790ae44695dd39ef2201d7f3e3ea3ada904f diff --git a/dev-util/hipcc/hipcc-5.7.1-r1.ebuild b/dev-util/hipcc/hipcc-5.7.1-r1.ebuild new file mode 100644 index 000000000000..78f9a80f3561 --- /dev/null +++ b/dev-util/hipcc/hipcc-5.7.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Radeon Open Compute hipcc" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipcc" + +KEYWORDS="~amd64" +SRC_URI="https://github.com/ROCm-Developer-Tools/hipcc/archive/refs/tags/rocm-${PV}.tar.gz -> hipcc-${PV}.tar.gz" + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="debug test" +RESTRICT="!test? ( test )" + +S=${WORKDIR}/HIPCC-rocm-${PV} + +RDEPEND="!<dev-util/hip-5.7" + +src_prepare() { + # hardcoded paths are wrong + sed -i -e 's~$ROCM_PATH/llvm/bin~/usr/lib/llvm/17/bin~' bin/hipvars.pm || die + cmake_src_prepare +} diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest index fab77c2e61b1..31c97f1805da 100644 --- a/dev-util/perf/Manifest +++ b/dev-util/perf/Manifest @@ -2,10 +2,9 @@ AUX perf-6.0-c++17.patch 1127 BLAKE2B 923390f761b588a01935e2b36ff25f916f91e752f7 AUX perf-6.0-clang.patch 1862 BLAKE2B e88655e51cb785b80cd44fefb73bb7668bf6d57205e478b106a0d0fbbee4e7089850c2328e796530347c354eb8e7e46e947c18e03ded488bede41de5f74f0b8e SHA512 0e92ba2e878b2b20f6d7c30ba5fde43388378c7f8e752a7c07dd65abc66e576be8f74cf9c06abb79713cc8c1cab37c9cd678f4e5bba8bb99ed1020317f278eb2 AUX perf-6.4-libtracefs.patch 780 BLAKE2B dc97e42f1d3ece03722441b5a2c1f87ab9871ca92b9cf9f57b2e44627fddfcedaf6d7f64ddf74fd103c23aa0db71c4d147f7841743eb5c5a466c9bbb150597ea SHA512 da1b69c190491dd926ba1e98a43965a5ffd543df4134e6a10d187ab544695617fcffede3190bce4cbef13b897d113dee743f67a98ff249a486f8de2d49e62f9f DIST linux-6.3.tar.xz 136891752 BLAKE2B f1887c8924efa8d0cb14c4e604affd0b0168bcf20f56a37c027405c7bc11aba822a43fcb38ccb55a81a26f747d00e1ab5a6554818affbf1e1c7ef5220150fc69 SHA512 768979440f4907ba64d4481b383d6101faf208f27a0b897156123aa278c5743fe3c4f61945b2541429c532d45382aaee8899ea9d44a1d2895bfbb79bfd937f65 -DIST linux-6.4.tar.xz 137794856 BLAKE2B b59eb04a8715af9f686978812e6d4a466172bb859f80657076de14cd0828b4fac15b688ff8959f5c65485f7f6bef26590412c66821e720de843cb8666f226c90 SHA512 11a48b25e0b513782d3b89101c2ec8dd9cefd6ce08dc63a91137903b66392aa72ca1fe32816710673af84dd47de3ab8738056a6af93dc0d5e60ef4b869b49928 DIST linux-6.5.tar.xz 138898084 BLAKE2B 2e641b79a080e8f4ce283bcf6b74e2c6f15a374367f1c4c875c663868dbe801317340824fb3adb46b3a51d3b7e1f67cc4e8144d367621ec43ffba5c4eb8abb39 SHA512 1b59dc5e65d4922c3217a8c8f19022dfd6595ae89747861d825bfeb51a4ae6c85449d05db69635a712bef7b355b80318195665582d8933b1fed6ba582f6ff257 -EBUILD perf-6.3-r1.ebuild 7594 BLAKE2B d93e597380319511a72e631d11d4ea87df4e99709db7a13467b3ee8d4bd41053b3f94f6f46ade7e054dd14f18da9e79a0d60631ffa93e0f75a3a889424566fc1 SHA512 c8ce0a06d61b880d3701305ef9aeccdd063cd5c6e26280f200621f817525bbffda5dac96dc3324a7333a542eb9e547433d788fc23a3697356c3fa52ae77a5fa4 -EBUILD perf-6.3.ebuild 7584 BLAKE2B 36c106f3f7af3e053b2815776ac5baf5809aab6115d4854b5fede8e91f9046d72982b3727e8675e013ae12f918e4d4f3425cf479690d9311eeba11e9b622a56e SHA512 49a5245fd70419ae318686b51e1520347e68793e1f8b740ae671d7ce3255986b6f6619df7f3c4f74488e8208bc6d9ed9ff793dd7133c8d0c436e57f406ad6b37 -EBUILD perf-6.4-r1.ebuild 8293 BLAKE2B 7d83aa80142720a8f763ef93ce65b145f9f6141f0b15cf81e36477d1fc67438b76ccccb6d7d57c65bc5ff2589e9c8a79f54ffbbaee25a025af3974db8acabea7 SHA512 a89b9c5c3cc29018cc41b22d79dc720344d0dd7224e6c64e7d8604e35d125293e00584fa818eb84e1a75a94838a1e5b119673204faf3bc616d16423e4967a051 -EBUILD perf-6.5.ebuild 8293 BLAKE2B 7d83aa80142720a8f763ef93ce65b145f9f6141f0b15cf81e36477d1fc67438b76ccccb6d7d57c65bc5ff2589e9c8a79f54ffbbaee25a025af3974db8acabea7 SHA512 a89b9c5c3cc29018cc41b22d79dc720344d0dd7224e6c64e7d8604e35d125293e00584fa818eb84e1a75a94838a1e5b119673204faf3bc616d16423e4967a051 +DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 +EBUILD perf-6.3.ebuild 7572 BLAKE2B 80adf321756779e731b6f9453044d4ecd905b7d9e75e17e6d26c5090d4be5734bbe398cb643e05faac1ff62fe5d348ef5313515e19994b43780e67b5ec37c434 SHA512 c41f376cdd9a878d913f9d7a06a817c574d68c8c77f6a724d110d5947e6a3fae0e40e3bf7072889627c318097cfd217d0f560a45270e671cfdea11516c96f093 +EBUILD perf-6.5.ebuild 8281 BLAKE2B 646843d84c16246cc181b366a0921a269109d26c47e3a98e7e3ac005164bf6440e1d4616b0467750324b13e30ae24d0dba5ae2cb363db7aba50946e1bebbdb34 SHA512 2a49dcb60c2fe2257965cf7a59d5d575d3c97aa8aa5500b629f1e4a68ec35362e2fcac64be33dd5b57bdc21feba2d23ff29acf855228d1db3f1309ffad0387e0 +EBUILD perf-6.6.ebuild 7990 BLAKE2B 6355dfe2486c5f887f2b70a2ca7378f211423a37d39669dd45fba50ae632437b7c68aa1a13efd441ae66ca2663bbb3c2c8e037026db5f7bad2d76f99069c763c SHA512 acead0a1e48b42b9928fda0fd019da67df503cd9f762680c74a904d07d9d3a9cc4a2088ddacbb6ce701610e5d38d125a53366f1f72623e2fefd87882f1eabf9b MISC metadata.xml 1642 BLAKE2B 648d70e60d8f8661c475da2be7ce7d120d1d96d505b2a9cacf92f5922c3c1266c0e0d3f8731c00a443cd7b05e317e874675038e709f0045d3e2f8e47ce4ffd6c SHA512 7da28e8493f318cd8b8a5e4f03f6f0deffc6b42ff9a4b9f304ccf684ea30dc85e0525804cd851ba1597f49d3500681d76c7fd7b6de08c1e479f1fdf4f91d0cae diff --git a/dev-util/perf/perf-6.3-r1.ebuild b/dev-util/perf/perf-6.3-r1.ebuild deleted file mode 100644 index d519238f14e1..000000000000 --- a/dev-util/perf/perf-6.3-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 estack flag-o-matic llvm toolchain-funcs python-r1 linux-info - -DESCRIPTION="Userland tools for Linux Performance Counters" -HOMEPAGE="https://perf.wiki.kernel.org/" - -LINUX_V="${PV:0:1}.x" -if [[ ${PV} == *_rc* ]] ; then - LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1)) - PATCH_VERSION=$(ver_cut 1-3) - LINUX_PATCH=patch-${PV//_/-}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH} - https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}" -elif [[ ${PV} == *.*.* ]] ; then - # stable-release series - LINUX_VER=$(ver_cut 1-2) - LINUX_PATCH=patch-${PV}.xz - SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" -else - LINUX_VER=${PV} - SRC_URI="" -fi - -LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" -SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace caps clang crypt debug +doc gtk java libpfm lzma numa perl python slang systemtap unwind zstd" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# setuptools (and Python) are always needed even if not building Python bindings -BDEPEND=" - ${LINUX_PATCH+dev-util/patchutils} - ${PYTHON_DEPS} - >=app-arch/tar-1.34-r2 - dev-python/setuptools[${PYTHON_USEDEP}] - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-text/asciidoc - app-text/sgml-common - app-text/xmlto - sys-process/time - ) -" - -RDEPEND=" - audit? ( sys-process/audit ) - babeltrace? ( dev-util/babeltrace ) - caps? ( sys-libs/libcap ) - clang? ( - sys-devel/clang:= - sys-devel/llvm:= - ) - crypt? ( dev-libs/openssl:= ) - gtk? ( x11-libs/gtk+:2 ) - java? ( virtual/jre:* ) - libpfm? ( dev-libs/libpfm:= ) - lzma? ( app-arch/xz-utils ) - numa? ( sys-process/numactl ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - slang? ( sys-libs/slang ) - systemtap? ( dev-util/systemtap ) - unwind? ( sys-libs/libunwind:= ) - zstd? ( app-arch/zstd:= ) - dev-libs/elfutils - sys-libs/binutils-libs:= - sys-libs/zlib -" - -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 - java? ( virtual/jdk ) -" - -S_K="${WORKDIR}/linux-${LINUX_VER}" -S="${S_K}/tools/perf" - -CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS" - -QA_FLAGS_IGNORED=( - 'usr/bin/perf-read-vdso32' # not linked with anything except for libc - 'usr/libexec/perf-core/dlfilters/.*' # plugins -) - -pkg_pretend() { - if ! use doc ; then - ewarn "Without the doc USE flag you won't get any documentation nor man pages." - ewarn "And without man pages, you won't get any --help output for perf and its" - ewarn "sub-tools." - fi -} - -pkg_setup() { - use clang && llvm_pkg_setup - # We enable python unconditionally as libbpf always generates - # API headers using python script - python_setup -} - -# src_unpack and src_prepare are copied to dev-util/bpftool since -# it's building from the same tarball, please keep it in sync with bpftool -src_unpack() { - local paths=( - tools/arch tools/build tools/include tools/lib tools/perf tools/scripts - scripts include lib "arch/*/lib" - ) - - # We expect the tar implementation to support the -j option (both - # GNU tar and libarchive's tar support that). - echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}" - gtar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \ - "${paths[@]/#/linux-${LINUX_VER}/}" || die - - if [[ -n ${LINUX_PATCH} ]] ; then - eshopts_push -o noglob - ebegin "Filtering partial source patch" - filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \ - > ${P}.patch - eend $? || die "filterdiff failed" - eshopts_pop - fi - - local a - for a in ${A}; do - [[ ${a} == ${LINUX_SOURCES} ]] && continue - [[ ${a} == ${LINUX_PATCH} ]] && continue - unpack ${a} - done -} - -src_prepare() { - default - if [[ -n ${LINUX_PATCH} ]] ; then - pushd "${S_K}" >/dev/null || die - eapply "${WORKDIR}"/${P}.patch - popd || die - fi - - pushd "${S_K}" >/dev/null || die - eapply "${FILESDIR}"/perf-6.0-clang.patch - eapply "${FILESDIR}"/perf-6.0-c++17.patch - popd || die - - # Drop some upstream too-developer-oriented flags and fix the - # Makefile in general - sed -i \ - -e "s@\$(sysconfdir_SQ)/bash_completion.d@$(get_bashcompdir)@" \ - "${S}"/Makefile.perf || die - # A few places still use -Werror w/out $(WERROR) protection. - sed -i -e 's@-Werror@@' \ - "${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile \ - "${S_K}"/tools/lib/perf/Makefile || die - - # Avoid the call to make kernelversion - sed -i -e '/PERF-VERSION-GEN/d' Makefile.perf || die - echo "#define PERF_VERSION \"${PV}\"" > PERF-VERSION-FILE - - # The code likes to compile local assembly files which lack ELF markings. - find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} + -} - -puse() { usex $1 "" no; } -perf_make() { - # The arch parsing is a bit funky. The perf tools package is integrated - # into the kernel, so it wants an ARCH that looks like the kernel arch, - # but it also wants to know about the split value -- i386/x86_64 vs just - # x86. We can get that by telling the func to use an older linux version. - # It's kind of a hack, but not that bad ... - - # LIBDIR sets a search path of perf-gtk.so. Bug 515954 - - local arch=$(tc-arch-kernel) - local java_dir - use java && java_dir="${EPREFIX}/etc/java-config-2/current-system-vm" - # FIXME: NO_CORESIGHT - local emakeargs=( - V=1 VF=1 - HOSTCC="$(tc-getBUILD_CC)" HOSTLD="$(tc-getBUILD_LD)" - CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" LD="$(tc-getLD)" NM="$(tc-getNM)" - PKG_CONFIG="$(tc-getPKG_CONFIG)" - prefix="${EPREFIX}/usr" bindir_relative="bin" - tipdir="share/doc/${PF}" - EXTRA_CFLAGS="${CFLAGS}" - EXTRA_LDFLAGS="${LDFLAGS}" - ARCH="${arch}" - JDIR="${java_dir}" - LIBCLANGLLVM=$(usex clang 1 "") - LIBPFM4=$(usex libpfm 1 "") - NO_AUXTRACE="" - NO_BACKTRACE="" - NO_CORESIGHT=1 - NO_DEMANGLE= - GTK2=$(usex gtk 1 "") - feature-gtk2-infobar=$(usex gtk 1 "") - NO_JVMTI=$(puse java) - NO_LIBAUDIT=$(puse audit) - NO_LIBBABELTRACE=$(puse babeltrace) - NO_LIBBIONIC=1 - NO_LIBBPF= - NO_LIBCAP=$(puse caps) - NO_LIBCRYPTO=$(puse crypt) - NO_LIBDW_DWARF_UNWIND= - NO_LIBELF= - NO_LIBNUMA=$(puse numa) - NO_LIBPERL=$(puse perl) - NO_LIBPYTHON=$(puse python) - NO_LIBUNWIND=$(puse unwind) - NO_LIBZSTD=$(puse zstd) - NO_SDT=$(puse systemtap) - NO_SLANG=$(puse slang) - NO_LZMA=$(puse lzma) - NO_ZLIB= - WERROR=0 - LIBDIR="/usr/libexec/perf-core" - libdir="${EPREFIX}/usr/$(get_libdir)" - plugindir="${EPREFIX}/usr/$(get_libdir)/perf/plugins" - "$@" - ) - emake "${emakeargs[@]}" -} - -src_compile() { - filter-lto - - # test-clang.bin not build with g++ - if use clang; then - make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die - fi - perf_make -f Makefile.perf - use doc && perf_make -C Documentation man -} - -src_test() { - : -} - -src_install() { - _install_python_ext() { - perf_make -f Makefile.perf install-python_ext DESTDIR="${D}" - } - - perf_make -f Makefile.perf install DESTDIR="${D}" - - if use python; then - python_foreach_impl _install_python_ext - fi - - if use gtk; then - local libdir - libdir="$(get_libdir)" - # on some arches it ends up in lib even on 64bit, ppc64 for instance. - [[ -f "${ED}"/usr/lib/libperf-gtk.so ]] && libdir="lib" - mv "${ED}"/usr/${libdir}/libperf-gtk.so \ - "${ED}"/usr/libexec/perf-core || die - fi - - dodoc CREDITS - - dodoc *txt Documentation/*.txt - - # perf needs this decompressed to print out tips for users - docompress -x /usr/share/doc/${PF}/tips.txt - - if use doc ; then - doman Documentation/*.1 - fi -} diff --git a/dev-util/perf/perf-6.3.ebuild b/dev-util/perf/perf-6.3.ebuild index 8f0ac9a76ce4..7969607f7994 100644 --- a/dev-util/perf/perf-6.3.ebuild +++ b/dev-util/perf/perf-6.3.ebuild @@ -23,7 +23,6 @@ elif [[ ${PV} == *.*.* ]] ; then SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" else LINUX_VER=${PV} - SRC_URI="" fi LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" diff --git a/dev-util/perf/perf-6.5.ebuild b/dev-util/perf/perf-6.5.ebuild index a1a140af0ed7..63a36103e1f1 100644 --- a/dev-util/perf/perf-6.5.ebuild +++ b/dev-util/perf/perf-6.5.ebuild @@ -23,7 +23,6 @@ elif [[ ${PV} == *.*.* ]] ; then SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" else LINUX_VER=${PV} - SRC_URI="" fi LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" diff --git a/dev-util/perf/perf-6.4-r1.ebuild b/dev-util/perf/perf-6.6.ebuild index a1a140af0ed7..b86fbd604b85 100644 --- a/dev-util/perf/perf-6.4-r1.ebuild +++ b/dev-util/perf/perf-6.6.ebuild @@ -23,7 +23,6 @@ elif [[ ${PV} == *.*.* ]] ; then SRC_URI="https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_PATCH}" else LINUX_VER=${PV} - SRC_URI="" fi LINUX_SOURCES="linux-${LINUX_VER}.tar.xz" @@ -32,10 +31,9 @@ SRC_URI+=" https://www.kernel.org/pub/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" -IUSE="audit babeltrace bpf caps clang crypt debug +doc gtk java libpfm libtraceevent libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd" +IUSE="audit babeltrace bpf caps crypt debug +doc gtk java libpfm +libtraceevent +libtracefs lzma numa perl python slang systemtap tcmalloc unwind zstd" REQUIRED_USE=" - bpf? ( clang ) ${PYTHON_REQUIRED_USE} " @@ -65,7 +63,7 @@ RDEPEND=" dev-util/pahole ) caps? ( sys-libs/libcap ) - clang? ( + bpf? ( sys-devel/clang:= sys-devel/llvm:= ) @@ -125,7 +123,7 @@ pkg_pretend() { } pkg_setup() { - use clang && llvm_pkg_setup + use bpf && llvm_pkg_setup # We enable python unconditionally as libbpf always generates # API headers using python script python_setup @@ -177,8 +175,6 @@ src_prepare() { fi pushd "${S_K}" >/dev/null || die - eapply "${FILESDIR}"/perf-6.0-clang.patch - eapply "${FILESDIR}"/perf-6.0-c++17.patch eapply "${FILESDIR}"/perf-6.4-libtracefs.patch popd || die @@ -229,7 +225,6 @@ perf_make() { JDIR="${java_dir}" CORESIGHT= GTK2=$(usex gtk 1 "") - LIBCLANGLLVM=$(usex clang 1 "") feature-gtk2-infobar=$(usex gtk 1 "") NO_AUXTRACE= NO_BACKTRACE= @@ -268,10 +263,6 @@ perf_make() { src_compile() { filter-lto - # test-clang.bin not build with g++ - if use clang; then - make -C "${S_K}/tools/build/feature" V=1 CXX=${CHOST}-clang++ test-clang.bin || die - fi perf_make -f Makefile.perf use doc && perf_make -C Documentation man } |