From c8fb42216b10862e8178f91831e4c51fb2c55ac4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 6 Feb 2023 09:19:42 +0000 Subject: gentoo auto-resync : 06:02:2023 - 09:19:42 --- dev-util/Manifest.gz | Bin 68384 -> 68380 bytes dev-util/gnome-builder/Manifest | 2 + dev-util/gnome-builder/gnome-builder-43.6.ebuild | 261 ++++++++++++++++++++++ dev-util/hip/Manifest | 3 +- dev-util/hip/files/hip-5.3.3-correct-ldflag.patch | 20 ++ dev-util/hip/hip-5.3.3-r2.ebuild | 145 ------------ dev-util/hip/hip-5.3.3-r3.ebuild | 146 ++++++++++++ 7 files changed, 431 insertions(+), 146 deletions(-) create mode 100644 dev-util/gnome-builder/gnome-builder-43.6.ebuild create mode 100644 dev-util/hip/files/hip-5.3.3-correct-ldflag.patch delete mode 100644 dev-util/hip/hip-5.3.3-r2.ebuild create mode 100644 dev-util/hip/hip-5.3.3-r3.ebuild (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index b7000de41ca2..f287d6a1003b 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest index f7ada984ffae..5358093a45e9 100644 --- a/dev-util/gnome-builder/Manifest +++ b/dev-util/gnome-builder/Manifest @@ -1,5 +1,7 @@ DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db DIST gnome-builder-43.5.tar.xz 10289424 BLAKE2B b0676ebf4b475a6223a57f79d135371d3cfcadd3d4dd37abf48f000f9fc0d0b3e48fb615bc07ed1415324f7661a8f4c7b05c3f31f41a70870f9c4b320d33160c SHA512 24533109c0be9bd595b04ab2abceb2a894034c648837181e8f21fb52e54b8f0e0d043f4d89ab2fff0f84cf0114d3824e05fc8f466745e9e4b577f298cafb483f +DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45 EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B af7facf902f7d84accc297d52f4835723f33afa2ba1582047151e984f3a36a187318b2951c4aa49704fcec149c7e249e3d988a98026f359255265e72f2556f86 SHA512 3a32edf77f4eb16ca9a4ca0e4b451767d79a36c97910e3c775e8c54696d246383ba9d85d44fba15dd27f1fb3ead680d98f31ec5d02c686eb04a26b04d2825caf EBUILD gnome-builder-43.5.ebuild 8734 BLAKE2B d07c20305a6dc16056df0558665675e8e2e27a2564b02e5cb3f5fdcc145fd14b95c8079c2ede5322b18b1fc8a79c4ee21a9ee0aa804dd12aadedee57137b585b SHA512 2af6fef459ecebf4b2cae7808403a5536afe8c870663ac0661ee6c294588026ae8a25513dc790bee78bba0ec628c45f7d6438cc8d53e7c5bb85277f3e355b17c +EBUILD gnome-builder-43.6.ebuild 8734 BLAKE2B d07c20305a6dc16056df0558665675e8e2e27a2564b02e5cb3f5fdcc145fd14b95c8079c2ede5322b18b1fc8a79c4ee21a9ee0aa804dd12aadedee57137b585b SHA512 2af6fef459ecebf4b2cae7808403a5536afe8c870663ac0661ee6c294588026ae8a25513dc790bee78bba0ec628c45f7d6438cc8d53e7c5bb85277f3e355b17c MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2 diff --git a/dev-util/gnome-builder/gnome-builder-43.6.ebuild b/dev-util/gnome-builder/gnome-builder-43.6.ebuild new file mode 100644 index 000000000000..ef2c2fc96d89 --- /dev/null +++ b/dev-util/gnome-builder/gnome-builder-43.6.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 + +inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg + +DESCRIPTION="An IDE for writing GNOME-based software" +HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder" + +# FIXME: Review licenses at some point +LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + flatpak? ( git ) +" + +# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within. +# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking. +# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path. +# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of +# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small +# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except. + +# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2? +# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4 + +# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build +RDEPEND=" + >=dev-libs/glib-2.73.3:2 + >=gui-libs/gtk-4.7.1:4[introspection] + >=gui-libs/libadwaita-1.2.0:1 + >=gui-libs/libpanel-1.0.0:1 + >=gui-libs/gtksourceview-5.5.2:5[introspection] + >=dev-libs/json-glib-1.2.0 + >=dev-libs/jsonrpc-glib-3.42.0:= + >=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}] + dev-libs/libportal:=[gtk,introspection] + >=dev-libs/template-glib-3.36.0:=[introspection] + >=gui-libs/vte-0.70.0:2.91-gtk4[introspection] + >=dev-libs/libxml2-2.9.0 + webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] ) + >=app-text/cmark-0.29.0:0= + d-spy? ( >=dev-util/d-spy-1.4.0:1 ) + app-text/editorconfig-core-c + flatpak? ( + dev-util/ostree + >=net-libs/libsoup-3:3.0 + >=sys-apps/flatpak-1.10.2 + ) + git? ( + dev-libs/libgit2:=[ssh,threads] + >=dev-libs/libgit2-glib-1.1.0[ssh] + ) + + >=dev-libs/gobject-introspection-1.54.0:= + $(python_gen_cond_dep ' + >=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}] + ') + ${PYTHON_DEPS} + clang? ( sys-devel/clang:= ) + spell? ( + app-text/enchant:2 + dev-libs/icu:= + ) + sysprof? ( + >=dev-util/sysprof-capture-3.46.0:4 + >=dev-util/sysprof-3.46.0:0/4 + ) +" +DEPEND="${RDEPEND}" +# TODO: runtime ctags path finding.. + +# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional +# appstream-glib needed for validation with appstream-util with FEATURES=test +BDEPEND=" + doc? ( + $(python_gen_cond_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') + ) + gtk-doc? ( + dev-util/gi-docgen + app-text/docbook-xml-dtd:4.3 + ) + test? ( + dev-libs/appstream-glib + sys-apps/dbus + ) + dev-util/desktop-file-utils + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide +extra capabilities beyond these expressed via USE flags. Some of these +that are currently available with packages include: + +* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for + C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic + highlighting and symbol resolving support. +* dev-python/jedi and dev-python/lxml for more accurate Python + autocompletion support. +* dev-util/valgrind for integration with valgrind. +* dev-util/meson for integration with the Meson 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. +' +# FIXME: Package codespell and mention here +# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important +# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..) +# jhbuild support +# rust support via rust-analyzer; Go via go-langserver +# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template +# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE +# stylelint for stylesheet (CSS and co) linting +# gvls for vala language-server integration + +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +pkg_setup() { + python-single-r1_pkg_setup + use clang && llvm_pkg_setup +} + +src_configure() { + local emesonargs=( + -Dchannel=other + + -Ddevelopment=false + -Dtracing=false + -Dprofiling=false # not passing -pg to CFLAGS + -Dtcmalloc=false + -Dwith_safe_path='' + -Dgnome_sdk_version=master + $(meson_use doc help) + $(meson_use gtk-doc docs) + -Dnetwork_tests=false + -Dctags_path='' + $(meson_feature webkit) + + -Dplugin_autotools=true + -Dplugin_bash_language_server=true + -Dplugin_blueprint=true + -Dplugin_buildstream=true + -Dplugin_c_pack=true + -Dplugin_cargo=true + $(meson_use clang plugin_clang) + $(meson_use clang plugin_clangd) + $(meson_use clang plugin_clang_format) + -Dplugin_cmake=true + -Dplugin_codespell=true + -Dplugin_code_index=true + -Dplugin_copyright=true + -Dplugin_ctags=true + -Dplugin_deviced=false # libdeviced not packaged? + $(meson_use d-spy plugin_dspy) + -Dplugin_editorconfig=true + -Dplugin_eslint=true + -Dplugin_file_search=true + $(meson_use flatpak plugin_flatpak) + -Dplugin_gdb=true + -Dplugin_gdiagnose=true + -Dplugin_gettext=true + $(meson_use git plugin_git) + -Dplugin_gopls=true + -Dplugin_gradle=true + -Dplugin_grep=true + -Dplugin_html_completion=true + $(meson_use webkit plugin_html_preview) + -Dplugin_intelephense=true + -Dplugin_jdtls=true + -Dplugin_jedi_language_server=true + -Dplugin_jhbuild=true + -Dplugin_make=true + -Dplugin_make_templates=true + $(meson_use webkit plugin_markdown_preview) + -Dplugin_maven=true + -Dplugin_meson=true + -Dplugin_meson_templates=true + -Dplugin_modelines=true + -Dplugin_mono=true + -Dplugin_newcomers=true + -Dplugin_notification=true + -Dplugin_npm=true + -Dplugin_phpize=true + -Dplugin_podman=true + -Dplugin_pygi=true + # -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842 + -Dplugin_qemu=true + -Dplugin_quick_highlight=true + -Dplugin_retab=true + -Dplugin_rstcheck=true + -Dplugin_rubocop=true + -Dplugin_rust_analyzer=false # rust-analyzer not packaged + -Dplugin_shellcmd=true + -Dplugin_shellcheck=true + $(meson_use spell plugin_spellcheck) + $(meson_use webkit plugin_sphinx_preview) + -Dplugin_stylelint=true + $(meson_use sysprof plugin_sysprof) + -Dplugin_sysroot=true + -Dplugin_todo=true + -Dplugin_ts_language_server=true + -Dplugin_update_manager=true + -Dplugin_valac=true + -Dplugin_vala_indenter=true + -Dplugin_valgrind=true + -Dplugin_vls=true + -Dplugin_waf=true + -Dplugin_words=true + -Dplugin_xml_pack=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + python_optimize + if use doc; then + rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die + rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die + # custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825 + mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die + # _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is. + rmdir "${ED}"/usr/share/doc/gnome-builder/ || die + fi + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + readme.gentoo_print_elog + + optfeature_header "Language support" + optfeature "Rust's Cargo build system" virtual/rust + optfeature "CMake" dev-util/cmake + optfeature "Java Maven build system" dev-java/maven-bin + optfeature "Meson Build system" dev-util/meson +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} + +src_test() { + virtx dbus-run-session meson test -C "${BUILD_DIR}" +} diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest index ab30077b413f..ee440f7bf3ff 100644 --- a/dev-util/hip/Manifest +++ b/dev-util/hip/Manifest @@ -16,6 +16,7 @@ AUX hip-5.1.3-fno-stack-protector.patch 788 BLAKE2B 8f9d01ceeec2098df4d49e116c14 AUX hip-5.1.3-llvm-15-noinline-keyword.patch 829 BLAKE2B 39b859e90acacd2eccdd60b690e1d882b63cfa66ff1b12effe447b18de72ffd61dd32983552f9ae39b384c3bbfbbcfd59ff2bb47943c1340bf6c1df5cb7d4075 SHA512 1933e883f84451e8512669572ea03dd25c916c6baeafac27b07e3d4a5e89165952a64afaceade4546e7e2d4473aba9811ac21131f283f9680d35e777ad9659a7 AUX hip-5.1.3-remove-cmake-doxygen-commands.patch 896 BLAKE2B 35640516bf416760db69b736d72c1e78efdbad8a930d621fdaffd13c5c250f5d80a6975c1e4c368389ce8059aee964c36645f420d0844141d09463637ba0bccb SHA512 b1288e1f4b7553c5bf0fe38a46fbdf269ca5c01fd8e0e225b9454d4916092601d565c57eaf9f716e06fee816e41cb3a948884060551b5a9d71da9b1a050765f9 AUX hip-5.1.3-rocm-path.patch 564 BLAKE2B ad554063a11d58ce5acfa8c8980bac2668d199b059bc2555d4cea40fbc53b6334daaea448d99cc391cee246d8318a450efdef669db2ee164a4db3a55d7d8e193 SHA512 eaa03f4d2394f61dcedde376de6c398625d284a7ac0c94ff2484929efdf298f455c796b96f16bf3989de6593a9a026a7681620b5ca13ce403aba4a32e5a38226 +AUX hip-5.3.3-correct-ldflag.patch 1196 BLAKE2B 93c0e7e92c898cfa5d39d008f8c18d82b9032d3f865725b59fb4c0fef263c9a7c4108ecca9f406c21411d72781b88fcacbd7b1e50cc6dd5483cbe89a37b9a2fc SHA512 7a81444c6f2b1a70a451b13440235ba14e058f9023abfd56502ad2ba12a00e31970873b92313a7888c3794083d0c011ce8a314b43e835e9fe872ad97de4e758f AUX hip-5.3.3-disable-Werror.patch 621 BLAKE2B 9bcdec821484ac20343e1352e3c3d5a9297f8e7ab81ed135c5b27f11dd0667c68939fe04157ae8b7dacc5cdcbb6631e0a1b66d6cc2cd796f6322b6ded75055c7 SHA512 799c40b5a2524e166aa674c432c7bfb93c03fe00832680a99cd701b2498cd33c52e5582f9754161173f17048b6ae346a7a5b6d59eddce8696670b1f229858fef AUX hip-5.3.3-remove-cmake-doxygen-commands.patch 976 BLAKE2B edff02ed7b2371739f1659a93ecad9485045091ec48c6aa018d8fde3a9f4a9a48bdcf0cca660e03b4f3ff0e6c4f019068019407f429913f8c3231cdb252b0464 SHA512 f6835f74fb34cd4a9ea0db693eff6e57c742f6912b29046f7b01b87037c014cdeb38f17dd0a6b90dd823656e2957b2d0bc981eb0c71221994ae455cefc03805b AUX hipvars-5.1.3.pm 629 BLAKE2B 6149f230aa0756603ac0b455d802db9c698be8e4a22367e98915db974ea16176f85f9b5a22e2572183641734cedbbe2ba2c826aa0223ea3e12c5550983db0480 SHA512 26ba459b13df1ad6dc50411ac6589dd3d17eff727fee0e938275912e36459c7a43b35233a7f78bbed282a992e969d8b8f95007964c810a5954b0abeccc67082d @@ -32,5 +33,5 @@ DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa66678 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f DIST rocm-tracer-5.1.3.tar.gz 511617 BLAKE2B 4142979b3b7d649798a7ac0b2a04b42aa7fbcbf82f2cf51b0e5363ec0da538046d6e59283d0ce1bfd341317bf24ac2f694d5c8a7d1f132f9b21caea5caf7eda3 SHA512 e73b0c921ffbdcac571d8b0825de39bd8a4fd5f2720ecdd0c189951db85efb607a0b1cd7a9bb02b3dbf329b277cb5e197525216a8e8927eea4e6ce290b7e7c7b EBUILD hip-5.1.3-r4.ebuild 6561 BLAKE2B eb04725deb7efa065bb83a127a298fbf24c768e2251226c1e1c246e09dc4107486bc2bd9a4e6ec7cb3abdb37a58638fe41456eda5e96ee3d5d6529e4b87ff20b SHA512 d3e3559331ed80e7e880af4b95bc27359dc8afb0fbde6e9beefe511b1ac96e086230e55468533d7882f6fe3ad26d734b2ec0c4d53e300bc2d13b551e608dc217 -EBUILD hip-5.3.3-r2.ebuild 5085 BLAKE2B 664fc12c3a17c33aa01a5b54f6054217c84e9dd68fa949d465663d6b486ac74550fb6da0e8a847756b65460f0d91d3f24dd50de8b3ffe5921e4c6742e856f31b SHA512 75a9d6e6c59ab7947cc6ea6e3a0ee697e9b2d445426482db8cdde031896899e78fe074a453cbaf5bf075c5d6ae71bd42dddbb8f850e558c7853e0c8ed7b4b1c2 +EBUILD hip-5.3.3-r3.ebuild 5140 BLAKE2B ca842dcb356db6820082b19eef1603fb206f3d5f96973f86443660c7de601da757643f9ced1b702574b63febbc770942d5a32ef90f55957ba7ddb8c94ec33d82 SHA512 3027a98f2f1e135ca22b5dee40905f11e4299589093b6d4b345893dbff90a7d6b6ce28a88339ba4159d2a4f843099f83e2bf5a95b26242882d6700462355b7ac MISC metadata.xml 729 BLAKE2B 92e36c42f6d8335e5a8e3a86b591ff9e6306e0d187644620fab7f8f7ddd00156ee91ff49184ffbe379e509f2096c51c421575a69de7abea3c0b372fdcec52ccb SHA512 84fc8234a5fdf54bf43228c2144d809a461862fb45fea24bf366ee5937df3882c3332429938792981e37dbb4cda6e5d7e05ac5deaded34d8bcce1eb53df8d0fd diff --git a/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch new file mode 100644 index 000000000000..20d117841c2b --- /dev/null +++ b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch @@ -0,0 +1,20 @@ +This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which +causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm` +Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820 +=================================================================== +Index: HIP-rocm-5.3.3/bin/hipcc.pl +=================================================================== +--- HIP-rocm-5.3.3.orig/bin/hipcc.pl ++++ HIP-rocm-5.3.3/bin/hipcc.pl +@@ -711,9 +711,9 @@ if ($HIP_PLATFORM eq "amd") { + + if (not $isWindows and not $compileOnly) { + if ($linkType eq 0) { +- $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; ++ $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs}; + } else { +- $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 "; ++ $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -lamdhip64 "; + } + # To support __fp16 and _Float16, explicitly link with compiler-rt + $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a"; diff --git a/dev-util/hip/hip-5.3.3-r2.ebuild b/dev-util/hip/hip-5.3.3-r2.ebuild deleted file mode 100644 index 072b8d319e97..000000000000 --- a/dev-util/hip/hip-5.3.3-r2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit cmake docs llvm prefix - -LLVM_MAX_SLOT=15 - -DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" -SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz - https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" - -IUSE="debug" - -DEPEND=" - >=dev-util/rocminfo-5 - sys-devel/clang:${LLVM_MAX_SLOT} - dev-libs/rocm-comgr:${SLOT} - virtual/opengl -" -RDEPEND="${DEPEND} - dev-perl/URI-Encode - sys-devel/clang-runtime:= - >=dev-libs/roct-thunk-interface-5" - -PATCHES=( - "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" - "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" - "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" - "${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch" - "${FILESDIR}/${PN}-5.3.3-disable-Werror.patch" - "${FILESDIR}/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch" -) - -S="${WORKDIR}/hipamd-rocm-${PV}" -HIP_S="${WORKDIR}"/HIP-rocm-${PV} -OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} -CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} -RTC_S="${WORKDIR}"/roctracer-rocm-${PV} -DOCS_DIR="${HIP_S}"/docs/doxygen-input -DOCS_CONFIG_NAME=doxy.cfg - -pkg_setup() { - # Ignore QA FLAGS check for library compiled from assembly sources - QA_FLAGS_IGNORED="/usr/$(get_libdir)/libhiprtc-builtins.so.$(ver_cut 1-2)" -} - -src_prepare() { - cmake_src_prepare - - eapply_user - - # Use Gentoo slot number, otherwise git hash is attempted in vain. - sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die - - # correctly find HIP_CLANG_INCLUDE_PATH using cmake - local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die - - # correct libs and cmake install dir - sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die - - sed -e "/\.hip/d" \ - -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die - - pushd ${HIP_S} || die - eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" - eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" - eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch" - eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch" - eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" - # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" - # which makes "stdlib.h" not found when using "#include_next" in header files; - sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ - -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ - -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ - -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ - -e "/rpath/s,--rpath=[^ ]*,," -i bin/hipcc.pl || die - - # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" - sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ - -i "${S}/hip-config.cmake.in" || die - - einfo "prefixing hipcc and its utils..." - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") - hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") - - cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.3.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" - sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ - -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ - -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die -} - -src_configure() { - use debug && CMAKE_BUILD_TYPE="Debug" - - # TODO: Currently a GENTOO configuration is build, - # this is also used in the cmake configuration files - # which will be installed to find HIP; - # Other ROCm packages expect a "RELEASE" configuration, - # see "hipBLAS" - local mycmakeargs=( - -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - -DCMAKE_BUILD_TYPE=${buildtype} - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_SKIP_RPATH=ON - -DBUILD_HIPIFY_CLANG=OFF - -DHIP_PLATFORM=amd - -DHIP_COMPILER=clang - -DROCM_PATH="${EPREFIX}/usr" - -DUSE_PROF_API=0 - -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF - -DROCCLR_PATH=${CLR_S} - -DHIP_COMMON_DIR=${HIP_S} - -DAMD_OPENCL_PATH=${OCL_S} - ) - - cmake_src_configure -} - -src_compile() { - HIP_PATH=${HIP_S} docs_compile - cmake_src_compile -} - -src_install() { - - cmake_src_install - - rm "${ED}/usr/include/hip/hcc_detail" || die - - # Don't install .hipInfo and .hipVersion to bin/lib - rm "${ED}/usr/bin/.hipVersion" || die -} diff --git a/dev-util/hip/hip-5.3.3-r3.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild new file mode 100644 index 000000000000..c11b85e3f2ec --- /dev/null +++ b/dev-util/hip/hip-5.3.3-r3.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DOCS_BUILDER="doxygen" +DOCS_DEPEND="media-gfx/graphviz" + +inherit cmake docs llvm prefix + +LLVM_MAX_SLOT=15 + +DESCRIPTION="C++ Heterogeneous-Compute Interface for Portability" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipamd" +SRC_URI="https://github.com/ROCm-Developer-Tools/hipamd/archive/rocm-${PV}.tar.gz -> rocm-hipamd-${PV}.tar.gz + https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-${PV}.tar.gz -> rocm-hip-${PV}.tar.gz + https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + +KEYWORDS="~amd64" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +IUSE="debug" + +DEPEND=" + >=dev-util/rocminfo-5 + sys-devel/clang:${LLVM_MAX_SLOT} + dev-libs/rocm-comgr:${SLOT} + virtual/opengl +" +RDEPEND="${DEPEND} + dev-perl/URI-Encode + sys-devel/clang-runtime:= + >=dev-libs/roct-thunk-interface-5" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.1-DisableTest.patch" + "${FILESDIR}/${PN}-5.0.1-hip_vector_types.patch" + "${FILESDIR}/${PN}-5.0.2-set-build-id.patch" + "${FILESDIR}/${PN}-5.3.3-remove-cmake-doxygen-commands.patch" + "${FILESDIR}/${PN}-5.3.3-disable-Werror.patch" + "${FILESDIR}/0001-SWDEV-352878-LLVM-pkg-search-directly-using-find_dep.patch" +) + +S="${WORKDIR}/hipamd-rocm-${PV}" +HIP_S="${WORKDIR}"/HIP-rocm-${PV} +OCL_S="${WORKDIR}"/ROCm-OpenCL-Runtime-rocm-${PV} +CLR_S="${WORKDIR}"/ROCclr-rocm-${PV} +RTC_S="${WORKDIR}"/roctracer-rocm-${PV} +DOCS_DIR="${HIP_S}"/docs/doxygen-input +DOCS_CONFIG_NAME=doxy.cfg + +pkg_setup() { + # Ignore QA FLAGS check for library compiled from assembly sources + QA_FLAGS_IGNORED="/usr/$(get_libdir)/libhiprtc-builtins.so.$(ver_cut 1-2)" +} + +src_prepare() { + cmake_src_prepare + + eapply_user + + # Use Gentoo slot number, otherwise git hash is attempted in vain. + sed -e "/set (HIP_LIB_VERSION_STRING/cset (HIP_LIB_VERSION_STRING ${SLOT#*/})" -i CMakeLists.txt || die + + # correctly find HIP_CLANG_INCLUDE_PATH using cmake + local LLVM_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + sed -e "/set(HIP_CLANG_ROOT/s:\"\${ROCM_PATH}/llvm\":${LLVM_PREFIX}:" -i hip-config.cmake.in || die + + # correct libs and cmake install dir + sed -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die + + sed -e "/\.hip/d" \ + -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die + + pushd ${HIP_S} || die + eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch" + eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch" + eapply "${FILESDIR}/${PN}-5.3.3-correct-ldflag.patch" + eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch" + eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch" + eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch" + # Setting HSA_PATH to "/usr" results in setting "-isystem /usr/include" + # which makes "stdlib.h" not found when using "#include_next" in header files; + sed -e "/FLAGS .= \" -isystem \$HSA_PATH/d" \ + -e "/HIP.*FLAGS.*isystem.*HIP_INCLUDE_PATH/d" \ + -e "s:\$ENV{'DEVICE_LIB_PATH'}:'${EPREFIX}/usr/lib/amdgcn/bitcode':" \ + -e "s:\$ENV{'HIP_LIB_PATH'}:'${EPREFIX}/usr/$(get_libdir)':" \ + -e "/rpath/s,--rpath=[^ ]*,," -i bin/hipcc.pl || die + + # change --hip-device-lib-path to "/usr/lib/amdgcn/bitcode", must align with "dev-libs/rocm-device-libs" + sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" \ + -i "${S}/hip-config.cmake.in" || die + + einfo "prefixing hipcc and its utils..." + hprefixify $(grep -rl --exclude-dir=build/ --exclude="hip-config.cmake.in" "/usr" "${S}") + hprefixify $(grep -rl --exclude-dir=build/ --exclude="hipcc.pl" "/usr" "${HIP_S}") + + cp "$(prefixify_ro "${FILESDIR}"/hipvars-5.3.3.pm)" bin/hipvars.pm || die "failed to replace hipvars.pm" + sed -e "s,@HIP_BASE_VERSION_MAJOR@,$(ver_cut 1)," -e "s,@HIP_BASE_VERSION_MINOR@,$(ver_cut 2)," \ + -e "s,@HIP_VERSION_PATCH@,$(ver_cut 3)," \ + -e "s,@CLANG_PATH@,${LLVM_PREFIX}/bin," -i bin/hipvars.pm || die +} + +src_configure() { + use debug && CMAKE_BUILD_TYPE="Debug" + + # TODO: Currently a GENTOO configuration is build, + # this is also used in the cmake configuration files + # which will be installed to find HIP; + # Other ROCm packages expect a "RELEASE" configuration, + # see "hipBLAS" + local mycmakeargs=( + -DCMAKE_PREFIX_PATH="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + -DCMAKE_BUILD_TYPE=${buildtype} + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_SKIP_RPATH=ON + -DBUILD_HIPIFY_CLANG=OFF + -DHIP_PLATFORM=amd + -DHIP_COMPILER=clang + -DROCM_PATH="${EPREFIX}/usr" + -DUSE_PROF_API=0 + -DFILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCCLR_PATH=${CLR_S} + -DHIP_COMMON_DIR=${HIP_S} + -DAMD_OPENCL_PATH=${OCL_S} + ) + + cmake_src_configure +} + +src_compile() { + HIP_PATH=${HIP_S} docs_compile + cmake_src_compile +} + +src_install() { + + cmake_src_install + + rm "${ED}/usr/include/hip/hcc_detail" || die + + # Don't install .hipInfo and .hipVersion to bin/lib + rm "${ED}/usr/bin/.hipVersion" || die +} -- cgit v1.2.3