diff options
Diffstat (limited to 'dev-util')
19 files changed, 270 insertions, 142 deletions
diff --git a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild index b3db94cf91fe..297c9a5cffc3 100644 --- a/dev-util/android-tools/android-tools-33.0.3-r1.ebuild +++ b/dev-util/android-tools/android-tools-33.0.3-r1.ebuild @@ -55,8 +55,9 @@ src_prepare() { cd "${S}/vendor/adb" || die eapply "${FILESDIR}/${P}-adb-0023-Update-usage-of-usbdevfs_urb-to-match-new-kernel-UAP.patch" + eapply "${FILESDIR}/${P}-adb-gcc-13.patch" - cd "${S}" + cd "${S}" || die rm -r patches || die cmake_src_prepare } diff --git a/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch new file mode 100644 index 000000000000..4ba2c9a49c31 --- /dev/null +++ b/dev-util/android-tools/files/android-tools-33.0.3-adb-gcc-13.patch @@ -0,0 +1,25 @@ +https://bugs.gentoo.org/875575 +https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2399311 + +From ddffab649b12dce1502d63711836b58d007f6a28 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Mon, 23 Jan 2023 23:09:52 +0100 +Subject: [PATCH] Fix build with gcc 13 by including <cstdint> + +Like other versions before, gcc 13 moved some includes around and as a +result <cstdint> is no longer transitively included. Explicitly include +it for uint{32,64}_t. + +Test: local build +Change-Id: I05a27726b05427c486fd01b013dba4d698abac97 +--- a/file_sync_protocol.h ++++ b/file_sync_protocol.h +@@ -16,6 +16,8 @@ + + #pragma once + ++#include <cstdint> ++ + #define MKID(a, b, c, d) ((a) | ((b) << 8) | ((c) << 16) | ((d) << 24)) + + #define ID_LSTAT_V1 MKID('S', 'T', 'A', 'T') diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild new file mode 100644 index 000000000000..f0ca12cf9cfc --- /dev/null +++ b/dev-util/cscope/cscope-15.9-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools elisp-common toolchain-funcs + +DESCRIPTION="Interactively examine a C program" +HOMEPAGE="https://cscope.sourceforge.net/" +SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz" + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +IUSE="emacs" + +RDEPEND=">=sys-libs/ncurses-5.2:0= + emacs? ( >=app-editors/emacs-23.1:* )" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/flex + virtual/pkgconfig + app-alternatives/yacc" + +SITEFILE="50${PN}-gentoo.el" + +src_prepare() { + eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305 + eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch" + eapply "${FILESDIR}/${PN}-15.9-emacs-27.patch" + eapply_user + mv configure.{in,ac} || die + eautoreconf # prevent maintainer mode later on +} + +src_configure() { + econf --with-ncurses="${EPREFIX}"/usr +} + +src_compile() { + emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" + if use emacs; then + cd "${S}"/contrib/xcscope || die + elisp-compile *.el + fi +} + +src_install() { + default + + if use emacs; then + cd "${S}"/contrib/xcscope || die + elisp-install ${PN} *.el *.elc + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + dobin cscope-indexer + fi + + cd "${S}"/contrib/webcscope || die + docinto webcscope + dodoc INSTALL TODO cgi-lib.pl cscope hilite.c + docinto webcscope/icons + dodoc icons/*.gif +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-util/cscope/files/cscope-15.9-emacs-27.patch b/dev-util/cscope/files/cscope-15.9-emacs-27.patch new file mode 100644 index 000000000000..48cd7150176d --- /dev/null +++ b/dev-util/cscope/files/cscope-15.9-emacs-27.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/892071 + +commit eaea31cb93ecddda69a373f83f632e1a450c3c90 +Author: Brock Zheng Techyauld Ltd <yzheng@techyauld.com> +Date: Tue Aug 25 20:28:11 2020 +0800 + + emacs plugin fixup: GNU/Emacs 27.1 removes function process-kill-without-query + +--- a/contrib/xcscope/xcscope.el ++++ b/contrib/xcscope/xcscope.el +@@ -2006,7 +2006,7 @@ + (set-process-filter cscope-process cscope-filter-func) + (set-process-sentinel cscope-process cscope-sentinel-func) + (set-marker (process-mark cscope-process) (point)) +- (process-kill-without-query cscope-process) ++ (set-process-query-on-exit-flag cscope-process nil) + (if cscope-running-in-xemacs + (setq modeline-process ": Searching ...")) + (setq buffer-read-only t) +@@ -2139,7 +2139,7 @@ + cscope-indexing-script args)) + (set-process-sentinel cscope-unix-index-process + 'cscope-unix-index-files-sentinel) +- (process-kill-without-query cscope-unix-index-process) ++ (set-process-query-on-exit-flag cscope-unix-index-process nil) + ) + )) + diff --git a/dev-util/git-delta/git-delta-0.15.1.ebuild b/dev-util/git-delta/git-delta-0.15.1.ebuild index 4cd6a988d833..fcb5244b7a6b 100644 --- a/dev-util/git-delta/git-delta-0.15.1.ebuild +++ b/dev-util/git-delta/git-delta-0.15.1.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 @@ -190,7 +190,7 @@ LICENSE="MIT" # Dependent crate licenses LICENSE+=" Apache-2.0 CC0-1.0 LGPL-3+ MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv" BDEPEND="virtual/pkgconfig" DEPEND=" diff --git a/dev-util/gnome-builder/gnome-builder-43.4.ebuild b/dev-util/gnome-builder/gnome-builder-43.4.ebuild index 41f9a5b1a4fc..69bae9a1742c 100644 --- a/dev-util/gnome-builder/gnome-builder-43.4.ebuild +++ b/dev-util/gnome-builder/gnome-builder-43.4.ebuild @@ -111,7 +111,7 @@ that are currently available with packages include: autocompletion support. * dev-util/valgrind for integration with valgrind. * dev-util/meson for integration with the Meson build system. -* dev-util/cargo for integration with the Rust Cargo build system. +* virtual/rust for integration with the Rust Cargo build system. * dev-util/cmake for integration with the CMake build system. * net-libs/nodejs[npm] for integration with the NPM package system. ' diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest index 68a1ffb53746..ec601db69cb1 100644 --- a/dev-util/lldb/Manifest +++ b/dev-util/lldb/Manifest @@ -1,7 +1,5 @@ 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 -DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894 diff --git a/dev-util/lldb/lldb-15.0.6.ebuild b/dev-util/lldb/lldb-15.0.6.ebuild deleted file mode 100644 index 52568e9e11ee..000000000000 --- a/dev-util/lldb/lldb-15.0.6.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit cmake llvm llvm.org python-single-r1 - -DESCRIPTION="The LLVM debugger" -HOMEPAGE="https://llvm.org/" - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" -SLOT="0/${LLVM_SOABI}" -KEYWORDS="amd64 arm arm64 x86" -IUSE="debug +libedit lzma ncurses +python test +xml" -RESTRICT="test" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DEPEND=" - libedit? ( dev-libs/libedit:0= ) - lzma? ( app-arch/xz-utils:= ) - ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) - xml? ( dev-libs/libxml2:= ) - ~sys-devel/clang-${PV} - ~sys-devel/llvm-${PV} -" -RDEPEND=" - ${DEPEND} - python? ( - $(python_gen_cond_dep ' - dev-python/six[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - ) -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - python? ( - >=dev-lang/swig-3.0.11 - $(python_gen_cond_dep ' - dev-python/six[${PYTHON_USEDEP}] - ') - ) - test? ( - $(python_gen_cond_dep " - ~dev-python/lit-${PV}[\${PYTHON_USEDEP}] - dev-python/psutil[\${PYTHON_USEDEP}] - ") - sys-devel/lld - ) -" - -LLVM_COMPONENTS=( lldb cmake ) -LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) -llvm.org_set_globals - -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-single-r1_pkg_setup -} - -src_configure() { - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG" - - local mycmakeargs=( - -DLLDB_ENABLE_CURSES=$(usex ncurses) - -DLLDB_ENABLE_LIBEDIT=$(usex libedit) - -DLLDB_ENABLE_PYTHON=$(usex python) - -DLLDB_ENABLE_LUA=OFF - -DLLDB_ENABLE_LZMA=$(usex lzma) - -DLLDB_ENABLE_LIBXML2=$(usex xml) - -DLLDB_USE_SYSTEM_SIX=1 - -DLLVM_ENABLE_TERMINFO=$(usex ncurses) - - -DLLDB_INCLUDE_TESTS=$(usex test) - - -DCLANG_LINK_CLANG_DYLIB=ON - # TODO: fix upstream to detect this properly - -DHAVE_LIBDL=ON - -DHAVE_LIBPTHREAD=ON - - # normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO - # and TERMINFO_LIBS... so just force FindCurses.cmake to use - # ncurses with complete library set (including autodetection - # of -ltinfo) - -DCURSES_NEED_NCURSES=ON - - -DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}" - - -DPython3_EXECUTABLE="${PYTHON}" - ) - use test && mycmakeargs+=( - -DLLVM_BUILD_TESTS=$(usex test) - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - ) - - cmake_src_configure -} - -src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-lldb-{shell,unit} - # failures + hangs - #use python && cmake_build check-lldb-api -} - -src_install() { - cmake_src_install - find "${D}" -name '*.a' -delete || die - - use python && python_optimize -} diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest index fb9da559fcf9..6b70c0ad53e9 100644 --- a/dev-util/packer/Manifest +++ b/dev-util/packer/Manifest @@ -1,2 +1,4 @@ DIST packer-1.7.10-deps.tar.xz 628140836 BLAKE2B 6cfb8409a9a9aef2130e58f2b70b1bb73b491aa9fb2d1f2b59b2c3c9e721465a51111f0e6357a58e9eed4d8b024a4fe9a0f20cf9a5b84e7d20f3a8d52ad55e4c SHA512 cd0af0f60029b7b3e887fbe4245e26e12d798fe5c3b650d63774ffeb2d5eab9609d8506a06c35d8ff4d499db1cab69d767b8b386d04136fd65ea43de3940df88 DIST packer-1.7.10.tar.gz 2414352 BLAKE2B 7c48aaac8411dd81cae2201cf9b03eab0906b78dcc6aecf654f498b44884a0758f0d5fc10d03b9e526f7753d18db8754b74d8c2eef133b4170b872f41c8261f3 SHA512 12f032afef95be92be4f6e98cf2af5548189cb179c25d74b8f7943b4a6af0ab49c5a86523f27385e5eee05624d7e9de8d572fe19442305227c5bddd21a66f97a +DIST packer-1.8.5-deps.tar.xz 385789132 BLAKE2B 680852f380bc6b2c74183bf0c32baf8e3c796b5eaee59fd8f395e2fa2765a3aa2ec36d30647ffd90965fad9b1cfe8ea00e4ad684c026cb60a6c4a9df4f5c8501 SHA512 a84b2d3287ccb618063ea960773a3ebe306ae8a36c708fd8ca057f6ce70b82ff7590922aa733c1fade93fbbca14f87b0c5ecda530413b573fab8bd981dd254fc +DIST packer-1.8.5.tar.gz 2278013 BLAKE2B 0465356e78b62a67e71ef943a7dfb89b5f50b3b3cdb34c3ca41ac6d57e32fad8f40da1316ba8f54d93ae0c25b22627cc9f633f4e488ee9cc66fc6e6080b5769e SHA512 8ffd9e0a755e5e537c63a70454756a6df787d299cb5f3a8d6dea9c7e93dbea744017cd2f2c4fa9a8b6fbc052dedecb702dc6ac656b4c6c293ad5eab1f581872e diff --git a/dev-util/packer/packer-1.8.5.ebuild b/dev-util/packer/packer-1.8.5.ebuild new file mode 100644 index 000000000000..5d2c7f38d9d4 --- /dev/null +++ b/dev-util/packer/packer-1.8.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A tool to create identical machine images for multiple platforms" +HOMEPAGE="https://www.packer.io" +SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv" + +DOCS=( {README,CHANGELOG}.md ) + +RESTRICT+=" test" + +src_compile() { + ego build \ + -mod=readonly \ + -ldflags "${go_ldflags}" \ + -work -o "bin/${PN}" ./ || die +} + +src_install() { + dobin bin/packer + + einstalldocs + + insinto /usr/share/zsh/site-functions + doins contrib/zsh-completion/_packer +} diff --git a/dev-util/patdiff/patdiff-0.15.0.ebuild b/dev-util/patdiff/patdiff-0.15.0.ebuild index 8a8584db976a..f10b7a3ff52a 100644 --- a/dev-util/patdiff/patdiff-0.15.0.ebuild +++ b/dev-util/patdiff/patdiff-0.15.0.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 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/patdiff/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="Apache-2.0" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="~amd64" IUSE="+ocamlopt" RDEPEND=" diff --git a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild b/dev-util/pwndbg/pwndbg-20221219-r1.ebuild index 4a811f3140a8..c00d58bba805 100644 --- a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild +++ b/dev-util/pwndbg/pwndbg-20221219-r1.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 @@ -20,7 +20,7 @@ else https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz " - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${PN}-${MY_PV}" fi diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest index 9aab44729a91..a37fb72a90db 100644 --- a/dev-util/rocm-smi/Manifest +++ b/dev-util/rocm-smi/Manifest @@ -1,2 +1,3 @@ DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05 DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e +DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8 diff --git a/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch new file mode 100644 index 000000000000..1c406c7d042c --- /dev/null +++ b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch @@ -0,0 +1,26 @@ +Detect amdgpu module for amdgpu-builtin kernel +From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001 +From: YiyangWu <xgreenlandforwyy@gmail.com> +Date: Sat, 2 Apr 2022 16:40:11 +0800 +Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod + +Closes: #102 + +Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com> +--- + python_smi_tools/rocm_smi.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py +=================================================================== +--- rocm_smi_lib-rocm-5.4.2.orig/python_smi_tools/rocm_smi.py ++++ rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py +@@ -66,7 +66,7 @@ def driverInitialized(): + """ + driverInitialized = '' + try: +- driverInitialized = str(subprocess.check_output("cat /sys/module/amdgpu/initstate |grep live", shell=True)) ++ driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True)) + except subprocess.CalledProcessError: + pass + if len(driverInitialized) > 0: diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild index 1b5c34763f78..bb740e344669 100644 --- a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild +++ b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild @@ -57,6 +57,6 @@ src_configure() { src_install() { cmake_src_install - python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi + python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py } diff --git a/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild new file mode 100644 index 000000000000..639e2ed0fece --- /dev/null +++ b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{7,8,9,10,11} ) + +inherit cmake python-r1 + +DESCRIPTION="ROCm System Management Interface Library" +HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" + +if [[ ${PV} == *9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib" + EGIT_BRANCH="master" +else + SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" +fi + +LICENSE="MIT NCSA-AMD" +SLOT="0/$(ver_cut 1-2)" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="" +RDEPEND="${PYTHON_DEPS}" +BDEPEND="" + +PATCHES=( + "${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch + "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch +) + +src_prepare() { + sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die + sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \ + -i python_smi_tools/rsmiBindings.py || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi + python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py +} diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild index 4060b1f3fb8e..639e2ed0fece 100644 --- a/dev-util/rocm-smi/rocm-smi-9999.ebuild +++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{7,8,9,10,11} ) -inherit cmake multilib prefix python-r1 +inherit cmake python-r1 DESCRIPTION="ROCm System Management Interface Library" HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib" @@ -20,7 +20,7 @@ else S="${WORKDIR}/rocm_smi_lib-rocm-${PV}" fi -LICENSE="NCSA-AMD" +LICENSE="MIT NCSA-AMD" SLOT="0/$(ver_cut 1-2)" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -29,28 +29,29 @@ DEPEND="" RDEPEND="${PYTHON_DEPS}" BDEPEND="" +PATCHES=( + "${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch + "${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch +) + src_prepare() { - sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \ - -e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die - sed -e "/link DESTINATION/,+1d" \ - -e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \ - -e "/bindings_link/,+3d" \ - -e "/rsmiBindings.py/,+1d" \ - -e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die - sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die - sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die + sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die + sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \ + -i python_smi_tools/rsmiBindings.py || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF ) cmake_src_configure } src_install() { cmake_src_install - python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi + python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py } diff --git a/dev-util/strace/strace-6.1.ebuild b/dev-util/strace/strace-6.1.ebuild index 49ada010927a..92851213887d 100644 --- a/dev-util/strace/strace-6.1.ebuild +++ b/dev-util/strace/strace-6.1.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 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="A useful diagnostic, instructional, and debugging tool" diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild index 380fc17ef55f..0a02de2f891a 100644 --- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild +++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild @@ -15,7 +15,7 @@ else inherit verify-sig SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2" SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )" - KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="-* amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" fi LICENSE="GPL-2" |
