[gentoo-commits] proj/R_overlay:master commit in: /, roverlay/
commit: 633975107b4a543c40454e3bdb7a44c498cb566b Author: Benda Xu gentoo org> AuthorDate: Fri Aug 23 07:26:39 2024 + Commit: Benda XU gentoo org> CommitDate: Fri Aug 23 07:28:27 2024 + URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=63397510 digest.py: bump to Python 3.11. portage has a C implementation of Whirlpool as the hash algorithm is largely unavailable after OpenSSL 3 is released. Signed-off-by: Benda Xu gentoo.org> roverlay-.ebuild | 2 +- roverlay/digest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roverlay-.ebuild b/roverlay-.ebuild index a2d2888..3e40ee6 100644 --- a/roverlay-.ebuild +++ b/roverlay-.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_8 ) +PYTHON_COMPAT=( python3_11 ) PYTHON_REQ_USE="ssl,threads(+),readline(+)" EGIT_REPO_URI='git://anongit.gentoo.org/proj/R_overlay.git' diff --git a/roverlay/digest.py b/roverlay/digest.py index 99e094b..ffe2336 100644 --- a/roverlay/digest.py +++ b/roverlay/digest.py @@ -68,7 +68,7 @@ if hashlib_supports ( 'whirlpool' ): _HASH_CREATE_MAP ['whirlpool'] = hashlib_wrap ( "whirlpool" ) else: import portage.util.whirlpool - _HASH_CREATE_MAP ['whirlpool'] = portage.util.whirlpool.new + _HASH_CREATE_MAP ['whirlpool'] = portage.util.whirlpool.CWhirlpool # -- end of imports / HASH_CREATE_MAP
[gentoo-commits] repo/gentoo:master commit in: dev-util/rocprofiler/, dev-util/rocprofiler/files/
commit: 39d67e8a99bb91fddb720319fd363cb698ab90dd Author: Yiyang Wu gmail com> AuthorDate: Sat May 18 08:19:48 2024 + Commit: Benda XU gentoo org> CommitDate: Sat May 18 19:30:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d67e8a dev-util/rocprofiler: relax SLOT dependencies Tested some simple use case for rocprofiler-5.3.3 on rocr-runtime/roctracer 5.7.1 and 6.1, no compatibility issues found. Also fix python 3.12 syntax warning. Update upstream url as well. Closes: https://github.com/gentoo/gentoo/pull/36729 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> .../rocprofiler-5.3.3-fix-python3.12-warning.patch | 88 ++ dev-util/rocprofiler/metadata.xml | 2 +- ...er-5.3.3.ebuild => rocprofiler-5.3.3-r1.ebuild} | 13 ++-- 3 files changed, 96 insertions(+), 7 deletions(-) diff --git a/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch b/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch new file mode 100644 index ..315ae6b880d9 --- /dev/null +++ b/dev-util/rocprofiler/files/rocprofiler-5.3.3-fix-python3.12-warning.patch @@ -0,0 +1,88 @@ +From c503cea17d6619d95c026fcf661333b3a587936b Mon Sep 17 00:00:00 2001 +From: Yiyang Wu +Date: Sat, 18 May 2024 16:14:43 +0800 +Subject: [PATCH] Fix python3.12 SyntaxWarning: invalid escape sequence + +--- + bin/mem_manager.py | 4 ++-- + bin/tblextr.py | 18 +- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/bin/mem_manager.py b/bin/mem_manager.py +index b5bed79..10ca971 100755 +--- a/bin/mem_manager.py b/bin/mem_manager.py +@@ -91,7 +91,7 @@ class MemManager: + event = rec_vals[2] # 'Name' + procid = rec_vals[3]# 'pid' + recordid = rec_vals[5] # 'Index' +-size_ptrn = re.compile(DELIM + 'Size=(\d+)' + DELIM) ++size_ptrn = re.compile(DELIM + r'Size=(\d+)' + DELIM) + filled_ptrn = re.compile('BW=') + # query syncronous memcopy API record + key = (recordid, procid, 0) +@@ -129,7 +129,7 @@ class MemManager: + event = rec_vals[4] # 'Name' + procid = rec_vals[5]# 'pid' + recordid = rec_vals[7] # 'Index' +-size_ptrn = re.compile(DELIM + 'Size=(\d+)' + DELIM) ++size_ptrn = re.compile(DELIM + r'Size=(\d+)' + DELIM) + + # query syncronous memcopy API record + key = (recordid, procid, 0) +diff --git a/bin/tblextr.py b/bin/tblextr.py +index 9f4abb4..81d0851 100755 +--- a/bin/tblextr.py b/bin/tblextr.py +@@ -112,14 +112,14 @@ def parse_res(infile): + if not os.path.isfile(infile): return + inp = open(infile, 'r') + +- beg_pattern = re.compile("^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") +- prop_pattern = re.compile("([\w-]+)\((\w+)\)"); +- ts_pattern = re.compile(", time\((\d*),(\d*),(\d*),(\d*)\)") ++ beg_pattern = re.compile(r"^dispatch\[(\d*)\], (.*) kernel-name\(\"([^\"]*)\"\)") ++ prop_pattern = re.compile(r"([\w-]+)\((\w+)\)"); ++ ts_pattern = re.compile(r", time\((\d*),(\d*),(\d*),(\d*)\)") + # var pattern below matches a variable name and a variable value from a one + # line text in the format of for example "WRITE_SIZE (0.25)" or + # "GRBM_GUI_ACTIVE (27867)" or "TA_TA_BUSY[0]" +- var_pattern = re.compile("^\s*([a-zA-Z0-9_]+(?:\[\d+\])?)\s+\((\d+(?:\.\d+)?)\)") +- pid_pattern = re.compile("pid\((\d*)\)") ++ var_pattern = re.compile(r"^\s*([a-zA-Z0-9_]+(?:\[\d+\])?)\s+\((\d+(?:\.\d+)?)\)") ++ pid_pattern = re.compile(r"pid\((\d*)\)") + + dispatch_number = 0 + var_table_pid = 0 +@@ -340,7 +340,7 @@ def fill_ext_db(table_name, db, indir, trace_name, api_pid): + # + # arguments manipulation routines + def get_field(args, field): +- ptrn1_field = re.compile(r'^.* ' + field + '\('); ++ ptrn1_field = re.compile(r'^.* ' + field + r'\('); + ptrn2_field = re.compile(r'\) .*$'); + ptrn3_field = re.compile(r'\)\)$'); + (field_name, n) = ptrn1_field.subn('', args, count=1); +@@ -351,7 +351,7 @@ def get_field(args, field): + return (field_name, n) + + def set_field(args, field, val): +- return re.subn(field + '\(\w+\)([ \)])', field + '(' + str(val) + ')\\1', args, count=1) ++ return re.subn(field + r'\(\w+\)([ \)])', field + '(' + str(val) + ')\\1', args, count=1) + + hsa_patch_data = {} + ops_patch_data = {} +@@ -384,8 +384,8 @@ def fill_api_db(table_name, db, indir, api_name, api_pid, dep_pid, dep_list, dep + hip_sync_dev_event_ptrn = re.
[gentoo-commits] repo/gentoo:master commit in: eclass/, profiles/desc/
commit: 7475e8ff0742ead7b45edea3ed7e79c394e23958 Author: Yiyang Wu gmail com> AuthorDate: Sun Apr 14 15:43:17 2024 + Commit: Benda XU gentoo org> CommitDate: Sat May 18 03:46:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7475e8ff rocm.eclass: Enable ROCm 6, add gfx94{0,1,2} (MI300) support Update the references, since the original reference does not contain MI300. The "see also" blog is also removed because it hasn't been updated for 2 years. Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> eclass/rocm.eclass| 12 +++- profiles/desc/amdgpu_targets.desc | 14 ++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass index e03e8bdd507a..7039455dec6b 100644 --- a/eclass/rocm.eclass +++ b/eclass/rocm.eclass @@ -161,7 +161,7 @@ _rocm_set_globals() { gfx906 gfx908 gfx90a gfx1030 ) ;; - 5.*|) + 5.*) unofficial_amdgpu_targets=( gfx803 gfx900 gfx1010 gfx1011 gfx1012 gfx1031 gfx1100 gfx1101 gfx1102 @@ -170,6 +170,16 @@ _rocm_set_globals() { gfx906 gfx908 gfx90a gfx1030 ) ;; + 6.*|) + unofficial_amdgpu_targets=( + gfx803 gfx900 gfx940 gfx941 + gfx1010 gfx1011 gfx1012 + gfx1031 gfx1101 gfx1102 + ) + official_amdgpu_targets=( + gfx906 gfx908 gfx90a gfx942 gfx1030 gfx1100 + ) + ;; *) die "Unknown ROCm major version! Please update rocm.eclass before bumping to new ebuilds" ;; diff --git a/profiles/desc/amdgpu_targets.desc b/profiles/desc/amdgpu_targets.desc index d52080781947..8f337b03f63d 100644 --- a/profiles/desc/amdgpu_targets.desc +++ b/profiles/desc/amdgpu_targets.desc @@ -1,15 +1,21 @@ -# Copyright 1999-2023 Gentoo Authors. +# Copyright 1999-2024 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 -# Reference: -# GPU name and Architecture codename: https://github.com/GPUOpen-Tools/device_info/blob/master/DeviceInfo.cpp -# See also: https://www.coelacanth-dream.com/posts/2019/12/30/did-rid-product-matome-p2/#fn:67 +# Reference: GPU name and architecture codename documented by +# GPUOpen-Tools https://github.com/GPUOpen-Tools/device_info/blob/master/DeviceInfo.cpp +# ROCm official document (Instinct accelerator only) https://rocm.docs.amd.com/en/latest/reference/gpu-arch/gpu-arch-spec-overview.html +# Kernel document (note: GC version is not amdgpu gfx target) https://www.kernel.org/doc/html/latest/gpu/amdgpu/driver-misc.html#discrete-gpu-info +# Kernel source code (map of IP version vs amdgpu gfx target) https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/gpu/drm/amd/amdkfd/kfd_device.c kgd2kfd_probe function +# Mesa drm source code https://gitlab.freedesktop.org/mesa/drm/blob/main/data/amdgpu.ids gfx803 - Fiji GPU, codename fiji, including Radeon R9 Nano/Fury/FuryX, Radeon Pro Duo, FirePro S9300x2, Radeon Instinct MI8 gfx900 - Vega GPU, codename vega10, including Radeon Vega Frontier Edition, Radeon RX Vega 56/64, Radeon RX Vega 64 Liquid, Radeon Pro Vega 48/56/64/64X, Radeon Pro WX 8200/9100, Radeon Pro V320/V340/SSG, Radeon Instinct MI25 gfx906 - Vega GPU, codename vega20, including Radeon (Pro) VII, Radeon Instinct MI50/MI60 gfx908 - CDNA Accelerator, codename arcturus, including AMD Instinct MI100 Accelerator gfx90a - CDNA2 Accelerator, codename aldebaran, including AMD Instinct MI200 series Accelerators +gfx940 - CDNA3 Accelerator, codename aqua_vangaram, MI300A rev 0 +gfx941 - CDNA3 Accelerator, codename aqua_vangaram, MI300X rev 0 +gfx942 - CDNA3 Accelerator, codename aqua_vangaram, MI300A and MI300X rev >=1 gfx1010 - RDNA GPU, codename navi10, including Radeon RX 5700XT/5700/5700M/5700B/5700XTB/5600XT/5600/5600M, Radeon Pro 5700XT/5700, Radeon Pro W5700X/W5700 gfx1011 - RDNA GPU, codename navi12, including Radeon Pro 5600M/V520 gfx1012 - RDNA GPU, codename navi14, including Radeon RX 5500XT/5500/5500M/5500XTB/5300/5300M, Radeon Pro 5500XT/5500M/5300/5300M, Radeon Pro W5500X/W5500/W5500M/W5300M
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: bd29b1782a348f0017d74a92204acd6f2704c96c Author: Yiyang Wu gmail com> AuthorDate: Mon Apr 8 06:10:07 2024 + Commit: Benda XU gentoo org> CommitDate: Sat May 18 03:45:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd29b178 rocm.eclass: remove xnack flag for broader compatibility Initially, rocm.eclass append xnack[1,2] feature flag to gfx9 GPUs, since ROCm upstream does this in many of their math libraries, e.g. rocBLAS [3]. The list includes gfx90a:xnack+, indicating xnack is usable for MI200 series, thus rocm.eclass append :xnack+ to gfx90a. But it turns out xnack- is also common for MI200 series, restricting to xnack+ produces incompatible GPU kernel with xnack- mode. Also, community also explores using xnack on other gfx9 GPU [4,5], which is previously restricted to xnack- in rocm.eclass. By not appending xnack feature flag, GPU kernels are compiled to "xnack any" mode, which can be run in either mode, potentially scarifying some performance [6,7], with no direct evidence. rocFFT reports no performance penalty[8]. For the reason above, do not append xnack feature flag to AMDGPU_TARGETS, which is compatible with GPUs operate in both xnack mode. [1] https://wiki.gentoo.org/wiki/ROCm#XNACK_target_feature [2] https://rocm.docs.amd.com/en/latest/conceptual/gpu-memory.html#xnack [3] https://github.com/ROCm/rocBLAS/blob/release/rocm-rel-5.0/CMakeLists.txt#L201 [4] https://niconiconi.neocities.org/tech-notes/xnack-on-amd-gpus/ [5] https://arxiv.org/abs/2401.02680 [6] https://llvm.org/docs/AMDGPUUsage.html#target-features [7] https://docs.olcf.ornl.gov/systems/crusher_quick_start_guide.html#compiling-hip-kernels-for-specific-xnack-modes [8] https://github.com/ROCm/rocFFT/commit/cd2689360ba3b3579d044d8925838ff307b4b4cf Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/36254 eclass/rocm.eclass | 19 ++- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass index 9804ecde97d0..e03e8bdd507a 100644 --- a/eclass/rocm.eclass +++ b/eclass/rocm.eclass @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rocm.eclass @@ -201,22 +201,7 @@ unset -f _rocm_set_globals # Append default target feature to GPU arch. See # https://llvm.org/docs/AMDGPUUsage.html#target-features get_amdgpu_flags() { - local amdgpu_target_flags - for gpu_target in ${AMDGPU_TARGETS}; do - local target_feature= - case ${gpu_target} in - gfx906|gfx908) - target_feature=:xnack- - ;; - gfx90a) - target_feature=:xnack+ - ;; - *) - ;; - esac - amdgpu_target_flags+="${gpu_target}${target_feature};" - done - echo "${amdgpu_target_flags}" + echo $(printf "%s;" ${AMDGPU_TARGETS[@]}) } # @FUNCTION: check_amdgpu
[gentoo-commits] repo/gentoo:master commit in: dev-python/jupyter-collaboration/, dev-python/jupyter-collaboration/files/, ...
commit: 2f155078f765ad90a8ba456daf8198fd800fee5d Author: Benda Xu gentoo org> AuthorDate: Sun Mar 24 10:07:47 2024 + Commit: Benda XU gentoo org> CommitDate: Sun Mar 24 13:37:54 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f155078 dev-python/jupyter-collaboration: new package, add 2.0.5 This is renamed from the previous jupyter-server-ydoc. profiles/arch/amd64/x32: mask jupyter-collaboration on x32. Reference: https://jupyterlab.readthedocs.io/en/latest/user/rtc.html Bug: https://bugs.gentoo.org/915824 Signed-off-by: Benda Xu gentoo.org> dev-python/jupyter-collaboration/Manifest | 1 + ...r-collaboration-2.0.5-no-node-for-version.patch | 42 ++ .../jupyter-collaboration-2.0.5.ebuild | 42 ++ dev-python/jupyter-collaboration/metadata.xml | 12 +++ profiles/arch/amd64/x32/package.mask | 1 + 5 files changed, 98 insertions(+) diff --git a/dev-python/jupyter-collaboration/Manifest b/dev-python/jupyter-collaboration/Manifest new file mode 100644 index ..a33beac6f32c --- /dev/null +++ b/dev-python/jupyter-collaboration/Manifest @@ -0,0 +1 @@ +DIST jupyter_collaboration-2.0.5.tar.gz 4806126 BLAKE2B 5df0d7f782f9574e9f48ea805786b8e85a71fa2938189eef31e0d674e7c173f14d388952e33529fcecd9754191caaaeacea30cb090452d8545a19e3951d3 SHA512 e1375bc0559a06596e565cfe3b9b0f9a83a95a64d8a474cf7065172f9df5b84faa4f1966867bb475610df4662205146bb5720005601bafe77790e541681a3e8d diff --git a/dev-python/jupyter-collaboration/files/jupyter-collaboration-2.0.5-no-node-for-version.patch b/dev-python/jupyter-collaboration/files/jupyter-collaboration-2.0.5-no-node-for-version.patch new file mode 100644 index ..665a8b91efa8 --- /dev/null +++ b/dev-python/jupyter-collaboration/files/jupyter-collaboration-2.0.5-no-node-for-version.patch @@ -0,0 +1,42 @@ +Index: jupyter_collaboration-2.0.3/pyproject.toml +=== +--- jupyter_collaboration-2.0.3.orig/pyproject.toml jupyter_collaboration-2.0.3/pyproject.toml +@@ -3,10 +3,11 @@ + + [build-system] + build-backend = "hatchling.build" +-requires = ["hatchling>=1.4.0", "hatch-nodejs-version", "jupyterlab>=4.0.0"] ++requires = ["hatchling>=1.4.0", "jupyterlab>=4.0.0"] + + [project] + name = "jupyter_collaboration" ++version = "2.0.5" + readme = "README.md" + license = { file = "LICENSE" } + requires-python = ">=3.8" +@@ -34,7 +35,7 @@ dependencies = [ + "jupyter_server_fileid>=0.7.0,<1", + "jsonschema>=4.18.0" + ] +-dynamic = ["version", "description", "authors", "urls", "keywords"] ++dynamic = ["description", "authors", "urls", "keywords"] + + [project.optional-dependencies] + dev = [ +@@ -63,15 +64,9 @@ line-length = 100 + [tool.isort] + profile = "black" + +-[tool.hatch.version] +-source = "nodejs" +- + [tool.hatch.build.hooks.version] + path = "jupyter_collaboration/_version.py" + +-[tool.hatch.metadata.hooks.nodejs] +-fields = ["description", "authors", "urls"] +- + [tool.hatch.build.targets.sdist] + artifacts = ["/jupyter_collaboration/labextension"] + exclude = ["/.github", "/binder", "node_modules"] diff --git a/dev-python/jupyter-collaboration/jupyter-collaboration-2.0.5.ebuild b/dev-python/jupyter-collaboration/jupyter-collaboration-2.0.5.ebuild new file mode 100644 index ..d023ac01306b --- /dev/null +++ b/dev-python/jupyter-collaboration/jupyter-collaboration-2.0.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_1{1..2} ) + +inherit distutils-r1 pypi + +DESCRIPTION="JupyterLab Extension enabling Real-Time Collaboration" +HOMEPAGE="https://github.com/jupyterlab/jupyter-collaboration"; + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="" +RDEPEND="dev-python/pycrdt-websocket[${PYTHON_USEDEP}] + >=dev-python/jupyterlab-4[${PYTHON_USEDEP}] + >=dev-python/jupyter-ydoc-2[${PYTHON_USEDEP}] + dev-python/jupyter-server-fileid[${PYTHON_USEDEP}] +" +BDEPEND="dev-python/hatch-jupyter-builder[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-jupyter[${PYTHON_USEDEP}] + dev-python/pytest-timeout[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.5-no-node-for-version.patch" +) + +distutils_enable_tests pytest + +src_install() { + distutils-r1_src_install + +
[gentoo-commits] repo/gentoo:master commit in: dev-python/jupyter-ydoc/, dev-python/jupyter-ydoc/files/
commit: 4ce335aa6e799fa18e70b7be7a9ec90ffb96c605 Author: Benda Xu gentoo org> AuthorDate: Mon Mar 11 02:57:24 2024 + Commit: Benda XU gentoo org> CommitDate: Sun Mar 24 13:37:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce335aa dev-python/jupyter-ydoc: revive with version 2.0.1. It is a dependency of jupyterlab real time collaboration extension. Bug: https://bugs.gentoo.org/915824 Signed-off-by: Benda Xu gentoo.org> dev-python/jupyter-ydoc/Manifest | 1 + .../jupyter-ydoc-1.0.2-no-node-for-version.patch | 30 ++ dev-python/jupyter-ydoc/jupyter-ydoc-2.0.1.ebuild | 48 ++ dev-python/jupyter-ydoc/metadata.xml | 13 ++ 4 files changed, 92 insertions(+) diff --git a/dev-python/jupyter-ydoc/Manifest b/dev-python/jupyter-ydoc/Manifest new file mode 100644 index ..fc75f7181210 --- /dev/null +++ b/dev-python/jupyter-ydoc/Manifest @@ -0,0 +1 @@ +DIST jupyter_ydoc-2.0.1.gh.tar.gz 984325 BLAKE2B bd15590f7eb9865304ae51931a8bb5a730959b1231a4c538b350c5d41f9891386158b18a75a744fff379edf2deea557d8fd26e5de6fcef7dddb39055e57fc883 SHA512 cd4c78f98578e349e18ca7d51b57cdd281f4e092c24bd152138c06158b484b9de2b44e37e43bbca55055575a37ecae7fc7c7032a0ca4bcd874abf15b815ad5d2 diff --git a/dev-python/jupyter-ydoc/files/jupyter-ydoc-1.0.2-no-node-for-version.patch b/dev-python/jupyter-ydoc/files/jupyter-ydoc-1.0.2-no-node-for-version.patch new file mode 100644 index ..bfd138ce0d66 --- /dev/null +++ b/dev-python/jupyter-ydoc/files/jupyter-ydoc-1.0.2-no-node-for-version.patch @@ -0,0 +1,30 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 6e0a069..42f76c1 100644 +--- a/pyproject.toml b/pyproject.toml +@@ -2,12 +2,12 @@ + # Distributed under the terms of the Modified BSD License. + + [build-system] +-requires = ["hatchling>=1.10.0", "hatch-nodejs-version"] ++requires = ["hatchling>=1.10.0"] + build-backend = "hatchling.build" + + [project] + name = "jupyter-ydoc" +-dynamic = ["version"] ++version = "1.0.2" + description = "Document structures for collaborative editing using Ypy" + requires-python = ">=3.7" + keywords = ["jupyter", "ypy"] +@@ -56,10 +56,6 @@ text = "BSD 3-Clause License" + Homepage = "https://jupyter.org"; + Source = "https://github.com/jupyter-server/jupyter_ydoc"; + +-[tool.hatch.version] +-source = "nodejs" +-path = "javascript/package.json" +- + [tool.hatch.build] + exclude = ["javascript", "!javascript/package.json"] + diff --git a/dev-python/jupyter-ydoc/jupyter-ydoc-2.0.1.ebuild b/dev-python/jupyter-ydoc/jupyter-ydoc-2.0.1.ebuild new file mode 100644 index ..a30ad14c4ca9 --- /dev/null +++ b/dev-python/jupyter-ydoc/jupyter-ydoc-2.0.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +MY_P=${PN/-/_}-${PV} +DESCRIPTION="Document structures for collaborative editing using Ypy" +HOMEPAGE=" + https://jupyter.org/ + https://github.com/jupyter-server/jupyter_ydoc/ + https://pypi.org/project/jupyter-ydoc/ +" +SRC_URI=" + https://github.com/jupyter-server/jupyter_ydoc/archive/v${PV}.tar.gz + -> ${MY_P}.gh.tar.gz +" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" + +# Requires node +RESTRICT="test" + +RDEPEND="dev-python/importlib-metadata[${PYTHON_USEDEP}] + dev-python/pycrdt[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + >=dev-python/websockets-10.0[${PYTHON_USEDEP}] + dev-python/pycrdt-websocket[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.2-no-node-for-version.patch" +) + +distutils_enable_tests pytest +# Hangs for some reason +#distutils_enable_sphinx docs/source dev-python/myst-parser dev-python/pydata-sphinx-theme diff --git a/dev-python/jupyter-ydoc/metadata.xml b/dev-python/jupyter-ydoc/metadata.xml new file mode 100644 index ..a7e33c55e1cf --- /dev/null +++ b/dev-python/jupyter-ydoc/metadata.xml @@ -0,0 +1,13 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + +s...@gentoo.org +Gentoo Science Project + + + +jupyter-ydoc +jupyter-server/jupyter_ydoc + +
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycrdt-websocket/
commit: b010899d8c69fc7679c7c891f535461b6327803b Author: Benda Xu gentoo org> AuthorDate: Sun Mar 24 09:34:36 2024 + Commit: Benda XU gentoo org> CommitDate: Sun Mar 24 13:37:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b010899d dev-python/pycrdt-websocket: new package, add 0.12.7 This package is replacing the previous ypy-websocket. Signed-off-by: Benda Xu gentoo.org> dev-python/pycrdt-websocket/Manifest | 1 + dev-python/pycrdt-websocket/metadata.xml | 12 + .../pycrdt-websocket-0.12.7.ebuild | 29 ++ 3 files changed, 42 insertions(+) diff --git a/dev-python/pycrdt-websocket/Manifest b/dev-python/pycrdt-websocket/Manifest new file mode 100644 index ..a8ab24bc1f84 --- /dev/null +++ b/dev-python/pycrdt-websocket/Manifest @@ -0,0 +1 @@ +DIST pycrdt_websocket-0.12.7.tar.gz 16835 BLAKE2B 89df20112120e120dcb4ae827e5cf170853b670f71a4535e2575e013c93fc879dbf7fd1e7554ec455251316c1c79a6f476edf5dbf9e233dc1ec4892f1d5ed376 SHA512 1d3846c437a9d0c463b1bfddd15dea48d7a2d3b8f22b32949e38cb6d80efe6cfd37afda9a807298538619e4f3b163735191ac35bc6375470c8bac02a184d diff --git a/dev-python/pycrdt-websocket/metadata.xml b/dev-python/pycrdt-websocket/metadata.xml new file mode 100644 index ..dba736dce03c --- /dev/null +++ b/dev-python/pycrdt-websocket/metadata.xml @@ -0,0 +1,12 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + +s...@gentoo.org +Gentoo Science Project + + +pycrdt-websocket +jupyter-server/pycrdt-websocket + + diff --git a/dev-python/pycrdt-websocket/pycrdt-websocket-0.12.7.ebuild b/dev-python/pycrdt-websocket/pycrdt-websocket-0.12.7.ebuild new file mode 100644 index ..186b6e0703b6 --- /dev/null +++ b/dev-python/pycrdt-websocket/pycrdt-websocket-0.12.7.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="WebSocket connector for pycrdt" +HOMEPAGE="https://github.com/jupyter-server/pycrdt-websocket"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=">=dev-python/pycrdt-0.8.7[${PYTHON_USEDEP}] + dev-python/aiosqlite[${PYTHON_USEDEP}]" +BDEPEND="test? ( + dev-python/uvicorn[${PYTHON_USEDEP}] +)" + +# skip tests that depends on yjs not available in Gentoo +EPYTEST_DESELECT=( + tests/test_pycrdt_yjs.py::test_pycrdt_yjs +) + +distutils_enable_tests pytest
[gentoo-commits] repo/gentoo:master commit in: dev-python/jupyter-server-fileid/
commit: e272f49ddc94ac7b28bdc5f2e07104f5188632f9 Author: Benda Xu gentoo org> AuthorDate: Mon Mar 11 02:56:45 2024 + Commit: Benda XU gentoo org> CommitDate: Sun Mar 24 13:37:31 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e272f49d dev-python/jupyter-server-fileid: revive. It is a dependency of jupyterlab real time collaboration extension. Bug: https://bugs.gentoo.org/915824 Signed-off-by: Benda Xu gentoo.org> dev-python/jupyter-server-fileid/Manifest | 1 + .../jupyter-server-fileid-0.9.1.ebuild | 45 ++ dev-python/jupyter-server-fileid/metadata.xml | 13 +++ 3 files changed, 59 insertions(+) diff --git a/dev-python/jupyter-server-fileid/Manifest b/dev-python/jupyter-server-fileid/Manifest new file mode 100644 index ..8253dc95eabc --- /dev/null +++ b/dev-python/jupyter-server-fileid/Manifest @@ -0,0 +1 @@ +DIST jupyter_server_fileid-0.9.1.tar.gz 54279 BLAKE2B 503303d0fc1443bed15d41e88700bf508cb9d5b14d146db52aca58c436355878334be96d1baa1847cdbab1bf893cb68e4ebe8f6230a6643286a3586af96f75d1 SHA512 0e02861c312c3cfe0a0665cb4423bad7e8414e48cc62baef085a4a46d9cc2b32526f5d1f62198ec51b0d5086b70976e9144ec41ecaf3e4922c5dab8300487da0 diff --git a/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.1.ebuild b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.1.ebuild new file mode 100644 index ..8e3a4acf6302 --- /dev/null +++ b/dev-python/jupyter-server-fileid/jupyter-server-fileid-0.9.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 pypi + +DESCRIPTION="An extension that maintains file IDs for documents in a running Jupyter Server" +HOMEPAGE=" + https://jupyter.org/ + https://github.com/jupyter-server/jupyter_server_fileid/ + https://pypi.org/project/jupyter-server-fileid/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/jupyter-server[${PYTHON_USEDEP}] + dev-python/jupyter-events[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + dev-python/pytest-jupyter[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # unreliable on tmpfs + # https://github.com/jupyter-server/jupyter_server_fileid/issues/58 + tests/test_manager.py::test_get_path_oob_move_nested + tests/test_manager.py::test_get_path_oob_move_deeply_nested +) + +python_install_all() { + distutils-r1_python_install_all + mv "${ED}/usr/etc" "${ED}/etc" || die +} diff --git a/dev-python/jupyter-server-fileid/metadata.xml b/dev-python/jupyter-server-fileid/metadata.xml new file mode 100644 index ..fb76de150888 --- /dev/null +++ b/dev-python/jupyter-server-fileid/metadata.xml @@ -0,0 +1,13 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + +s...@gentoo.org +Gentoo Science Project + + + +jupyter-server-fileid +jupyter-server/jupyter_server_fileid + +
[gentoo-commits] repo/gentoo:master commit in: dev-python/pycrdt/
commit: ce2bc8ddb0733a21a8092c4125f7bf28bdfb75c8 Author: Benda Xu gentoo org> AuthorDate: Sun Mar 24 09:36:00 2024 + Commit: Benda XU gentoo org> CommitDate: Sun Mar 24 13:37:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2bc8dd dev-python/pycrdt: new package, add 0.8.11 This package is replacing the previous ypy. Signed-off-by: Benda Xu gentoo.org> dev-python/pycrdt/Manifest | 59 ++ dev-python/pycrdt/metadata.xml | 12 + dev-python/pycrdt/pycrdt-0.8.11.ebuild | 91 ++ 3 files changed, 162 insertions(+) diff --git a/dev-python/pycrdt/Manifest b/dev-python/pycrdt/Manifest new file mode 100644 index ..3cdfbbed1dcc --- /dev/null +++ b/dev-python/pycrdt/Manifest @@ -0,0 +1,59 @@ +DIST atomic_refcell-0.1.13.crate 11760 BLAKE2B 154efe12b2af05077764e5d9f292f5e5400d39fbb222f36146723312ccc3c6e3b96db8a13396394f30e30f19c6af830ef4fb1df8d4974b6c0285518d3a3c9850 SHA512 f5318e422d02904131ebf5f577ec51fb3d8bcbbfa52096b590df100acf8e991b17b04ad93b898e69628ed6308388a7243199c2da9be927144d3f6737d9343e3f +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99daf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST memoffset-0.9.0.crate 903
[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/
commit: 145ae309c6ffbb2c26e75f8d46ba7c60b1c7bf30 Author: Benda Xu gentoo org> AuthorDate: Mon Mar 11 03:00:53 2024 + Commit: Benda XU gentoo org> CommitDate: Mon Mar 11 03:08:48 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145ae309 sci-physics/root: call python-single-r1_pkg_setup unconditionally. ROOT relies on python to generate headers, even if pyROOT is not enabled. Signed-off-by: Benda Xu gentoo.org> sci-physics/root/root-6.28.12-r1.ebuild | 4 +++- sci-physics/root/root-6.30.04-r1.ebuild | 4 +++- sci-physics/root/root-6.30..ebuild | 4 +++- sci-physics/root/root-.ebuild | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sci-physics/root/root-6.28.12-r1.ebuild b/sci-physics/root/root-6.28.12-r1.ebuild index cb1bd02dcaa9..1c6e78d4b623 100644 --- a/sci-physics/root/root-6.28.12-r1.ebuild +++ b/sci-physics/root/root-6.28.12-r1.ebuild @@ -140,13 +140,15 @@ RDEPEND="${CDEPEND} ) " +BDEPEND="${PYTHON_DEPS}" + PATCHES=( "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch ) pkg_setup() { use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup elog "There are extra options on packages not available in Gentoo." elog "You can use the environment variable MYCMAKEARGS to enable" diff --git a/sci-physics/root/root-6.30.04-r1.ebuild b/sci-physics/root/root-6.30.04-r1.ebuild index cb1bd02dcaa9..1c6e78d4b623 100644 --- a/sci-physics/root/root-6.30.04-r1.ebuild +++ b/sci-physics/root/root-6.30.04-r1.ebuild @@ -140,13 +140,15 @@ RDEPEND="${CDEPEND} ) " +BDEPEND="${PYTHON_DEPS}" + PATCHES=( "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch ) pkg_setup() { use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup elog "There are extra options on packages not available in Gentoo." elog "You can use the environment variable MYCMAKEARGS to enable" diff --git a/sci-physics/root/root-6.30..ebuild b/sci-physics/root/root-6.30..ebuild index cb1bd02dcaa9..1c6e78d4b623 100644 --- a/sci-physics/root/root-6.30..ebuild +++ b/sci-physics/root/root-6.30..ebuild @@ -140,13 +140,15 @@ RDEPEND="${CDEPEND} ) " +BDEPEND="${PYTHON_DEPS}" + PATCHES=( "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch ) pkg_setup() { use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup elog "There are extra options on packages not available in Gentoo." elog "You can use the environment variable MYCMAKEARGS to enable" diff --git a/sci-physics/root/root-.ebuild b/sci-physics/root/root-.ebuild index cb1bd02dcaa9..1c6e78d4b623 100644 --- a/sci-physics/root/root-.ebuild +++ b/sci-physics/root/root-.ebuild @@ -140,13 +140,15 @@ RDEPEND="${CDEPEND} ) " +BDEPEND="${PYTHON_DEPS}" + PATCHES=( "${FILESDIR}"/${PN}-6.12.06_cling-runtime-sysroot.patch ) pkg_setup() { use fortran && fortran-2_pkg_setup - use python && python-single-r1_pkg_setup + python-single-r1_pkg_setup elog "There are extra options on packages not available in Gentoo." elog "You can use the environment variable MYCMAKEARGS to enable"
[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/, dev-util/hip/files/
commit: 093aafa4f80f05873a812a69f072413609da50ac Author: Sv. Lockal gmail com> AuthorDate: Fri Oct 20 22:02:59 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 15:01:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=093aafa4 dev-util/hip: add extend-isa-compatibility-check patch Bug: https://github.com/gentoo/gentoo/pull/33400 Signed-off-by: Benda Xu gentoo.org> Signed-off-by: Sv. Lockal gmail.com> .../hip-5.7.1-extend-isa-compatibility-check.patch | 236 + dev-util/hip/hip-5.7.1-r1.ebuild | 1 + 2 files changed, 237 insertions(+) diff --git a/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch b/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch new file mode 100644 index ..7853de693cde --- /dev/null +++ b/dev-util/hip/files/hip-5.7.1-extend-isa-compatibility-check.patch @@ -0,0 +1,236 @@ +Combined with matching changes within rocr-runtime ebuild, this patch allows +to load compatible kernels whenever possible. +For example if AMDGPU_TARGETS is set to gfx1030 and some application +was started on gfx1036, it loads gfx1030 kernel. + +Author: Cordell Bloor +https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0025-improve-rocclr-isa-compatibility-check.patch +https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/master/debian/patches/0026-extend-hip-isa-compatibility-check.patch +--- a/hipamd/src/hip_code_object.cpp b/hipamd/src/hip_code_object.cpp +@@ -390,47 +390,123 @@ static bool getTripleTargetID(std::string bundled_co_entry_id, const void* code_ + return true; + } + +-static bool isCodeObjectCompatibleWithDevice(std::string co_triple_target_id, +- std::string agent_triple_target_id) { ++struct GfxPattern { ++ std::string root; ++ std::string suffixes; ++}; ++ ++static bool matches(const GfxPattern& p, const std::string& s) { ++ if (p.root.size() + 1 != s.size()) { ++return false; ++ } ++ if (0 != std::memcmp(p.root.data(), s.data(), p.root.size())) { ++return false; ++ } ++ return p.suffixes.find(s[p.root.size()]) != std::string::npos; ++} ++ ++static bool isGfx900EquivalentProcessor(const std::string& processor) { ++ return matches(GfxPattern{"gfx90", "029c"}, processor); ++} ++ ++static bool isGfx900SupersetProcessor(const std::string& processor) { ++ return matches(GfxPattern{"gfx90", "0269c"}, processor); ++} ++ ++static bool isGfx1030EquivalentProcessor(const std::string& processor) { ++ return matches(GfxPattern{"gfx103", "0123456"}, processor); ++} ++ ++static bool isGfx1010EquivalentProcessor(const std::string& processor) { ++ return matches(GfxPattern{"gfx101", "02"}, processor); ++} ++ ++static bool isGfx1010SupersetProcessor(const std::string& processor) { ++ return matches(GfxPattern{"gfx101", "0123"}, processor); ++} ++ ++enum CompatibilityScore { ++ CS_EXACT_MATCH = 1 << 4, ++ CS_PROCESSOR_MATCH = 1 << 3, ++ CS_PROCESSOR_COMPATIBLE = 1 << 2, ++ CS_XNACK_SPECIALIZED = 1 << 1, ++ CS_SRAM_ECC_SPECIALIZED = 1 << 0, ++ CS_INCOMPATIBLE = 0, ++}; ++ ++static int getProcessorCompatibilityScore(const std::string& co_processor, ++ const std::string& agent_processor) { ++ if (co_processor == agent_processor) ++return CS_PROCESSOR_MATCH; ++ ++ if (isGfx900SupersetProcessor(agent_processor)) ++return isGfx900EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE; ++ ++ if (isGfx1010SupersetProcessor(agent_processor)) ++return isGfx1010EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE; ++ ++ if (isGfx1030EquivalentProcessor(agent_processor)) ++return isGfx1030EquivalentProcessor(co_processor) ? CS_PROCESSOR_COMPATIBLE : CS_INCOMPATIBLE; ++ ++ return CS_INCOMPATIBLE; ++} ++ ++static int getCompatiblityScore(std::string co_triple_target_id, ++std::string agent_triple_target_id) { + // Primitive Check +- if (co_triple_target_id == agent_triple_target_id) return true; ++ if (co_triple_target_id == agent_triple_target_id) return CS_EXACT_MATCH; + + // Parse code object triple target id + if (!consume(co_triple_target_id, std::string(AMDGCN_TARGET_TRIPLE) + '-')) { +-return false; ++return CS_INCOMPATIBLE; + } + + std::string co_processor; + char co_sram_ecc, co_xnack; + if (!getTargetIDValue(co_triple_target_id, co_processor, co_sram_ecc, co_xnack)) { +-return false; ++return CS_INCOMPATIBLE; + } + +- if (!co_triple_target_id.empty()) return false; ++ if (!co_triple_target_id.empty()) return CS_INCOMPATIBLE; + + // Parse agent isa triple target id +
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 76dc598ae5a2f447f3b9d9e69fb1499b5631c926 Author: Benda Xu gentoo org> AuthorDate: Sun Nov 19 06:46:10 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 14:51:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76dc598a rocm.eclass: add ROCM_SKIP_GLOBALS for the USE-flags exposure. Low level ebuilds such as dev-util/hip and dev-libs/rocm-opencl-runtime unconditionally supports all the AMDGPU cards. They do not need to define amdgpu_targets_* USE-flags. But their src_test() call check_amdgpu() to confirm an AMDGPU is available. Reference: https://marc.info/?l=gentoo-dev&m=170045497732286 Signed-off-by: Benda Xu gentoo.org> eclass/rocm.eclass | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/eclass/rocm.eclass b/eclass/rocm.eclass index b78dfea1cc31..9804ecde97d0 100644 --- a/eclass/rocm.eclass +++ b/eclass/rocm.eclass @@ -125,11 +125,26 @@ _ROCM_ECLASS=1 # DEPEND="sci-libs/rocBLAS[${ROCM_USEDEP}]" # @CODE +# @ECLASS_VARIABLE: ROCM_SKIP_GLOBALS +# @DESCRIPTION: +# Controls whether _rocm_set_globals() is executed. This variable is for +# ebuilds that call check_amdgpu() without the need to define amdgpu_targets_* +# USE-flags, such as dev-util/hip and dev-libs/rocm-opencl-runtime. +# +# Example use: +# @CODE +# ROCM_SKIP_GLOBALS=1 +# inherit rocm +# @CODE + # @FUNCTION: _rocm_set_globals # @DESCRIPTION: # Set global variables useful to ebuilds: IUSE, ROCM_REQUIRED_USE, and -# ROCM_USEDEP +# ROCM_USEDEP, unless ROCM_SKIP_GLOBALS is set. + _rocm_set_globals() { + [[ -n ${ROCM_SKIP_GLOBALS} ]] && return + # Two lists of AMDGPU_TARGETS of certain ROCm version. Official support # matrix: # https://docs.amd.com/bundle/ROCm-Installation-Guide-v${ROCM_VERSION}/page/Prerequisite_Actions.html. @@ -179,7 +194,6 @@ _rocm_set_globals() { _rocm_set_globals unset -f _rocm_set_globals - # @FUNCTION: get_amdgpu_flags # @USAGE: get_amdgpu_flags # @DESCRIPTION:
[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/
commit: 2f762d4c8b48897a82f79bd64b7b8bc1aee8b98f Author: Benda Xu gentoo org> AuthorDate: Sat Nov 18 03:41:01 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 14:51:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f762d4c dev-util/hip: depend on rocr-runtime. HIP uses hsa_amd_memory_copy_engine_status() function, only available in rocr-runtime newer than 5.6.0. Closes: https://bugs.gentoo.org/913208 Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-5.7.1-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r1.ebuild index c9094afe5ba6..8eb15a833e66 100644 --- a/dev-util/hip/hip-5.7.1-r1.ebuild +++ b/dev-util/hip/hip-5.7.1-r1.ebuild @@ -26,6 +26,7 @@ DEPEND=" >=dev-util/rocminfo-5 sys-devel/clang:${LLVM_MAX_SLOT} dev-libs/rocm-comgr:${SLOT} + >=dev-libs/rocr-runtime-5.6 x11-base/xorg-proto virtual/opengl "
[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/, dev-util/hip/files/
commit: 5297819d6d04e8608d329a12afa05dd68ea4f10f Author: Benda Xu gentoo org> AuthorDate: Sat Nov 18 14:54:50 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 15:01:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5297819d dev-util/hip: include test suit. The dev-util/hip upstream has separated its test cases into a full git repository with an independent build system. To run the test cases, we have to call cmake twice in every src_* phase. I come up with a wrapper to hack CMAKE_USE_DIR and BUILD_DIR values. Ignore vulkan tests before someone could figure out how to properly run them. Reference: https://github.com/ROCm-Developer-Tools/HIP/issues/3292 Closes: https://github.com/gentoo/gentoo/pull/33906 Signed-off-by: Benda Xu gentoo.org> dev-util/hip/Manifest | 1 + ...test-5.7.0-rocm_agent_enumerator-location.patch | 15 + dev-util/hip/hip-5.7.1-r1.ebuild | 75 +++--- 3 files changed, 82 insertions(+), 9 deletions(-) diff --git a/dev-util/hip/Manifest b/dev-util/hip/Manifest index d84cbf43fe2e..13df1e2aaa2d 100644 --- a/dev-util/hip/Manifest +++ b/dev-util/hip/Manifest @@ -4,6 +4,7 @@ DIST rocclr-5.1.3.tar.gz 618606 BLAKE2B 02b7732ddd03c0883bee49c56466cd21c649159f DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827eeea59f4312b788e868265dcb42197181fd5ef411416da2e11662c7f665f578aa750ab88c3a5405bcc58ee449 SHA512 3f85532cffc09c2ca8e7cd1770263d1c1a38633ed2bc5cfe62072e12a6f8f669db400519950718be31f6b77693d372e2ef905f06c7f02e126aa9ff7d2da97924 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f +DIST rocm-5.7.0.tar.gz 845881 BLAKE2B 08255edc1407e5ef85895336b11496319695318fce265565728ad75175b5e1dfab98f696fee2d27e60c48e862f721fad4c53118cc70b807353fff5f97ed72ac2 SHA512 72420e16c7cfe9687e030331838666dabaa43d686bdad1d109431e44db99070a2cf6dd64b59e3275019abedd6612f6008c798a79275e7225b6b122fb9f644660 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965 DIST rocm-hip-5.1.3.tar.gz 967696 BLAKE2B 15cb52b5934b84acf515fe9c83b7c8982e00a23e20af933bdd2c4bc5b56fd42b08c8a08e840c85d2e0a8386d5a0e9c110504f68499989de1aaad00e9a5efcf43 SHA512 6b6fd6c12d73788df1711b12326b97fc7a184f319e0db114947b7967b75f2ee131f81e42e43a4981456b507221a6013133731120409f90214e13304299ccbc24 DIST rocm-hip-5.3.3.tar.gz 1151858 BLAKE2B 5f460b2078c850b3eb4414fcec4a6f951a3b282aa9828f77ba5d5adfdc0ee8d2e62c856e112a154c340daaf7dad49f4871412edd7b38f7fae2e6b17840ee144b SHA512 e747cc10e78cd09009cac762f0e060be13f3447af7ec2a4a2889cbdc09cd76ecb1b5b58c89f09a3b45a8296c2c71e1c55baf113e58a5a12434af3de7168b8d87 diff --git a/dev-util/hip/files/hip-test-5.7.0-rocm_agent_enumerator-location.patch b/dev-util/hip/files/hip-test-5.7.0-rocm_agent_enumerator-location.patch new file mode 100644 index ..1d967212ac9a --- /dev/null +++ b/dev-util/hip/files/hip-test-5.7.0-rocm_agent_enumerator-location.patch @@ -0,0 +1,15 @@ +In Gentoo rocm_agent_enumerator is installed by rocminfo and is in PATH. + +--- catch/CMakeLists.txt~ 2023-11-18 13:56:08.0 +0800 catch/CMakeLists.txt 2023-11-18 13:59:28.136170638 +0800 +@@ -182,9 +182,8 @@ + # rocm_agent_enumerator + if(NOT DEFINED OFFLOAD_ARCH_STR +AND NOT DEFINED ENV{HCC_AMDGPU_TARGET} +- AND EXISTS "${ROCM_PATH}/bin/rocm_agent_enumerator" +AND HIP_PLATFORM STREQUAL "amd" AND UNIX) +-execute_process(COMMAND ${ROCM_PATH}/bin/rocm_agent_enumerator ++execute_process(COMMAND rocm_agent_enumerator + OUTPUT_VARIABLE HIP_GPU_ARCH + RESULT_VARIABLE ROCM_AGENT_ENUM_RESULT) + # Trim out gfx000 diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r1.ebuild index 8eb15a833e66..2bc703093df9 100644 --- a/dev-util/hip/hip-5.7.1-r1.ebuild +++ b/dev-util/hip/hip-5.7.1-r1.ebuild @@ -5,21 +5,26 @@ EAPI=8 DOCS_BUILDER="doxygen" DOCS_DEPEND="media-gfx/graphviz" +ROCM_SKIP_GLOBALS=1 -inherit cmake docs llvm +inherit cmake docs llvm rocm LLVM_MAX_SLOT=17 +TEST_PV=5.7.0 # No hip-test-5.7.1 release + DESCRIPTION="C++ Hete
[gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-runtime/
commit: bdf07728f9bcc159aff0e383a7db9b20b15e2910 Author: Benda Xu gentoo org> AuthorDate: Mon Nov 27 00:40:40 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 15:01:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf07728 dev-libs/rocm-opencl-runtime: call check_amdgpu() from rocm.eclass. Signed-off-by: Benda Xu gentoo.org> ...1.ebuild => rocm-opencl-runtime-5.7.1-r1.ebuild} | 21 +++-- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild similarity index 80% rename from dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild rename to dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild index 95b46bd4cf1b..47adc38490e0 100644 --- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1.ebuild +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-5.7.1-r1.ebuild @@ -3,7 +3,8 @@ EAPI=8 -inherit cmake edo flag-o-matic +ROCM_SKIP_GLOBALS=1 +inherit cmake edo flag-o-matic rocm DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"; @@ -72,24 +73,8 @@ src_install() { doins tools/cltrace/libcltrace.so } -# Copied from rocm.eclass. This ebuild does not need amdgpu_targets -# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the -# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid -# pkgcheck warning. -check-amdgpu() { - for device in /dev/kfd /dev/dri/render*; do - addwrite ${device} - if [[ ! -r ${device} || ! -w ${device} ]]; then - eerror "Cannot read or write ${device}!" - eerror "Make sure it is present and check the permission." - ewarn "By default render group have access to it. Check if portage user is in render group." - die "${device} inaccessible" - fi - done -} - src_test() { - check-amdgpu + check_amdgpu cd "${BUILD_DIR}"/tests/ocltst || die export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/
commit: bceba55c72407a9669165f0be9985e54d3a8f0a6 Author: Benda Xu gentoo org> AuthorDate: Mon Nov 20 02:56:38 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Dec 14 15:01:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bceba55c dev-util/hip: get rid of FindHIP and keep hip-config. According to the cmake documentation, do not write find modules for packages that themselves build with CMake. Instead provide a CMake package configuration file with the package itself. FindHIP is needed by HIP over CUDA, not what Gentoo is aiming for. Reference: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/66 Reference: https://cmake.org/cmake/help/latest/command/find_package.html Bug: https://github.com/ROCm-Developer-Tools/hipamd/issues/39 Signed-off-by: Benda Xu gentoo.org> dev-util/hip/hip-5.7.1-r1.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/dev-util/hip/hip-5.7.1-r1.ebuild b/dev-util/hip/hip-5.7.1-r1.ebuild index 2bc703093df9..25601091075f 100644 --- a/dev-util/hip/hip-5.7.1-r1.ebuild +++ b/dev-util/hip/hip-5.7.1-r1.ebuild @@ -59,6 +59,10 @@ hip_test_wrapper() { } src_prepare() { + # hipamd is itself built by cmake, and should never provide a + # FindHIP.cmake module. + rm -r "${WORKDIR}"/HIP-rocm-${PV}/cmake/FindHIP* || die + # https://github.com/ROCm-Developer-Tools/HIP/commit/405d029422ba8bb6be5a233d5eebedd2ad2e8bd3 # https://github.com/ROCm-Developer-Tools/clr/commit/ab6d34ae773f4d151e04170c0f4e46c1135ddf3e # Migrated to hip-test, but somehow the change is not applied to the tarball.
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocSOLVER/
commit: acbaf4d8fe584492d1a1a68d46245d28e327d9a3 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 19:06:54 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbaf4d8 sci-libs/rocSOLVER: add 5.7.1 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocSOLVER/Manifest | 1 + sci-libs/rocSOLVER/metadata.xml | 3 ++ sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild | 67 +++ 3 files changed, 71 insertions(+) diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 35de2a25db03..99692f483643 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1,2 +1,3 @@ DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753 DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6 +DIST rocSOLVER-5.7.1.tar.gz 1859403 BLAKE2B f7a40494deda9dd66f2fb2f57e13665688e89e1f82733701ec60a520bc4b9f7d5899ada618a37e73baa3a910757be4f11d5fced5d4d2ad82c56918b34d265511 SHA512 78e0a2b5b069378696afebf5e3e023449b3d7705aa79099eb7721c142d7525255825b41bf413324c33178091315e3909980a1bf0cbb66e0891c85e757858ee1c diff --git a/sci-libs/rocSOLVER/metadata.xml b/sci-libs/rocSOLVER/metadata.xml index 344dd1337031..da8fc11173b1 100644 --- a/sci-libs/rocSOLVER/metadata.xml +++ b/sci-libs/rocSOLVER/metadata.xml @@ -12,6 +12,9 @@ xgreenlandfor...@gmail.com Yiyang Wu + +ROCmSoftwarePlatform/rocSOLVER + Perform rocsolver-test to compare the result between rocSOLVER and system LAPACK. Build and install rocsolver-bench. diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild new file mode 100644 index ..a5e339aa71ab --- /dev/null +++ b/sci-libs/rocSOLVER/rocSOLVER-5.7.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm + +DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +IUSE="test benchmark" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}] + dev-libs/libfmt + benchmark? ( virtual/blas )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( dev-cpp/gtest + >=dev-util/cmake-3.22 + virtual/blas )" + +RESTRICT="!test? ( test )" + +S=${WORKDIR}/${PN}-rocm-${PV} + +src_configure() { + # avoid sandbox violation + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=On + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -Wno-dev + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_SAMPLES=NO + -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) + -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + cd "${BUILD_DIR}"/clients/staging || die + LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test +} + +src_install() { + cmake_src_install + + if use benchmark; then + cd "${BUILD_DIR}" || die + dobin clients/staging/rocsolver-bench + fi +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocPRIM/files/, sci-libs/rocPRIM/
commit: 4b83d8d1fb04bb3a774ec0f0fd560fe4b341fecf Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 19:00:16 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b83d8d1 sci-libs/rocPRIM: add 5.7.1 add 5.7.1 expand-isa-compatibility patch Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocPRIM/Manifest | 1 + .../rocPRIM-5.7.1-expand-isa-compatibility.patch | 29 sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild | 79 ++ 3 files changed, 109 insertions(+) diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest index 37d940a49b1c..f23f73c59466 100644 --- a/sci-libs/rocPRIM/Manifest +++ b/sci-libs/rocPRIM/Manifest @@ -1 +1,2 @@ DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a +DIST rocPRIM-5.7.1.tar.gz 535649 BLAKE2B 469bf59b5c92c37df96f58bac5a6559dc2cb879e5f82e539881d79bda57d23c25a9b114466042258e87862a88cd53d260155d7785c9a69a1800b0d05e931f56d SHA512 b2f0bc07dbc5cd111dd513f6c05dbc533908c52ea99caf77d6a4dd35db2b28f98c80006bd1f50a232873eab00b70e54231c38bfd1035c8845029d53690fd5e71 diff --git a/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch b/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch new file mode 100644 index ..84e3e7875ee8 --- /dev/null +++ b/sci-libs/rocPRIM/files/rocPRIM-5.7.1-expand-isa-compatibility.patch @@ -0,0 +1,29 @@ +This patch allows to HSA_OVERRIDE_GFX_VERSION environment variable (library just crashes otherwise) +--- a/rocprim/include/rocprim/device/config_types.hpp b/rocprim/include/rocprim/device/config_types.hpp +@@ -197,15 +197,21 @@ constexpr bool prefix_equals(const char* lhs, const char* rhs, std::size_t n) + constexpr target_arch get_target_arch_from_name(const char* const arch_name, const std::size_t n) + { + constexpr const char* target_names[] +-= {"gfx803", "gfx900", "gfx906", "gfx908", "gfx90a", "gfx1030", "gfx1102"}; ++= {"gfx803", ++"gfx900", "gfx902", "gfx909", "gfx912", ++"gfx906", ++"gfx908", ++"gfx90a", ++"gfx1030", "gfx1031", "gfx1032", "gfx1033", "gfx1034", "gfx1035", "gfx1036", ++"gfx1100", "gfx1101", "gfx1102", "gfx1103", "gfx1150", "gfx1151"}; + constexpr target_arch target_architectures[] = { + target_arch::gfx803, +-target_arch::gfx900, ++target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, target_arch::gfx900, + target_arch::gfx906, + target_arch::gfx908, + target_arch::gfx90a, +-target_arch::gfx1030, +-target_arch::gfx1102, ++target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, target_arch::gfx1030, ++target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, target_arch::gfx1102, + }; + static_assert(sizeof(target_names) / sizeof(target_names[0]) + == sizeof(target_architectures) / sizeof(target_architectures[0]), diff --git a/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild new file mode 100644 index ..3353023628db --- /dev/null +++ b/sci-libs/rocPRIM/rocPRIM-5.7.1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} +inherit cmake rocm + +DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RDEPEND="dev-util/hip + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" +BDEPEND="dev-util/rocm-cmake + >=dev-util/cmake-3.22" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/rocPRIM-rocm-${PV}" + +RESTRICT="!test? ( test )" + +PATCHES=( "${FILESDIR}"/${PN}-5
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocBLAS/
commit: 40d52bf03382a1aca591c226d125b56492ee6a88 Author: Benda Xu gentoo org> AuthorDate: Sun Nov 26 14:48:02 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d52bf0 sci-libs/rocBLAS: re-enable tests. Signed-off-by: Benda Xu gentoo.org> sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild b/sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild index c3f12fff175e..e1f9a4b8e8f0 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild @@ -17,11 +17,10 @@ S="${WORKDIR}/${PN}-rocm-${PV}" LICENSE="BSD" KEYWORDS="~amd64" SLOT="0/$(ver_cut 1-2)" +RESTRICT="!test? ( test )" IUSE="benchmark test" REQUIRED_USE="${ROCM_REQUIRED_USE}" -RESTRICT="test" # Tests fail - BDEPEND=" >=dev-util/rocm-cmake-5.3 dev-util/Tensile:${SLOT} @@ -76,7 +75,6 @@ src_configure() { -DCMAKE_INSTALL_INCLUDEDIR="include/rocblas" -DBUILD_CLIENTS_SAMPLES=OFF -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile" -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF) -DTensile_CPU_THREADS=$(makeopts_jobs) -DBUILD_WITH_PIP=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/, sci-libs/rocFFT/
commit: 09a28fd215f0298704d610bbff94eb80021cd1fa Author: Benda Xu gentoo org> AuthorDate: Mon Nov 20 01:21:52 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09a28fd2 sci-libs/hipFFT: drop include directory hack. hipFFT-5.7 is FHS compliant. Drop HIP_ROOT_DIR and unused cmake variables, it is only for FindHIP.cmake. Signed-off-by: Benda Xu gentoo.org> sci-libs/hipFFT/{hipFFT-5.7.1.ebuild => hipFFT-5.7.1-r1.ebuild} | 2 -- sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild | 2 -- 2 files changed, 4 deletions(-) diff --git a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild similarity index 92% rename from sci-libs/hipFFT/hipFFT-5.7.1.ebuild rename to sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild index dd9cbd1dc59c..ab9604482ed9 100644 --- a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.7.1-r1.ebuild @@ -33,9 +33,7 @@ PATCHES=( src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" -DCMAKE_MODULE_PATH="${EPREFIX}"/usr/$(get_libdir)/cmake/hip - -DHIP_ROOT_DIR="${EPREFIX}/usr" -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=OFF -DBUILD_CLIENTS_RIDER=OFF diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild index dc007e4729f1..ae6759ee212d 100644 --- a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild @@ -113,8 +113,6 @@ src_configure() { -Wno-dev -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) - -DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF) - -DPYTHON3_EXE=${EPYTHON} -DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF) -DSQLITE_USE_SYSTEM_PACKAGE=ON -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocSPARSE/
commit: 5dfef2e60233f2bda4c2133a2a2248b5695b7eb3 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 19:08:27 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:54 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfef2e6 sci-libs/rocSPARSE: add 5.7.1 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocSPARSE/Manifest | 1 + sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild | 139 +++ 2 files changed, 140 insertions(+) diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest index d9c178411520..793510341e5c 100644 --- a/sci-libs/rocSPARSE/Manifest +++ b/sci-libs/rocSPARSE/Manifest @@ -1,4 +1,5 @@ DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3 +DIST rocSPARSE-5.7.1.tar.gz 1167162 BLAKE2B 20ed88c87afbb041a31aa8bf867dca7ee670af093347c9c6a68b0750e70c796e7cfd599f84a58de2b8038f7681524bcb5909230fc340d1575dae3b72089ec650 SHA512 cd48884c51fcddcb26c42920cf477999160b3f06da4ab182f746a18d1fe54f697d89b1e470c550bd2330b26fb596d4a5baadf64366145e0d07f3fd8891f9af59 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256 diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild new file mode 100644 index ..72ab49658a90 --- /dev/null +++ b/sci-libs/rocSPARSE/rocSPARSE-5.7.1-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +ROCM_VERSION=${PV} + +inherit cmake edo python-any-r1 toolchain-funcs rocm + +DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"; + +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz +https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz +https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz +https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz +)" + +LICENSE="MIT" +KEYWORDS="~amd64&quo
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocThrust/
commit: c7cd9b80ef198dd881c05ac91df3bf1f5a46a28a Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 19:09:59 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:55 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7cd9b80 sci-libs/rocThrust: add 5.7.1 enable HMM to increase tests pass rate Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocThrust/Manifest | 1 + sci-libs/rocThrust/rocThrust-5.7.1.ebuild | 76 +++ 2 files changed, 77 insertions(+) diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest index 586b8f1b9260..5c109bf5006a 100644 --- a/sci-libs/rocThrust/Manifest +++ b/sci-libs/rocThrust/Manifest @@ -1 +1,2 @@ DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74 +DIST rocThrust-5.7.1.tar.gz 1122808 BLAKE2B 41a5d57d03c7f95baf861b772c9513c7fbc26eee8a2f388897eb9b9f9fad3cdad81e2a79932c5b9a6d88b4e1596bf64e59e01337943a036ddb792f7b352ecd31 SHA512 52a9640808f0ed78ae2d6f25e741af59ae4e977535a0431f16c0fa1ee9a395e6f389cf29e61c02ac274cf16fcd193e5df6fb2edc340059ab282ed7cd877fc8b4 diff --git a/sci-libs/rocThrust/rocThrust-5.7.1.ebuild b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild new file mode 100644 index ..68d0b7198b14 --- /dev/null +++ b/sci-libs/rocThrust/rocThrust-5.7.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="HIP back-end for the parallel algorithm library Thrust" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz" + +LICENSE="Apache-2.0" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + test? ( dev-cpp/gtest )" +DEPEND="${RDEPEND}" +BDEPEND=">=dev-util/cmake-3.22" + +S="${WORKDIR}/rocThrust-rocm-${PV}" + +PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" ) + +src_prepare() { + sed -e "/PREFIX rocthrust/d" \ + -e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \ + -e "/rocm_install_symlink_subdir(rocthrust)/d" \ + -e "/
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipSPARSE/
commit: 26b27f9b2a8f18e1b0934cb2282f7e969c6e4395 Author: Benda Xu gentoo org> AuthorDate: Sun Nov 26 14:48:34 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26b27f9b sci-libs/hipSPARSE: add 5.7.1 Do not create symlinks. Signed-off-by: Benda Xu gentoo.org> sci-libs/hipSPARSE/Manifest | 1 + sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild | 98 +++ 2 files changed, 99 insertions(+) diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest index 6f6118e92831..1876cfe32d71 100644 --- a/sci-libs/hipSPARSE/Manifest +++ b/sci-libs/hipSPARSE/Manifest @@ -1,4 +1,5 @@ DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64 +DIST hipSPARSE-5.7.tar.gz 458521 BLAKE2B 94695ef3cf4294f571723e31ab5d4295b5aaa24528e90838375ee8477cf0957b297663d80e5fe3406762b475b6ef4741f9ccfb4dfb1448ce71ea4014da14b46e SHA512 bb28cd81b7ec298eb2e6462a8588ed93eee7b4892923b11087a91d1c32341f29f488fd4e6797debe51a989f463db31030eae02d07be6512d6b755367ba221aac DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild new file mode 100644 index ..e43590b2338c --- /dev/null +++ b/sci-libs/hipSPARSE/hipSPARSE-5.7.1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake edo rocm toolchain-funcs + +DESCRIPTION="ROCm SPARSE marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"; +# share some test datasets with rocSPARSE +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz +test? ( +https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz +https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz +https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz +https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz +https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz +https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz +https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz +https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz +https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz +https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz +https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz +https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz +https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz +https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz +https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz +https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz +https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz +https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz +https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz +)" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0"/$(ver_cut 1-2) +IUSE="test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/rocminfo + dev-util/hip + sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/rocm-cmake + >=dev-util/cmake-3.22 + test? ( dev-cpp/gtest )" + +S="${WORKDIR}/hipSPARSE-rocm-${PV}" + +src_prepare() { + sed -e "s/PREFIX hipsparse//" \ + -e "/
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocBLAS/, sci-libs/rocBLAS/files/
commit: 2a8d386c87c9df5554e2a54d2da18c1b66c66af8 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:57:57 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8d386c sci-libs/rocBLAS: add 5.7.1 Closes: https://bugs.gentoo.org/911816 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocBLAS/Manifest | 1 + .../rocBLAS-5.7.1-expand-isa-compatibility.patch | 132 + sci-libs/rocBLAS/rocBLAS-5.7.1-r1.ebuild | 109 + 3 files changed, 242 insertions(+) diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest index e067ceef0a6c..f17d3a47c686 100644 --- a/sci-libs/rocBLAS/Manifest +++ b/sci-libs/rocBLAS/Manifest @@ -2,3 +2,4 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc DIST rocBLAS-5.4.2-Tensile-asm_full-navi22.tar.gz 1057686 BLAKE2B aa755595bbcd48775713f1d94c18b9bfa6464cae97653dd5beda9e4ed600802b62c4159e6edef7fbd4c92e629bbda1c284e6c48e096c7eaf22bbaad86bdcdace SHA512 cdc928528e7ce5bcc3ae32ec18e3aee48533f24e77c1e42f6e0398858eefebd52b8812caabe01a0ef7fa552e00118b862e025f1675a9642b009f1e38efbcdd53 DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f DIST rocm-rocBLAS-5.4.2.tar.gz 15938434 BLAKE2B 14ebafa944fdac443800bb7f9b16f8ecf0f420b168d3c6534f68ad7d14bf058a4cc1673fce8f4b9be53e4a6c1cf05011e01853cd901bce0b59827d2aca4d029f SHA512 e62bb80457c1e89454885499bdce9d60beecd706806724418983c78c65c2ae303550f9670b5a6e71dae6a61c0e42b223ab01b36b8406430731ebcbff54c4a8f4 +DIST rocm-rocBLAS-5.7.1.tar.gz 55389700 BLAKE2B 9e58b1d29c8a04aa58ce17fdd9b0c2504934261851619dc5b696a04e8c6a79e7c44d86a6db7a9c76a434d76593de8c191cba6f163cf398d01cfc001e5fa32b5a SHA512 cfc73f6c490595a3c153c2ac2a3cb5926c48c2c19baa07ff3dcdf3a7ccaed82cfdff64ed5a3be64c349cb43d654d4b104d9090e2ec9f2061049d6a4921c07722 diff --git a/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch b/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch new file mode 100644 index ..c5c5d4750393 --- /dev/null +++ b/sci-libs/rocBLAS/files/rocBLAS-5.7.1-expand-isa-compatibility.patch @@ -0,0 +1,132 @@ +Allow rocBLAS to load the compatible kernels when running on +architectures compatible with those ISAs. + +Based on patch from Cordell Bloor +https://salsa.debian.org/rocm-team/rocblas/-/blob/master/debian/patches/0012-expand-isa-compatibility.patch + +--- a/library/src/handle.cpp b/library/src/handle.cpp +@@ -21,6 +21,7 @@ + * */ + #include "handle.hpp" + #include ++#include + #include + #ifdef WIN32 + #include +@@ -77,6 +78,31 @@ static inline int getActiveArch(int deviceId) + { + hipDeviceProp_t deviceProperties; + hipGetDeviceProperties(&deviceProperties, deviceId); ++// coerce to compatible arch ++switch(deviceProperties.gcnArch) ++{ ++case 902: ++case 909: ++case 912: ++deviceProperties.gcnArch = 900; ++std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++break; ++case 1011: ++case 1012: ++case 1013: ++deviceProperties.gcnArch = 1010; ++std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++break; ++case 1031: ++case 1032: ++case 1033: ++case 1034: ++case 1035: ++case 1036: ++deviceProperties.gcnArch = 1030; ++std::strcpy(deviceProperties.gcnArchName, "gfx1030"); ++break; ++} + return deviceProperties.gcnArch; + } + +--- a/library/src/rocblas_auxiliary.cpp b/library/src/rocblas_auxiliary.cpp +@@ -24,6 +24,7 @@ + #include "logging.hpp" + #include "rocblas-auxiliary.h" + #include ++#include + #include + #include + #include +@@ -1285,6 +1286,31 @@ std::string rocblas_internal_get_arch_name() + hipGetDevice(&deviceId); + hipDeviceProp_t deviceProperties; + hipGetDeviceProperties(&deviceProperties, deviceId); ++// coerce to compatible arch ++switch(deviceProperties.gcnArch) ++{ ++case 902: ++case 909: ++case 912: ++deviceProperties.gcnArch = 900; ++std::strcpy(deviceProperties.gcnArchName, "gfx900"); ++break; ++case 1011: ++case 1012: ++case 1013: ++deviceProperties.gcnArch = 1010; ++std::strcpy(deviceProperties.gcnArchName, "gfx1010"); ++break; ++case 1031: ++case 1032: ++case 1033: ++case 1034: ++case 1035: ++case 1036: ++devicePr
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipCUB/
commit: 6aa1f9f5786ee1e26310591066c45252addb3cca Author: Sv. Lockal gmail com> AuthorDate: Tue Oct 31 14:51:43 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa1f9f5 sci-libs/hipCUB: add 5.7.1 Bug: https://github.com/gentoo/gentoo/pull/33400 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/hipCUB/Manifest| 1 + sci-libs/hipCUB/hipCUB-5.7.1.ebuild | 71 + 2 files changed, 72 insertions(+) diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest index bca0363ed4ca..7d95be621dad 100644 --- a/sci-libs/hipCUB/Manifest +++ b/sci-libs/hipCUB/Manifest @@ -1 +1,2 @@ DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f +DIST hipCUB-5.7.1.tar.gz 322980 BLAKE2B a9b2a69b47661532858f18e7296ef37be41da814bb4886f7b8b444829e6ad1374d1c3117b57e7599095253ed56ea2403c895bb820dbde9cec77c28a041af3898 SHA512 7cf7dc819a3d8bac2cf70aa077616e65d785d76bae3ad3991db7b940a061f694ac82b1e4219aa16476351f1329e3f0d09a818b0ff0b9c5ad261937879c21dca8 diff --git a/sci-libs/hipCUB/hipCUB-5.7.1.ebuild b/sci-libs/hipCUB/hipCUB-5.7.1.ebuild new file mode 100644 index ..0674d33b6ed5 --- /dev/null +++ b/sci-libs/hipCUB/hipCUB-5.7.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND="dev-util/hip + sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}] + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/hipCUB-rocm-${PV}" + +# src_prepare() { +# sed -e "/PREFIX hipcub/d" \ +# -e "/DESTINATION/s:hipcub/include/:include/:" \ +# -e "/rocm_install_symlink_subdir(hipcub)/d" \ +# -e "/
[gentoo-commits] repo/gentoo:master commit in: dev-util/Tensile/, dev-util/Tensile/files/
commit: 02cb2430fcb5dbc70df96be5380228a8e47c8d80 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:42:05 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cb2430 dev-util/Tensile: add 5.7.1 increase LLVM_MAX_SLOT to 17 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/Tensile/Manifest | 1 + dev-util/Tensile/Tensile-5.7.1-r1.ebuild | 132 + .../Tensile-5.7.1-expand-isa-compatibility.patch | 49 .../Tensile/files/Tensile-5.7.1-gentoopath.patch | 57 + 4 files changed, 239 insertions(+) diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest index 643f4fe5816c..4d93ffa204a1 100644 --- a/dev-util/Tensile/Manifest +++ b/dev-util/Tensile/Manifest @@ -1,3 +1,4 @@ DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734 DIST rocm-Tensile-5.4.2.tar.gz 14413805 BLAKE2B ca1c13785164439f6fe83f16b36b7a0b06a63b70b9f0741d77b0fff98f38d1e1c7e9a54ef61897e6eb0a4eaf52ec9e5f14f42a7e6fd657f26306afa3de0c74a2 SHA512 d99736a202c7353979e732941199b4b20e53ff2b6c19a7175609440a840aa5624bc53a8013c435f31ac37933527771521ff02137c1c8fd53c5317eca8533be80 +DIST rocm-Tensile-5.7.1.tar.gz 12396002 BLAKE2B ec2c2bc3f07fe22abd800b642c998ea80b9e4e2d0d28c4763d574dbd2fcb14c735223ddc7571d4ab3a48f0bd819cc835c16df9882049c5bf56f25ef729e6d654 SHA512 8f356f36cfec74ee9b000d1180cf52077dc5c595e5c5a40792fc3eb13f3139980c7440f9bc912218f946cf8137e2481d23fe39f110511c1bb55fe85a933ffd36 diff --git a/dev-util/Tensile/Tensile-5.7.1-r1.ebuild b/dev-util/Tensile/Tensile-5.7.1-r1.ebuild new file mode 100644 index ..709189734d4a --- /dev/null +++ b/dev-util/Tensile/Tensile-5.7.1-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools +ROCM_VERSION=${PV} +inherit cmake distutils-r1 llvm prefix rocm + +LLVM_MAX_SLOT=17 + +DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz" +S="${WORKDIR}/${PN}-rocm-${PV}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="client test" +REQUIRED_USE="client? ( ${ROCM_REQUIRED_USE} )" + +RESTRICT="!test? ( test )" + +RDEPEND="${PYTHON_DEPS} + >=dev-cpp/msgpack-cxx-6.0.0 + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/msgpack[${PYTHON_USEDEP}] + dev-util/hip + >=dev-util/rocm-smi-4.3.0 + sys-devel/clang:${LLVM_MAX_SLOT} +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + dev-python/pytest-forked[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/filelock[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/${PN}-change-cmake-name-for-msgpack-cxx-6-release.patch + "${FILESDIR}"/${PN}-4.3.0-output-commands.patch + "${FILESDIR}"/${PN}-5.4.2-fix-arch-parse.patch + "${FILESDIR}"/${PN}-5.4.2-use-ninja.patch + "${FILESDIR}"/${PN}-5.7.1-expand-isa-compatibility.patch +) + +CMAKE_USE_DIR="${S}/${PN}/Source" + +src_prepare() { + distutils-r1_src_prepare + sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" \ + "${FILESDIR}"/${PN}-5.7.1-gentoopath.patch > "${S}"/gentoopath.patch || die + eapply $(prefixify_ro "${S}"/gentoopath.patch) + + pushd ${PN} || die + + sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \ + -i Source/cmake/FindROCmSMI.cmake || die + sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \ + -i Source/CMakeLists.txt || die + + # ${Tensile_ROOT}/bin does not exists; call command directly + sed -e "s,\${Tensile_ROOT}/bin/,,g" -i cmake/TensileConfig.cmake || die + + local Tensile_share_dir=&q
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipBLAS/
commit: 89027ab9f235bee3352630ee987829f4f30d878a Author: Sv. Lockal gmail com> AuthorDate: Sun Oct 22 16:32:48 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 27 14:34:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89027ab9 sci-libs/hipBLAS: add 5.7.1 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/hipBLAS/Manifest | 1 + sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild | 36 +++ sci-libs/hipBLAS/metadata.xml | 3 +++ 3 files changed, 40 insertions(+) diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index 6dcf1b1dd925..21eceaa7bab4 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1,2 +1,3 @@ DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 +DIST hipBLAS-5.7.1.tar.gz 669163 BLAKE2B e065f77eba0bb99d347f71920e733d30b7693f9eaf0c1f2a87a169360ccff23b8294e367eebfd6489440308b9bb1ae662c39617c5bb94275bf9b0ed60d555f85 SHA512 24c074f07865e1a3dfb0aca0b1d494e340a584ecb408813bb5b053f8282437cfd3644d730163f4faf1b93da306626ba68904141f9c3730a29749537fb7fd1a63 diff --git a/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild new file mode 100644 index ..f5afa385cdee --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-5.7.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm +DESCRIPTION="ROCm BLAS marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipBLAS/metadata.xml b/sci-libs/hipBLAS/metadata.xml index e74d41fd607c..65b9259ded18 100644 --- a/sci-libs/hipBLAS/metadata.xml +++ b/sci-libs/hipBLAS/metadata.xml @@ -12,4 +12,7 @@ xgreenlandfor...@gmail.com Yiyang Wu + +ROCmSoftwarePlatform/hipBLAS +
[gentoo-commits] repo/gentoo:master commit in: profiles/desc/
commit: 645e76365f9f7134251dc5a566fa25de234d354f Author: Yiyang Wu gmail com> AuthorDate: Fri Nov 17 03:01:45 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 26 14:54:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645e7636 profiles/desc/amdgpu_targets.desc: fill in more GPU models. Reference: https://www.mail-archive.com/gentoo-dev lists.gentoo.org/msg98470.html Bug: https://github.com/gentoo/gentoo/pull/33861 Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> profiles/desc/amdgpu_targets.desc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/profiles/desc/amdgpu_targets.desc b/profiles/desc/amdgpu_targets.desc index 9c5739e9d9a4..d52080781947 100644 --- a/profiles/desc/amdgpu_targets.desc +++ b/profiles/desc/amdgpu_targets.desc @@ -15,6 +15,6 @@ gfx1011 - RDNA GPU, codename navi12, including Radeon Pro 5600M/V520 gfx1012 - RDNA GPU, codename navi14, including Radeon RX 5500XT/5500/5500M/5500XTB/5300/5300M, Radeon Pro 5500XT/5500M/5300/5300M, Radeon Pro W5500X/W5500/W5500M/W5300M gfx1030 - RDNA2 GPU, codename navi21/sienna cichlid, including Radeon RX 6950XT/6900XT/6800XT/6800, Radeon Pro W6800 gfx1031 - RDNA2 GPU, codename navi22/navy flounder, including Radeon RX 6750XT/6700XT/6800M/6700M -gfx1100 - RDNA3 GPU, codename navi31/plum bonito, including Radeon RX 7900XTX/7900XT -gfx1101 - RDNA3 GPU, codename navi32 -gfx1102 - RDNA3 GPU, codename navi33 +gfx1100 - RDNA3 GPU, codename navi31/plum bonito, including Radeon RX 7900XTX/7900XT, AMD Radeon Pro W7900/W7800 +gfx1101 - RDNA3 GPU, codename navi32, including Radeon RX 7700XT/7800XT +gfx1102 - RDNA3 GPU, codename navi33, including Radeon RX 7600/7600M/7600M XT/7700S/7600S, AMD Radeon PRO W7600/W7500
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/files/, sci-libs/hipFFT/
commit: f30f41657916fb02bdbc61e441b982dc3439c2e8 Author: Benda Xu gentoo org> AuthorDate: Mon Nov 20 03:53:32 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Nov 20 03:55:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30f4165 sci-libs/hipFFT: use HIP config. hipFFT is not updated in 5.7.1, and we need to manually backport it. Reference: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/66 Signed-off-by: Benda Xu gentoo.org> .../hipFFT/files/hipFFT-5.7.1_hip-config.patch | 40 ++ sci-libs/hipFFT/hipFFT-5.7.1.ebuild| 1 + 2 files changed, 41 insertions(+) diff --git a/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch new file mode 100644 index ..71d75417c0d3 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.7.1_hip-config.patch @@ -0,0 +1,40 @@ +From c2b06a3b49257b3f89cf203895cf370e64e47b27 Mon Sep 17 00:00:00 2001 +From: trixirt +Date: Mon, 31 Jul 2023 09:50:19 -0700 +Subject: [PATCH] Simplify finding the hip package + +On Fedora, where hip is installed as an rpm, its cmake files can +not be found and are reported as an error. + +CMake Error at cmake/dependencies.cmake:44 (find_package): + No "FindHIP.cmake" found in CMAKE_MODULE_PATH. + +This change treats hip as a normal package. + +Signed-off-by: Tom Rix +--- + cmake/dependencies.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 262478d..5810e37 100644 +--- a/cmake/dependencies.cmake b/cmake/dependencies.cmake +@@ -30,7 +30,7 @@ if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() +@@ -41,7 +41,7 @@ else() + if( WIN32 ) + find_package( HIP CONFIG REQUIRED ) + else() +- find_package( HIP MODULE REQUIRED ) ++ find_package( HIP REQUIRED ) + endif() + endif() + endif() diff --git a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild index affa5dc9b14b..dd9cbd1dc59c 100644 --- a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild @@ -28,6 +28,7 @@ S="${WORKDIR}/hipFFT-rocm-${PV}" PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" + "${FILESDIR}/${PN}-5.7.1_hip-config.patch" ) src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/
commit: 26095f9266788d2e5b9d47e4c28c5108a32f5a5c Author: Benda Xu gentoo org> AuthorDate: Sat Nov 18 15:04:37 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 16:32:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26095f92 sci-libs/hipFFT: add 5.7.1 Signed-off-by: Benda Xu gentoo.org> sci-libs/hipFFT/Manifest| 1 + sci-libs/hipFFT/hipFFT-5.7.1.ebuild | 45 + 2 files changed, 46 insertions(+) diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest index 7ef5713343b5..df28313d1787 100644 --- a/sci-libs/hipFFT/Manifest +++ b/sci-libs/hipFFT/Manifest @@ -1 +1,2 @@ DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706 +DIST hipFFT-rocm-5.7.1.tar.gz 102616 BLAKE2B ee8d6dcb7924c8989987b02533126c4e4419d8dc83067a816f2253efe4537e094f1665d95699d4bf27f30cd13f3fc5df7d3b0062c267ecbdcbb3aad961fab6f6 SHA512 4bfd812fa1e949574b4170833755a435f47e893f0615b65d8d273af6e8f89ea4d28632a208de20321e834c8bc237b11816e2af0363b60adca9af736b9bc87465 diff --git a/sci-libs/hipFFT/hipFFT-5.7.1.ebuild b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild new file mode 100644 index ..affa5dc9b14b --- /dev/null +++ b/sci-libs/hipFFT/hipFFT-5.7.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip FFT implementation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}/hipFFT-rocm-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch" + "${FILESDIR}/${PN}-4.3.0-add-complex-header.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_INCLUDEDIR="include/hipfft" + -DCMAKE_MODULE_PATH="${EPREFIX}"/usr/$(get_libdir)/cmake/hip + -DHIP_ROOT_DIR="${EPREFIX}/usr" + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_CLIENTS_TESTS=OFF + -DBUILD_CLIENTS_RIDER=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + ) + + CXX=hipcc cmake_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipRAND/
commit: e377b88684bdcc28b9c080aae7349f435f9395f6 Author: Benda Xu gentoo org> AuthorDate: Sun Nov 19 06:18:32 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 16:32:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e377b886 sci-libs/hipRAND: correct the on disk file name. Bump to 5.7.1. Signed-off-by: Benda Xu gentoo.org> sci-libs/hipRAND/Manifest | 3 ++- sci-libs/hipRAND/{hipRAND-5.6.0.ebuild => hipRAND-5.6.0-r1.ebuild} | 2 +- sci-libs/hipRAND/{hipRAND-5.6.0.ebuild => hipRAND-5.7.1.ebuild}| 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest index bdb2c56b0452..39e54dc94d02 100644 --- a/sci-libs/hipRAND/Manifest +++ b/sci-libs/hipRAND/Manifest @@ -1 +1,2 @@ -DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 +DIST hipRAND-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 +DIST hipRAND-rocm-5.7.1.tar.gz 478352 BLAKE2B 5f435cf53d213b1d95ee8b766df2c9bc4b4d590ccf63fe867bd033eeb4b7fef67e2bde22242525686a8dee59fd811363857312481e9cb3575357c612ab519a41 SHA512 b3c51728c1d7cc37760f49f36ab7765c166f105bc5b1b6ce65ac4a1de9bb70f8e2c10f5c41f89040288b09c9257d913d745a416bd4785b71f170a4f57e1f95e2 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild similarity index 92% copy from sci-libs/hipRAND/hipRAND-5.6.0.ebuild copy to sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild index d0bd5ace71e4..006440bb6a29 100644 --- a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild +++ b/sci-libs/hipRAND/hipRAND-5.6.0-r1.ebuild @@ -9,7 +9,7 @@ inherit cmake rocm DESCRIPTION="CU / ROCM agnostic hip RAND implementation" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND"; -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" REQUIRED_USE="${ROCM_REQUIRED_USE}" LICENSE="MIT" diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild similarity index 92% rename from sci-libs/hipRAND/hipRAND-5.6.0.ebuild rename to sci-libs/hipRAND/hipRAND-5.7.1.ebuild index d0bd5ace71e4..006440bb6a29 100644 --- a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild +++ b/sci-libs/hipRAND/hipRAND-5.7.1.ebuild @@ -9,7 +9,7 @@ inherit cmake rocm DESCRIPTION="CU / ROCM agnostic hip RAND implementation" HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND"; -SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipRAND-rocm-${PV}.tar.gz" REQUIRED_USE="${ROCM_REQUIRED_USE}" LICENSE="MIT"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocRAND/files/, sci-libs/rocRAND/
commit: 908cf70bee0e7cc186580e2d58bb17bb2b0ee0dc Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 19:03:41 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 16:32:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=908cf70b sci-libs/rocRAND: add 5.7.1 and fix_generator_alignements.patch Bug: https://github.com/gentoo/gentoo/pull/33400 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocRAND/Manifest | 1 + .../rocRAND-5.7.1_fix_generator_alignment.patch| 16 ++ sci-libs/rocRAND/rocRAND-5.7.1.ebuild | 67 ++ 3 files changed, 84 insertions(+) diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index e49a7db31d6a..9c1124f37a03 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,3 +1,4 @@ DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28 DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5 +DIST rocRAND-5.7.1.tar.gz 23189653 BLAKE2B c70ab6f3b718c2430394f63b93bee15fa72daae704883fdb203b98b0dc4763b46bc27886af64c48bf4ebe8da9b919158b8cd346f70f9b76bf0492ce3b2c1e20e SHA512 4d74bce9fbd3cb45e3f057d38df747270c6986fea7ad524f7a88109b6a53a4ea5dcd60d4bbf2364888501e9444245fb6898bb79fccad0e37b61e819e8c4ed863 diff --git a/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch b/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch new file mode 100644 index ..84b58266220c --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.7.1_fix_generator_alignment.patch @@ -0,0 +1,16 @@ +Fix crashes due to unaligned allocations in heap with new of structs when AVX2 or AVX512 is used. +This patch takes the simplest approach just shifts responsibility to the standard. +Similar approach in Eigen is named defined as: EIGEN_HAS_CXX17_OVERALIGN. + +Upstream bug: https://github.com/ROCmSoftwarePlatform/rocRAND/issues/403 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -119,7 +119,7 @@ endif() + option(DISABLE_WERROR "Disable building with Werror" ON) + + # Build CXX flags +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + if(DISABLE_WERROR) diff --git a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild new file mode 100644 index ..f2fc17ed6222 --- /dev/null +++ b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="Generate pseudo-random and quasi-random numbers" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" +IUSE="benchmark test" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch + "${FILESDIR}"/${PN}-5.7.1_fix_generator_alignment.patch +) + +RDEPEND="dev-util/hip" +DEPEND="${RDEPEND} +dev-util/rocm-cmake +test? ( dev-cpp/gtest )" +BDEPEND="dev-util/rocm-cmake +>=dev-util/cmake-3.22" + +S="${WORKDIR}/rocRAND-rocm-${PV}" + +src_configure() { + addpredict /dev/kfd + addpredict /dev/dri/ + + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_HIPRAND=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + -DBUILD_TEST=$(usex test ON OFF) + -DBUILD_BENCHMARK=$(usex benchmark ON OFF) + ) + + CXX=hipcc cmake_src_configure +} + +src_test() { + check_amdgpu + export LD_LIBRARY_PATH="${BUILD_DIR}/library"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocRAND/
commit: eaaa5dfd4055d05044e70c75714ef43d6206aa4e Author: Benda Xu gentoo org> AuthorDate: Sun Nov 19 16:21:05 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 16:32:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaaa5dfd sci-libs/rocRAND: add dev-cpp/benchmark dependency. Closes: https://bugs.gentoo.org/913111 Signed-off-by: Benda Xu gentoo.org> sci-libs/rocRAND/{rocRAND-5.6.0.ebuild => rocRAND-5.6.0-r1.ebuild} | 7 --- sci-libs/rocRAND/rocRAND-5.7.1.ebuild | 7 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild similarity index 92% rename from sci-libs/rocRAND/rocRAND-5.6.0.ebuild rename to sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild index b7b4ac7cc950..29a49e44991e 100644 --- a/sci-libs/rocRAND/rocRAND-5.6.0.ebuild +++ b/sci-libs/rocRAND/rocRAND-5.6.0-r1.ebuild @@ -22,10 +22,11 @@ PATCHES=( "${FILESDIR}"/${PN}-5.4.2_stdint-gcc13.patch ) RDEPEND="dev-util/hip" DEPEND="${RDEPEND} -dev-util/rocm-cmake -test? ( dev-cpp/gtest )" + dev-util/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" BDEPEND="dev-util/rocm-cmake ->=dev-util/cmake-3.22" + >=dev-util/cmake-3.22" S="${WORKDIR}/rocRAND-rocm-${PV}" diff --git a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild index f2fc17ed6222..2a55cae507fe 100644 --- a/sci-libs/rocRAND/rocRAND-5.7.1.ebuild +++ b/sci-libs/rocRAND/rocRAND-5.7.1.ebuild @@ -26,10 +26,11 @@ PATCHES=( RDEPEND="dev-util/hip" DEPEND="${RDEPEND} -dev-util/rocm-cmake -test? ( dev-cpp/gtest )" + dev-util/rocm-cmake + benchmark? ( dev-cpp/benchmark ) + test? ( dev-cpp/gtest )" BDEPEND="dev-util/rocm-cmake ->=dev-util/cmake-3.22" + >=dev-util/cmake-3.22" S="${WORKDIR}/rocRAND-rocm-${PV}"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
commit: dfec413c0bdb97875fe7e0c66109c7718698a551 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:59:22 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 16:32:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfec413c sci-libs/rocFFT: add 5.7.1 and fix test dependencies. Cannonicalize the include path as no directory hacks are needed for 5.7.1. Bug: https://github.com/gentoo/gentoo/pull/33400 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocFFT/Manifest | 1 + sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild | 150 + 2 files changed, 151 insertions(+) diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest index f93c38954772..b850aef411dd 100644 --- a/sci-libs/rocFFT/Manifest +++ b/sci-libs/rocFFT/Manifest @@ -1 +1,2 @@ DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43 +DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild new file mode 100644 index ..dc007e4729f1 --- /dev/null +++ b/sci-libs/rocFFT/rocFFT-5.7.1-r1.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +ROCM_VERSION=${PV} + +inherit cmake check-reqs edo multiprocessing python-r1 rocm + +DESCRIPTION="Next generation FFT implementation for ROCm" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask +RDEPEND=" +perfscripts? ( + >=media-gfx/asymptote-2.61 + dev-texlive/texlive-latex + dev-tex/latexmk + sys-apps/texinfo + dev-python/sympy[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}] + dev-python/pandas[${PYTHON_USEDEP}] ) +${PYTHON_DEPS}" + +DEPEND="dev-util/hip + ${PYTHON_DEPS}" + +BDEPEND=" + test? ( + dev-cpp/gtest + dev-libs/boost + >=sci-libs/fftw-3 + sys-libs/libomp + sci-libs/hipRAND:${SLOT}[${ROCM_USEDEP}] + ) + >=dev-util/cmake-3.22 + dev-util/rocm-cmake + dev-db/sqlite +" + +CHECKREQS_DISK_BUILD="7G" + +IUSE="benchmark perfscripts test" +REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +S="${WORKDIR}/rocFFT-rocm-${PV}" + +PATCHES=() + +required_mem() { + if use test; then + echo "52G" + else + if [[ -n "${AMDGPU_TARGETS}" ]]; then + # count how many archs user specified in ${AMDGPU_TARGETS} + local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) + else + # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future. + local NARCH=7 + fi + echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required + fi +} + +pkg_pretend() { + return # leave the disk space check to pkg_setup phase +} + +pkg_setup() { + export CHECKREQS_MEMORY=$(required_mem) + check-reqs_pkg_setup + python_setup +} + +src_prepare() { + sed -e "s/PREFIX rocfft//" \ + -e "/rocm_install_symlink_subdir/d" \ + -i library/src/CMakeLists.txt || die + + sed -e "/rocm_install_symlink_subdir/d" \ + -e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \ + -i library/src/device/CMakeLists.txt || die + + if use perfscripts; then + pushd scripts/perf || die + sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir +
[gentoo-commits] repo/gentoo:master commit in: dev-util/hipcc/, dev-util/hipcc/files/
commit: 6992e6ff39664c798459db3f93e048a06095adf6 Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:37:09 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 02:18:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6992e6ff dev-util/hipcc-5.7.1: fix compilation issues - Restore the patch for adding -fno-stack-protector - Better handling of clang path using llvm.eclass - Fix the device lib path parsed to clang - QA: remove files installed to wrong location Bug: https://bugs.gentoo.org/890377 Bug: https://github.com/gentoo/gentoo/pull/33400 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/33845 .../files/hipcc-5.7.1-fno-stack-protector.patch| 13 ...hipcc-5.7.1-r1.ebuild => hipcc-5.7.1-r2.ebuild} | 24 +++--- dev-util/hipcc/hipcc-5.7.1.ebuild | 21 --- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch b/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch new file mode 100644 index ..c46420265005 --- /dev/null +++ b/dev-util/hipcc/files/hipcc-5.7.1-fno-stack-protector.patch @@ -0,0 +1,13 @@ +Related bug: https://bugs.gentoo.org/890377 +--- a/bin/hipcc.pl b/bin/hipcc.pl +@@ -552,6 +552,9 @@ if ($buildDeps and $HIP_PLATFORM eq 'amd') { + # pass-through CPP mode. + + if ($HIP_PLATFORM eq "amd") { ++# Append -fno-stack-protector due to stack protection for HIP is not supported ++$HIPCXXFLAGS .= " -fno-stack-protector"; ++$HIPCFLAGS .= " -fno-stack-protector"; + # Set default optimization level to -O3 for hip-clang. + if ($optArg eq "") { + $HIPCXXFLAGS .= " -O3"; diff --git a/dev-util/hipcc/hipcc-5.7.1-r1.ebuild b/dev-util/hipcc/hipcc-5.7.1-r2.ebuild similarity index 51% rename from dev-util/hipcc/hipcc-5.7.1-r1.ebuild rename to dev-util/hipcc/hipcc-5.7.1-r2.ebuild index 78f9a80f3561..d711d8956ac0 100644 --- a/dev-util/hipcc/hipcc-5.7.1-r1.ebuild +++ b/dev-util/hipcc/hipcc-5.7.1-r2.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit cmake +inherit cmake llvm + +LLVM_MAX_SLOT=17 DESCRIPTION="Radeon Open Compute hipcc" HOMEPAGE="https://github.com/ROCm-Developer-Tools/hipcc"; @@ -20,8 +22,24 @@ S=${WORKDIR}/HIPCC-rocm-${PV} RDEPEND="!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="!
[gentoo-commits] repo/gentoo:master commit in: dev-util/hip/files/, dev-util/hip/
commit: 74964e47d7cb86d9cbb992f02e9de25a554727ac Author: Sv. Lockal gmail com> AuthorDate: Wed Oct 18 18:34:10 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 02:18:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74964e47 dev-util/hip: fix crashes and QA issues. - add fix-unaligned-memcpy.patch - add exec-stack.patch - add disable-stack-protector patch - drop asan doc from the build system. Closes: https://bugs.gentoo.org/915969 Bug: https://github.com/ROCm-Developer-Tools/clr/issues/18 Bug: https://github.com/gentoo/gentoo/pull/33400 Bug: https://github.com/ROCm-Developer-Tools/clr/issues/22 Bug: https://github.com/ROCm-Developer-Tools/clr/issues/21 Bug: https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/issues/61 Signed-off-by: Sv. Lockal gmail.com> Signed-off-by: Benda Xu gentoo.org> .../files/hip-5.7.1-disable-stack-protector.patch | 13 + dev-util/hip/files/hip-5.7.1-exec-stack.patch | 31 ++ .../hip/files/hip-5.7.1-fix-unaligned-access.patch | 67 ++ dev-util/hip/files/hip-5.7.1-no_asan_doc.patch | 17 ++ dev-util/hip/hip-5.7.1.ebuild | 9 ++- 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dev-util/hip/files/hip-5.7.1-disable-stack-protector.patch b/dev-util/hip/files/hip-5.7.1-disable-stack-protector.patch new file mode 100644 index ..49d944ef4bc9 --- /dev/null +++ b/dev-util/hip/files/hip-5.7.1-disable-stack-protector.patch @@ -0,0 +1,13 @@ +Disable stack-protector (which is enabled by default gentoo-hardened) in device code. +This is not required after https://github.com/llvm/llvm-project/pull/70799, but helps with older clang. +Upstream bug: https://github.com/ROCm-Developer-Tools/clr/issues/21 +--- a/hipamd/src/hiprtc/hiprtcInternal.cpp b/hipamd/src/hiprtc/hiprtcInternal.cpp +@@ -144,6 +144,7 @@ RTCCompileProgram::RTCCompileProgram(std::string name_) : RTCProgram(name_), fgp + compile_options_.push_back("-nogpuinc"); + compile_options_.push_back("-Wno-gnu-line-marker"); + compile_options_.push_back("-Wno-missing-prototypes"); ++ compile_options_.push_back("-fno-stack-protector"); + #ifdef _WIN32 + compile_options_.push_back("-target"); + compile_options_.push_back("x86_64-pc-windows-msvc"); diff --git a/dev-util/hip/files/hip-5.7.1-exec-stack.patch b/dev-util/hip/files/hip-5.7.1-exec-stack.patch new file mode 100644 index ..744ca7b953c3 --- /dev/null +++ b/dev-util/hip/files/hip-5.7.1-exec-stack.patch @@ -0,0 +1,31 @@ +Upstream bug: https://github.com/ROCm-Developer-Tools/clr/issues/22 +--- a/hipamd/src/hip_embed_pch.sh b/hipamd/src/hip_embed_pch.sh +@@ -178,6 +178,7 @@ EOF + + echo "// Automatically generated script for HIP RTC." > $mcinFile + if [[ $isWindows -eq 0 ]]; then ++echo " .section .note.GNU-stack,"",%progbits" >> $mcinFile + echo " .type __hipRTC_header,@object" >> $mcinFile + echo " .type __hipRTC_header_size,@object" >> $mcinFile + fi +--- a/hipamd/src/hiprtc/cmake/HIPRTC.cmake b/hipamd/src/hiprtc/cmake/HIPRTC.cmake +@@ -98,6 +98,7 @@ macro(generate_hiprtc_mcin HiprtcMcin HiprtcPreprocessedInput) + set(HIPRTC_TYPE_LINUX_ONLY "") + else() + set(HIPRTC_TYPE_LINUX_ONLY ++ " .section .note.GNU-stack,\"\",%progbits\n" + " .type __hipRTC_header,@object\n" + " .type __hipRTC_header_size,@object") + endif() +--- a/hipamd/src/hip_embed_pch.sh b/hipamd/src/hip_embed_pch.sh +@@ -111,6 +111,7 @@ cat >$tmp/hip_pch.h <$tmp/hip_pch.mcin <https://bugs.gentoo.org/915969 +Bug report in upstream: https://github.com/ROCm-Developer-Tools/clr/issues/18 +--- a/rocclr/device/rocm/rocvirtual.cpp b/rocclr/device/rocm/rocvirtual.cpp +@@ -2790,44 +2790,6 @@ bool VirtualGPU::createVirtualQueue(uint deviceQueueSize) + return true; + } + +-// +-__attribute__((optimize("unroll-all-loops"), always_inline)) +-static inline void nontemporalMemcpy(void* __restrict dst, const void* __restrict src, +- uint16_t size) { +- #if defined(__AVX512F__) +-for (auto i = 0u; i != size / sizeof(__m512i); ++i) { +- _mm512_stream_si512(reinterpret_cast<__m512i* __restrict&>(dst)++, +- *reinterpret_cast(src)++); +-} +-size = size % sizeof(__m512i); +- #endif +- +- #if defined(__AVX__) +-for (auto i = 0u; i != size / sizeof(__m256i); ++i) { +- _mm256_stream_si256(reinterpret_cast<__m256i* __restrict&>(dst)++, +- *reinterpret_cast(src)++); +-} +-size = size % sizeof(__m256i); +- #endif +- +- for (auto i = 0u; i
[gentoo-commits] repo/gentoo:master commit in: dev-util/hipcc/, dev-util/hipcc/files/
commit: 81bb39c7edf4c0b137a980a8b3ec8f817491013d Author: Yiyang Wu gmail com> AuthorDate: Sun Oct 22 12:56:19 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Nov 19 02:18:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81bb39c7 dev-util/hipcc: passing --hip-version to clang for proper include Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> .../files/hipcc-5.7.1-hipcc-hip-version.patch | 42 ++ dev-util/hipcc/hipcc-5.7.1-r2.ebuild | 1 + 2 files changed, 43 insertions(+) diff --git a/dev-util/hipcc/files/hipcc-5.7.1-hipcc-hip-version.patch b/dev-util/hipcc/files/hipcc-5.7.1-hipcc-hip-version.patch new file mode 100644 index ..fa00d44d912e --- /dev/null +++ b/dev-util/hipcc/files/hipcc-5.7.1-hipcc-hip-version.patch @@ -0,0 +1,42 @@ +Edit from: +https://salsa.debian.org/rocm-team/rocm-hipamd/-/blob/759b0773bd848ff9471fa8cdecd9ee21010bc29c/debian/patches/0013-hipcc-hip-version.patch +`--hip-version` is required for correclty including __clang_hip_runtime_wrapper.h += +Description: enforce --hip-version option within hipcc call. + This change is needed since the normal mechanism in ROCm relies on + reading a .hipVersion hidden configuration file which has no proper + equivalent in a FHS compliant tree, as of ROCm 5.0. +Author: Cordell Bloor +Bug: https://github.com/ROCm-Developer-Tools/HIP/pull/2937 +Forwarded: not-needed +Reviewed-by: Étienne Mollier +Last-Update: 2022-07-04 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: HIP/bin/hipcc.pl +=== +--- HIP.orig/bin/hipcc.pl HIP/bin/hipcc.pl +@@ -121,6 +121,9 @@ $HIP_PATH = $hipvars::HIP_PATH; + $ROCM_PATH = $hipvars::ROCM_PATH; + $HIP_VERSION= $hipvars::HIP_VERSION; + $HIP_ROCCLR_HOME = $hipvars::HIP_ROCCLR_HOME; ++$HIP_VERSION_MAJOR = $hipvars::HIP_VERSION_MAJOR; ++$HIP_VERSION_MINOR = $hipvars::HIP_VERSION_MINOR; ++$HIP_VERSION_PATCH = $hipvars::HIP_VERSION_PATCH; + + if ($HIP_PLATFORM eq "amd") { + $HIP_INCLUDE_PATH = "$HIP_ROCCLR_HOME/include"; +@@ -188,6 +191,12 @@ if ($HIP_PLATFORM eq "amd") { + ## Allow __fp16 as function parameter and return type. + $HIPCXXFLAGS .= " -Xclang -fallow-half-arguments-and-returns -D__HIP_HCC_COMPAT_MODE__=1"; + } ++ ++# Gentoo: there is no FHS compliant location for .hipVersion where clang will still be ++# able to find it, so .hipVersion has been omitted and the hip version is passed explicitly ++$HIPCXXFLAGS .= " --hip-version=$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; ++$HIPCFLAGS .= " --hip-version=$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; ++$HIPLDFLAGS .= " --hip-version=$HIP_VERSION_MAJOR.$HIP_VERSION_MINOR.$HIP_VERSION_PATCH"; + } elsif ($HIP_PLATFORM eq "nvidia") { + $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda'; + $HIP_INCLUDE_PATH = "$HIP_PATH/include"; diff --git a/dev-util/hipcc/hipcc-5.7.1-r2.ebuild b/dev-util/hipcc/hipcc-5.7.1-r2.ebuild index d711d8956ac0..180354c8673c 100644 --- a/dev-util/hipcc/hipcc-5.7.1-r2.ebuild +++ b/dev-util/hipcc/hipcc-5.7.1-r2.ebuild @@ -24,6 +24,7 @@ RDEPEND="!
[gentoo-commits] repo/gentoo:master commit in: sci-misc/vitables/
commit: 4eef208ad065a8e327488f48d558ef0fcd371b6f Author: Benda Xu gentoo org> AuthorDate: Sun Sep 3 02:57:01 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Sep 3 02:58:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eef208a sci-misc/vitables: drop unnecessary Debian patches. Get back to vitables executable. Install the icons. Signed-off-by: Benda Xu gentoo.org> ...-3.0.2_p4.ebuild => vitables-3.0.2_p4-r1.ebuild} | 21 ++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sci-misc/vitables/vitables-3.0.2_p4.ebuild b/sci-misc/vitables/vitables-3.0.2_p4-r1.ebuild similarity index 60% rename from sci-misc/vitables/vitables-3.0.2_p4.ebuild rename to sci-misc/vitables/vitables-3.0.2_p4-r1.ebuild index 67d4ca2725e6..2852bb044e63 100644 --- a/sci-misc/vitables/vitables-3.0.2_p4.ebuild +++ b/sci-misc/vitables/vitables-3.0.2_p4-r1.ebuild @@ -30,10 +30,25 @@ DEPEND="${RDEPEND}" distutils_enable_tests pytest -src_prepare() { - eapply ../debian/patches +python_prepare_all() { + PATCHES=( + ../debian/patches/0001-vtsite.py-use-debian-doc-and-icons-paths.patch + ../debian/patches/0002-setup.py-no-icons-htmldocs-or-license.patch + ../debian/patches/0004-tests-conftest.py-prepare-the-testfile-if-necessary.patch + ../debian/patches/0005-Update-collection-path-for-Python-3.8.patch + ../debian/patches/0006-Fix-version-information-display.patch + ../debian/patches/0007-tests-migrate-from-nose-to-pytest.patch + ) + + distutils-r1_python_prepare_all sed -e '/QtTest/d' -i tests/test_samples.py || die - default +} + +python_install_all() { + insinto /usr/share/${PN} + doins -r vitables/icons + dodoc -r doc/* + distutils-r1_python_install_all } python_test() {
[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/
commit: 7a72d0773f343ce9ef358c54926e26ff182613a3 Author: Benda Xu gentoo org> AuthorDate: Sat Sep 2 09:17:49 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Sep 2 09:18:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a72d077 x11-wm/xpra: drop systemd-run call for USE=minimal. Signed-off-by: Benda Xu gentoo.org> x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch| 18 ++ .../{xpra-4.4.6-r1.ebuild => xpra-4.4.6-r2.ebuild} | 13 +++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch new file mode 100644 index ..78a4cccb3684 --- /dev/null +++ b/x11-wm/xpra/files/xpra-4.4.6_minimal-features.patch @@ -0,0 +1,18 @@ +Xpra is a good piece of software except that some features are not +useful only to introduce unnecessary dependencies. + +Forwarded: no need. + +Index: xpra-4.4.6/xpra/scripts/main.py +=== +--- xpra-4.4.6.orig/xpra/scripts/main.py xpra-4.4.6/xpra/scripts/main.py +@@ -64,7 +64,7 @@ CLIPBOARD_CLASS = os.environ.get("XPRA_C + WAIT_SERVER_TIMEOUT = envint("WAIT_SERVER_TIMEOUT", 90) + CONNECT_TIMEOUT = envint("XPRA_CONNECT_TIMEOUT", 20) + OPENGL_PROBE_TIMEOUT = envint("XPRA_OPENGL_PROBE_TIMEOUT", 5) +-SYSTEMD_RUN = envbool("XPRA_SYSTEMD_RUN", True) ++SYSTEMD_RUN = False + VERIFY_X11_SOCKET_TIMEOUT = envint("XPRA_VERIFY_X11_SOCKET_TIMEOUT", 1) + LIST_REPROBE_TIMEOUT = envint("XPRA_LIST_REPROBE_TIMEOUT", 10) + diff --git a/x11-wm/xpra/xpra-4.4.6-r1.ebuild b/x11-wm/xpra/xpra-4.4.6-r2.ebuild similarity index 98% rename from x11-wm/xpra/xpra-4.4.6-r1.ebuild rename to x11-wm/xpra/xpra-4.4.6-r2.ebuild index b9dcf632b0fc..5ec14d265625 100644 --- a/x11-wm/xpra/xpra-4.4.6-r1.ebuild +++ b/x11-wm/xpra/xpra-4.4.6-r2.ebuild @@ -121,18 +121,19 @@ PATCHES=( ) python_prepare_all() { + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + PATCHES+=( "${FILESDIR}"/${PN}-4.4.6_xpra-4.4.6_minimal-features.patch ) + fi + distutils-r1_python_prepare_all hprefixify xpra/scripts/config.py sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi } python_configure_all() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/ptyprocess/, dev-python/decorator/, dev-python/pexpect/, ...
commit: 953cd616390af178297c5c0738cf939f01cebc65 Author: Benda Xu gentoo org> AuthorDate: Mon Aug 21 04:48:07 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Aug 21 04:57:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953cd616 dev-python/automat: ~arm64-macos with other twisted dependencies. dev-python/automat: keyword 22.10.0 for ~arm64-macos dev-python/ptyprocess: keyword 0.7.0-r1 for ~arm64-macos dev-python/path: keyword 16.7.1 for ~arm64-macos dev-python/pexpect: keyword 4.8.0_p20230402 for ~arm64-macos dev-python/decorator: keyword 5.1.1-r1 for ~arm64-macos net-libs/zeromq: keyword 4.3.4-r2 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/automat/automat-22.10.0.ebuild | 2 +- dev-python/decorator/decorator-5.1.1-r1.ebuild| 2 +- dev-python/path/path-16.7.1.ebuild| 2 +- dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild | 2 +- dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild | 2 +- net-libs/zeromq/zeromq-4.3.4-r2.ebuild| 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-python/automat/automat-22.10.0.ebuild b/dev-python/automat/automat-22.10.0.ebuild index 6c02cc84a1b8..418e3705ed2a 100644 --- a/dev-python/automat/automat-22.10.0.ebuild +++ b/dev-python/automat/automat-22.10.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="examples" RDEPEND=" diff --git a/dev-python/decorator/decorator-5.1.1-r1.ebuild b/dev-python/decorator/decorator-5.1.1-r1.ebuild index da9513bf8585..1611e6e5f089 100644 --- a/dev-python/decorator/decorator-5.1.1-r1.ebuild +++ b/dev-python/decorator/decorator-5.1.1-r1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" DOCS=( CHANGES.md ) diff --git a/dev-python/path/path-16.7.1.ebuild b/dev-python/path/path-16.7.1.ebuild index 9c0968baee97..297c8b83451d 100644 --- a/dev-python/path/path-16.7.1.ebuild +++ b/dev-python/path/path-16.7.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" SLOT="0" LICENSE="MIT" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" RDEPEND=" dev-python/appdirs[${PYTHON_USEDEP}] diff --git a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild index 93a2479585b1..873535514786 100644 --- a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild +++ b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild @@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="MIT" 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="examples" RDEPEND=" diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild index 37d69cf591c0..7c04c7c2f328 100644 --- a/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild +++ b/dev-python/ptyprocess/ptyprocess-0.7.0-r1.ebuild @@ -16,6 +16,6 @@ HOMEPAGE=" LICENSE="ISC" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" distutils_enable_tests pytest diff --git a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild index 854edbc0f36e..f9a40343c196 100644 --- a/net-libs/zeromq/zeromq-4.3.4-r2.ebuild +++ b/net-libs/zeromq/zeromq-4.3.4-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"; LICENSE="LGPL-3" SLOT="0/5" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="doc drafts +libbsd pgm +sodium static-libs test unwind" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-python/tornado/
commit: 241168130bc439df5324c752eafdd661caef0f26 Author: Benda Xu gentoo org> AuthorDate: Sun Aug 20 16:18:51 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 20 16:19:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24116813 dev-python/tornado: keyword 6.3.3 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/tornado/tornado-6.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/tornado/tornado-6.3.3.ebuild b/dev-python/tornado/tornado-6.3.3.ebuild index c44ab2b97f92..64ff61478c7a 100644 --- a/dev-python/tornado/tornado-6.3.3.ebuild +++ b/dev-python/tornado/tornado-6.3.3.ebuild @@ -19,7 +19,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="examples test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-python/comm/, dev-python/pickleshare/, dev-python/twisted/, dev-python/jedi/, ...
commit: a871e8a8919a14d96d0c4f918d8404beded18843 Author: Benda Xu gentoo org> AuthorDate: Sun Aug 20 08:33:19 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 20 08:44:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a871e8a8 dev-python/ipykernel: drop debugpy dependency on macOS. Reference: https://github.com/ipython/ipykernel/issues/712 Reference: https://github.com/ipython/ipykernel/issues/1136 dev-python/ipykernel: keyword 6.25.1-r1 for ~arm64-macos, ~x64-macos dev-python/comm: keyword 0.1.4 for ~arm64-macos, ~x64-macos dev-python/ipython: keyword 8.14.0 for ~arm64-macos, ~x64-macos dev-python/jupyter-client: keyword 8.3.0 for ~arm64-macos, ~x64-macos dev-python/jupyter-core: keyword 5.3.1 for ~arm64-macos, ~x64-macos dev-python/matplotlib-inline: keyword 0.1.6 for ~arm64-macos, ~x64-macos dev-python/nest-asyncio: keyword 1.5.7 for ~arm64-macos, ~x64-macos dev-python/pyzmq: keyword 25.1.1 for ~arm64-macos, ~x64-macos dev-python/traitlets: keyword 5.9.0 for ~arm64-macos, ~x64-macos dev-python/twisted: keyword 22.10.0-r3 for ~arm64-macos, ~x64-macos dev-libs/libsodium: keyword 1.0.18_p20220618 dev-python/backcall: keyword 0.2.0-r1 for ~arm64-macos, ~x64-macos dev-python/jedi: keyword 0.19.0 for ~arm64-macos, ~x64-macos dev-python/pickleshare: keyword 0.7.5 for ~arm64-macos, ~x64-macos dev-python/prompt-toolkit: keyword 3.0.39 for ~arm64-macos, ~x64-macos dev-python/stack_data: keyword 0.6.2 for ~arm64-macos, ~x64-macos dev-python/asttokens: keyword 2.2.1 for ~arm64-macos, ~x64-macos dev-python/executing: keyword 1.2.0 for ~arm64-macos, ~x64-macos dev-python/pure_eval: keyword 0.2.2 for ~arm64-macos, ~x64-macos dev-python/wcwidth: keyword 0.2.6 for ~arm64-macos, ~x64-macos dev-python/parso: keyword 0.8.3-r1 for ~arm64-macos, ~x64-macos Signed-off-by: Benda Xu gentoo.org> dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild | 4 ++-- dev-python/asttokens/asttokens-2.2.1.ebuild | 2 +- dev-python/backcall/backcall-0.2.0-r1.ebuild | 2 +- dev-python/comm/comm-0.1.4.ebuild | 2 +- dev-python/executing/executing-1.2.0.ebuild | 2 +- .../ipykernel/{ipykernel-6.25.1.ebuild => ipykernel-6.25.1-r1.ebuild} | 4 ++-- dev-python/ipython/ipython-8.14.0.ebuild | 2 +- dev-python/jedi/jedi-0.19.0.ebuild| 2 +- dev-python/jupyter-client/jupyter-client-8.3.0.ebuild | 2 +- dev-python/jupyter-core/jupyter-core-5.3.1.ebuild | 2 +- dev-python/matplotlib-inline/matplotlib-inline-0.1.6.ebuild | 2 +- dev-python/nest-asyncio/nest-asyncio-1.5.7.ebuild | 2 +- dev-python/parso/parso-0.8.3-r1.ebuild| 2 +- dev-python/pickleshare/pickleshare-0.7.5.ebuild | 2 +- dev-python/prompt-toolkit/prompt-toolkit-3.0.39.ebuild| 2 +- dev-python/pure_eval/pure_eval-0.2.2.ebuild | 2 +- dev-python/pyzmq/pyzmq-25.1.1.ebuild | 2 +- dev-python/stack_data/stack_data-0.6.2.ebuild | 2 +- dev-python/traitlets/traitlets-5.9.0.ebuild | 2 +- dev-python/twisted/twisted-22.10.0-r3.ebuild | 2 +- dev-python/wcwidth/wcwidth-0.2.6.ebuild | 2 +- 21 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild index 74d3824a82ca..e98b55fa65ca 100644 --- a/dev-libs/libsodium/libsodium-1.0.18_p20220618.ebuild +++ b/dev-libs/libsodium/libsodium-1.0.18_p20220618.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 @@ -31,7 +31,7 @@ fi LICENSE="ISC" SLOT="0/23" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="+asm minimal static-libs +urandom" CPU_USE=( cpu_flags_x86_{aes,sse4_1} ) diff --git a/dev-python/asttokens/asttokens-2.2.1.ebuild b/dev-python/asttokens/asttokens-2.2.1.ebuild index e72d38a19163..2a1d47526183 100644 --- a/dev-python/asttokens/asttokens-2.2.1.ebuild +++ b/dev-python/asttokens/asttokens-2.2.1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" RDEPEND=" de
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: 557ecf4547bb6852c18ff82df9387b7874e7a023 Author: Benda Xu gentoo org> AuthorDate: Sun Aug 20 08:31:38 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 20 08:44:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557ecf45 profiles/prefix/darwin/macos: mask debugpy and pydevd. Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.mask | 8 1 file changed, 8 insertions(+) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index fe20a13c6b56..ecf4cb96a7eb 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,6 +1,14 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-08-20) +# Does not play well with linkers under macOS. +# Undefined symbols for architecture x86_64: +# "_main", referenced from: +# implicit entry/start for main executable +dev-python/pydevd +dev-python/debugpy + # Benda Xu (2023-08-18) # strlcpy and other BSD functions are available in the libc of macOS. # Should not use libbsd.
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: 7116058359db84306bed6fa695da1e06a6f7bd3b Author: Benda Xu gentoo org> AuthorDate: Thu Aug 17 05:47:05 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 17 05:54:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71160583 profiles/prefix/darwin/macos: mask dev-libs/libbsd and its USE flag. We should make a `virtual/libbsd` when we accumulate enough `!elibc_Darwin? ( dev-libs/libbsd )` dependencies. Reported-by: Jiajie Chen qq.com> Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.mask | 5 + profiles/prefix/darwin/macos/package.use.mask | 7 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index fe6ed33ee38a..fe20a13c6b56 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,6 +1,11 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-08-18) +# strlcpy and other BSD functions are available in the libc of macOS. +# Should not use libbsd. +dev-libs/libbsd + # Benda Xu (2023-08-01) # embrace guile-3. (bug #825334) media-sound/lilypond diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask index 84c2d35a928c..fb4617ec5e85 100644 --- a/profiles/prefix/darwin/macos/package.use.mask +++ b/profiles/prefix/darwin/macos/package.use.mask @@ -1,6 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-08-18) +# strlcpy and other BSD functions are available in the libc of macOS. +# Should not use libbsd. +net-libs/zeromq libbsd + # Fabian Groffen (2022-02-13) # we have virtual/gsasl keyworded mail-client/mutt -gsasl
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: 2a9031b15305a19d81201392c87645b2f192169b Author: Benda Xu gentoo org> AuthorDate: Thu Aug 17 04:39:21 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 17 04:39:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a9031b1 profiles/prefix/darwin/macos: turn off ssl and smp default USE flags. dev-python/{twisted[ssl],ipython[smp]} both depend on rust, which is not yet supported on Gentoo/macOS. Suggested-by: Jiajie Chen qq.com> Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.use | 22 ++ 1 file changed, 22 insertions(+) diff --git a/profiles/prefix/darwin/macos/package.use b/profiles/prefix/darwin/macos/package.use index f36adf8d3ddf..3039c40c15fe 100644 --- a/profiles/prefix/darwin/macos/package.use +++ b/profiles/prefix/darwin/macos/package.use @@ -1,6 +1,28 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-08-17) +# dev-python/ipython[smp] and dev-python/twisted[ssl] ultimately draws +# in dev-lang/rust. But rust is not available until LLVM works on +# macOS. (#763018) +# +# dev-python/twisted-22.10.0-r3::gentoo USE="ssl -conch -http2 -serial -test" +# dev-python/pyopenssl-23.2.0::gentoo USE="-doc -test" +# dev-python/cryptography-41.0.3::gentoo USE="-debug -test" +#dev-python/setuptools-rust-1.6.0::gentoo USE="-debug -test" +# +# dev-python/ipython-8.14.0::gentoo_prefix[smp] +# dev-python/ipyparallel-8.6.1 +# dev-python/jupyter-server-2.7.0 +#dev-python/jupyter-events-0.7.0 +# dev-python/jsonschema-4.19.0 +# dev-python/rpds-py-0.9.2 +# dev-util/maturin-1.2.1 +#dev-python/setuptools-rust-1.6.0 + +dev-python/twisted -ssl +dev-python/ipython -smp + # Benda Xu (2023-07-17) # scientific python related use flags. The Prefix/macos is widely # used in scientific and HPC applications. Maintain some reasonable
[gentoo-commits] repo/gentoo:master commit in: dev-python/psutil/, dev-python/threadpoolctl/, dev-python/cloudpickle/, ...
commit: ef91e830d8702e54ca50b4ee1ce5b1e1a9313975 Author: Benda Xu gentoo org> AuthorDate: Thu Aug 17 04:09:19 2023 + Commit: Benda XU gentoo org> CommitDate: Thu Aug 17 04:13:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef91e830 sci-libs/scikit-learn: keyword ~{arm,x}64-macos with dependencies dev-python/joblib: keyword 1.3.2 for ~arm64-macos, ~x64-macos dev-python/threadpoolctl: keyword 3.2.0 for ~arm64-macos, ~x64-macos dev-python/cloudpickle: keyword 2.2.1 for ~arm64-macos, ~x64-macos dev-python/loky: keyword 3.4.1 for ~arm64-macos, ~x64-macos dev-python/psutil: keyword 5.9.5 for ~arm64-macos Suggested-by: Hanyi Li mails.tsinghua.edu.cn> Signed-off-by: Benda Xu gentoo.org> dev-python/cloudpickle/cloudpickle-2.2.1.ebuild | 2 +- dev-python/joblib/joblib-1.3.2.ebuild | 2 +- dev-python/loky/loky-3.4.1.ebuild | 2 +- dev-python/psutil/psutil-5.9.5.ebuild | 2 +- dev-python/threadpoolctl/threadpoolctl-3.2.0.ebuild | 2 +- sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild b/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild index c33734046622..9cd3727e8d18 100644 --- a/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild +++ b/dev-python/cloudpickle/cloudpickle-2.2.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -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 ~arm64-macos ~x64-macos" BDEPEND=" test? ( diff --git a/dev-python/joblib/joblib-1.3.2.ebuild b/dev-python/joblib/joblib-1.3.2.ebuild index 72a905b5b040..8b3493f62b42 100644 --- a/dev-python/joblib/joblib-1.3.2.ebuild +++ b/dev-python/joblib/joblib-1.3.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" RDEPEND=" dev-python/cloudpickle[${PYTHON_USEDEP}] diff --git a/dev-python/loky/loky-3.4.1.ebuild b/dev-python/loky/loky-3.4.1.ebuild index ab6c1a93cf48..8503470eaf5a 100644 --- a/dev-python/loky/loky-3.4.1.ebuild +++ b/dev-python/loky/loky-3.4.1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv x86 ~arm64-macos ~x64-macos" RDEPEND=" dev-python/cloudpickle[${PYTHON_USEDEP}] diff --git a/dev-python/psutil/psutil-5.9.5.ebuild b/dev-python/psutil/psutil-5.9.5.ebuild index 1bda30e0204c..88949ae29b18 100644 --- a/dev-python/psutil/psutil-5.9.5.ebuild +++ b/dev-python/psutil/psutil-5.9.5.ebuild @@ -21,7 +21,7 @@ SRC_URI+=" LICENSE="BSD" 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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="test" RESTRICT="!test? ( test )" diff --git a/dev-python/threadpoolctl/threadpoolctl-3.2.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-3.2.0.ebuild index c80290ae5121..5baeee4bc548 100644 --- a/dev-python/threadpoolctl/threadpoolctl-3.2.0.ebuild +++ b/dev-python/threadpoolctl/threadpoolctl-3.2.0.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" BDEPEND=" dev-python/cython[${PYTHON_USEDEP}] diff --git a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild index 205d7e0ab2b7..bf4872aa7465 100644 --- a/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild +++ b/sci-libs/scikit-learn/scikit-learn-1.1.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/scikit-learn/scikit-learn/archive/${PV}.tar.gz -> ${ LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" IUSE="examples" # Fatal Python error: Segmentation fault
[gentoo-commits] repo/gentoo:master commit in: sci-physics/clhep/
commit: f0978a52d5bf823d51923d65744ec2ce78433a9b Author: Benda Xu gentoo org> AuthorDate: Mon Aug 14 13:07:13 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Aug 14 13:14:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0978a52 sci-physics/clhep: add 2.4.6.4, drop 2.4.5.3 Signed-off-by: Benda Xu gentoo.org> sci-physics/clhep/Manifest | 2 +- sci-physics/clhep/{clhep-2.4.5.3.ebuild => clhep-2.4.6.4.ebuild} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest index ec92ff77ebf2..0bf1be887f26 100644 --- a/sci-physics/clhep/Manifest +++ b/sci-physics/clhep/Manifest @@ -1,2 +1,2 @@ -DIST clhep-2.4.5.3.tgz 1552597 BLAKE2B a2edcbe133af98c817982f9d9f787fbbc76a1e8a10a29c890cbdd223670ee2e9d6dec872de80880e5d286790ee0168501cd3270bdbed04f9781554ee35f6eb1a SHA512 f677c93bb53047167fe0f22cbf1f5d97f27476b64566817a799240bfce8e9fe7fd658a168c25fad76a35c6eb92e1e42ec7b88960facb6632279367f0606282c8 DIST clhep-2.4.6.2.tgz 1550248 BLAKE2B 10da3a7adc295c306d3ad57bff68489852717885eac544fe6858aed3868047cb377565f55a861751a09ea6c88584fe94b685f5dcef84c6e51afdddef8080eeb2 SHA512 cae1295d27b804c3b45c21195d8d45e9403e9449ca12d1e1a031615584f46784a1c6f75fdbc51467b901fa47057aa79077bd224994f0b6261abefc99810c2687 +DIST clhep-2.4.6.4.tgz 1550911 BLAKE2B 20da75b641e9396b8b63d81f931f63ecf886ca1e02c8d4eda48ff17ba27753df66bebd758db410d7c5c2c18db0bc82641a48da1e40c48f5da0f01db9524f0d53 SHA512 7df53762a2e788bdc5e4a780bedbca7fa862b033389972cd698f364f0b399e23705554e44da3df140d6334c513b494fe90ffc2b592a36792fbb2bc7c5626da90 diff --git a/sci-physics/clhep/clhep-2.4.5.3.ebuild b/sci-physics/clhep/clhep-2.4.6.4.ebuild similarity index 95% rename from sci-physics/clhep/clhep-2.4.5.3.ebuild rename to sci-physics/clhep/clhep-2.4.6.4.ebuild index 78d5e4cde95d..8297ecd068ed 100644 --- a/sci-physics/clhep/clhep-2.4.5.3.ebuild +++ b/sci-physics/clhep/clhep-2.4.6.4.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"; SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/dist1/${P}.tgz"; LICENSE="GPL-3 LGPL-3" SLOT="2/${PV}" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc test threads" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-util/nvidia-cuda-toolkit/
commit: 56bf30db3c55f0bf7786e5e057a5546932aa99ca Author: Benda Xu gentoo org> AuthorDate: Mon Aug 14 07:56:11 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Aug 14 07:57:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bf30db dev-util/nvidia-cuda-toolkit: dosym link has EPREFIX prepended. Should use the raw cudadir. Reference: https://bugs.gentoo.org/615594 Signed-off-by: Benda Xu gentoo.org> dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild | 4 ++-- dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild| 4 ++-- dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild| 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild index 89752e0c6d16..039bae19520e 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.1.1-r1.ebuild @@ -257,8 +257,8 @@ src_install() { fi # Add include and lib symlinks - dosym targets/x86_64-linux/include ${ecudadir}/include - dosym targets/x86_64-linux/lib ${ecudadir}/lib64 + dosym targets/x86_64-linux/include ${cudadir}/include + dosym targets/x86_64-linux/lib ${cudadir}/lib64 # Remove bad symlinks rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild index 56e08afe36fc..f1281e52c3d6 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.0.ebuild @@ -257,8 +257,8 @@ src_install() { fi # Add include and lib symlinks - dosym targets/x86_64-linux/include ${ecudadir}/include - dosym targets/x86_64-linux/lib ${ecudadir}/lib64 + dosym targets/x86_64-linux/include ${cudadir}/include + dosym targets/x86_64-linux/lib ${cudadir}/lib64 # Remove bad symlinks rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild index 5f9a12343567..10250e337e5c 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-12.2.1.ebuild @@ -257,8 +257,8 @@ src_install() { fi # Add include and lib symlinks - dosym targets/x86_64-linux/include ${ecudadir}/include - dosym targets/x86_64-linux/lib ${ecudadir}/lib64 + dosym targets/x86_64-linux/include ${cudadir}/include + dosym targets/x86_64-linux/lib ${cudadir}/lib64 # Remove bad symlinks rm "${ED}"/${cudadir}/targets/x86_64-linux/include/include || die
[gentoo-commits] proj/sci:master commit in: dev-python/numba/
commit: 6fbdce70f6d34338a7f854b91fdc84056cddabc8 Author: Benda Xu gentoo org> AuthorDate: Wed Aug 9 09:17:09 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Aug 9 09:19:17 2023 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=6fbdce70 dev-python/numba: add 0.57.1, drop 0.56.3 Signed-off-by: Benda Xu gentoo.org> .../numba/{numba-0.56.3.ebuild => numba-0.57.1.ebuild} | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-python/numba/numba-0.56.3.ebuild b/dev-python/numba/numba-0.57.1.ebuild similarity index 91% rename from dev-python/numba/numba-0.56.3.ebuild rename to dev-python/numba/numba-0.57.1.ebuild index 85fb09a85..814dc36f9 100644 --- a/dev-python/numba/numba-0.56.3.ebuild +++ b/dev-python/numba/numba-0.57.1.ebuild @@ -4,14 +4,14 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) - DISTUTILS_USE_PEP517=setuptools +DISTUTILS_EXT=1 inherit optfeature multiprocessing distutils-r1 DESCRIPTION="NumPy aware dynamic Python compiler using LLVM" HOMEPAGE="https://numba.pydata.org/ https://github.com/numba"; -SRC_URI="https://github.com/numba/numba/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/numba/numba/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" LICENSE="BSD" SLOT="0" @@ -19,11 +19,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="openmp threads" RDEPEND=" - >=dev-python/llvmlite-0.39.0[${PYTHON_USEDEP}] - <=dev-python/llvmlite-0.40.0 + >=dev-python/llvmlite-0.40.0[${PYTHON_USEDEP}] + <=dev-python/llvmlite-0.41.0 >=dev-python/numpy-1.18.0[${PYTHON_USEDEP}] - =dev-cpp/tbb-2021.1 =dev-cpp/tbb-2021.6 ) " BDEPEND=" dev-python/pip[${PYTHON_USEDEP}]
[gentoo-commits] proj/sci:master commit in: dev-python/llvmlite/
commit: af92d3bfbb7e6258eb23187221bd04cef5724e62 Author: Benda Xu gentoo org> AuthorDate: Wed Aug 9 09:12:08 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Aug 9 09:19:06 2023 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=af92d3bf dev-python/llvmlite: add 0.40.1 Regress LLVM_MAX_SLOT back to 14. It does not compile with LLVM 15. Signed-off-by: Benda Xu gentoo.org> dev-python/llvmlite/llvmlite-0.40.1.ebuild | 63 ++ 1 file changed, 63 insertions(+) diff --git a/dev-python/llvmlite/llvmlite-0.40.1.ebuild b/dev-python/llvmlite/llvmlite-0.40.1.ebuild new file mode 100644 index 0..bacb0358b --- /dev/null +++ b/dev-python/llvmlite/llvmlite-0.40.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 llvm + +DESCRIPTION="Python wrapper around the llvm C++ library" +HOMEPAGE="https://llvmlite.pydata.org/"; +SRC_URI="https://github.com/numba/llvmlite/archive/v${PV/_/}.tar.gz -> ${P/_/}.gh.tar.gz" +S="${WORKDIR}/${P/_/}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="examples" + +LLVM_MAX_SLOT=14 + +RDEPEND=" + sys-devel/llvm:${LLVM_MAX_SLOT} + sys-libs/zlib:0= +" +DEPEND="${RDEPEND}" + +PATCHES=() + +src_prepare() { + sed -i -e '/max_python/s:3\.10:3.11:' setup.py || die + distutils-r1_src_prepare +} + +python_configure_all() { + # upstream's build system is just horrible, and they ignored the PR + # fixing it, so let's build the shared lib properly using implicit + # make rules + + export LDLIBS=$(llvm-config --libs all) + export CXXFLAGS="$(llvm-config --cxxflags) -fPIC ${CXXFLAGS}" + export LDFLAGS="$(llvm-config --ldflags) ${LDFLAGS}" + + local files=( ffi/*.cpp ) + emake -f - <
[gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/
commit: 94f9589bc808d609d82bf67a1e76b8b396c8b00f Author: Benda Xu gentoo org> AuthorDate: Wed Aug 9 09:06:44 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Aug 9 09:08:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f9589b sys-devel/llvm: enable py3.11 Signed-off-by: Benda Xu gentoo.org> sys-devel/llvm/llvm-14.0.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/llvm/llvm-14.0.6-r4.ebuild b/sys-devel/llvm/llvm-14.0.6-r4.ebuild index dd4204b73ea3..27a21c6774e1 100644 --- a/sys-devel/llvm/llvm-14.0.6-r4.ebuild +++ b/sys-devel/llvm/llvm-14.0.6-r4.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \ toolchain-funcs
[gentoo-commits] repo/gentoo:master commit in: dev-python/tqdm/
commit: 5a4ca629a3d19e27f25715145166120493b9e8d5 Author: Benda Xu gentoo org> AuthorDate: Sun Aug 6 00:11:15 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Aug 6 00:11:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a4ca629 dev-python/tqdm: keyword 4.65.0 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/tqdm/tqdm-4.65.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/tqdm/tqdm-4.65.0.ebuild b/dev-python/tqdm/tqdm-4.65.0.ebuild index c91aeff3dee7..7cfb68470838 100644 --- a/dev-python/tqdm/tqdm-4.65.0.ebuild +++ b/dev-python/tqdm/tqdm-4.65.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="examples" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/
commit: a579f33eee1d71250cbb418c39ae0179449bd940 Author: Benda Xu gentoo org> AuthorDate: Sat Aug 5 07:00:03 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Aug 5 07:02:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a579f33e dev-python/numpy: drop numpy/distutils/tests/test_ccompiler_opt.py This test is useless to Gentoo. Portage should control all the CFLAGS, not letting NumPy distutils do the guesses. Closes: https://bugs.gentoo.org/910738 Signed-off-by: Benda Xu gentoo.org> dev-python/numpy/numpy-1.24.4-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-python/numpy/numpy-1.24.4-r1.ebuild b/dev-python/numpy/numpy-1.24.4-r1.ebuild index 1320287bdbe2..5db2ffe20ea8 100644 --- a/dev-python/numpy/numpy-1.24.4-r1.ebuild +++ b/dev-python/numpy/numpy-1.24.4-r1.ebuild @@ -110,6 +110,7 @@ python_prepare_all() { gawk -i inplace -v "enabled_flags=${enabled_flags[*]}" \ -f "${FILESDIR}"/replace_cpuflags.awk \ numpy/distutils/ccompiler_opt.py || die + rm -f numpy/distutils/tests/test_ccompiler_opt.py || die distutils-r1_python_prepare_all }
[gentoo-commits] repo/gentoo:master commit in: app-eselect/eselect-repository/
commit: 8ebd5830c4b8f13d5c61bd81e9a4b5fd5de8a407 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 1 12:58:00 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Aug 1 13:01:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebd5830 app-eselect/eselect-repository: keyword 13 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> app-eselect/eselect-repository/eselect-repository-13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-eselect/eselect-repository/eselect-repository-13.ebuild b/app-eselect/eselect-repository/eselect-repository-13.ebuild index 7f62bab8aac2..4bbaed00f1d7 100644 --- a/app-eselect/eselect-repository/eselect-repository-13.ebuild +++ b/app-eselect/eselect-repository/eselect-repository-13.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" REQUIRED_USE=${PYTHON_REQUIRED_USE}
[gentoo-commits] proj/R_overlay:master commit in: files/eclass/
commit: 68c6ef694ea96dc15228ff2ab9bc215dd2dd8ae7 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 1 04:16:03 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Aug 1 04:16:03 2023 + URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=68c6ef69 files/eclass/R-packages.eclass: drop eutils. Signed-off-by: Benda Xu gentoo.org> files/eclass/R-packages.eclass | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/files/eclass/R-packages.eclass b/files/eclass/R-packages.eclass index 2d52145..f3864ff 100644 --- a/files/eclass/R-packages.eclass +++ b/files/eclass/R-packages.eclass @@ -1,8 +1,6 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -inherit eutils - EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install pkg_postinst SLOT="0"
[gentoo-commits] proj/R_overlay:master commit in: roverlay/ebuild/
commit: c28b07285e2ad983feb0794a78f503bd859a8ef1 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 1 03:37:50 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Aug 1 03:37:50 2023 + URL:https://gitweb.gentoo.org/proj/R_overlay.git/commit/?id=c28b0728 r/ebuild/creation.py: add {x,arm}64-macos keywords. Signed-off-by: Benda Xu gentoo.org> roverlay/ebuild/creation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roverlay/ebuild/creation.py b/roverlay/ebuild/creation.py index 8418240..30ae3be 100644 --- a/roverlay/ebuild/creation.py +++ b/roverlay/ebuild/creation.py @@ -220,7 +220,7 @@ class EbuildCreation ( object ): ebuild.use ( evars.HOMEPAGE ( homepage_str ) ) if 'KEYWORDS' not in ebuild: -ebuild.use ( evars.KEYWORDS ( "~amd64" ) ) +ebuild.use ( evars.KEYWORDS ( "~amd64 ~x64-macos ~arm64-macos" ) ) #ebuild_text = ebuild.to_str() ## FIXME: debug rstrip()
[gentoo-commits] repo/gentoo:master commit in: dev-lang/R/, dev-libs/tre/
commit: 773a780df64dab4f20eee9fe01f6aa9b6a67e69d Author: Benda Xu gentoo org> AuthorDate: Tue Aug 1 02:26:32 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Aug 1 02:49:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773a780d dev-lang/R: add 4.3.1 and keyword {x,arm}64-macos. Disable aqua in all cases. dev-libs/tre: keyword 0.8.0_p20210321-r3 Closes: https://bugs.gentoo.org/878103 Signed-off-by: Benda Xu gentoo.org> dev-lang/R/Manifest| 1 + dev-lang/R/R-4.3.1.ebuild | 248 + dev-libs/tre/tre-0.8.0_p20210321-r3.ebuild | 2 +- 3 files changed, 250 insertions(+), 1 deletion(-) diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 92c9fed1a39b..eba3d04375b7 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,2 +1,3 @@ DIST R-4.3.0.tar.gz 34821768 BLAKE2B 3505c8357419355fddb8aadbf0952c492e3e38d649d6261478d6187c94ff71110089ec0933a31dd2f7258e58a1d0864a68cb4d7b6cdefc54e5add55d0d62db10 SHA512 7f9bc8360818d7fdf05e26a4213df01468669514a4c2ad62dee358f53dcfa05a71ee72241db91fed59574c26d7caee5d3e0717637e1666daec99446e42c07813 +DIST R-4.3.1.tar.gz 34899964 BLAKE2B 7aaacad01ce59e2faa46c4b830c10d2df8e4a3a1d4f11cf2aa622ceb53876f1e702dff94a820ca954ec29f53d58fa7e135ef15e8257602c50f2642b0a0c0a86a SHA512 f571c378dbdd675e267ef4419bb1141198924dadc08297c93c8dff58504994604918b3e045bb7139ba473972a063a68ed1c7426f37d4e8208b79358561d34d77 DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 diff --git a/dev-lang/R/R-4.3.1.ebuild b/dev-lang/R/R-4.3.1.ebuild new file mode 100644 index ..aa5e48b575b8 --- /dev/null +++ b/dev-lang/R/R-4.3.1.ebuild @@ -0,0 +1,248 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs + +# latest git commit for R bash completion: +# https://github.com/deepayan/rcompletion +BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6 + +DESCRIPTION="Language and environment for statistical computing and graphics" +HOMEPAGE="https://www.r-project.org/"; +SRC_URI=" + mirror://cran/src/base/R-4/${P}.tar.gz + https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion" + +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~loong ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X" + +REQUIRED_USE=" + png? ( || ( cairo X ) ) + jpeg? ( || ( cairo X ) ) + tiff? ( || ( cairo X ) )" +RESTRICT=" + minimal? ( test ) + !test? ( test )" + +# At least one package installation in the test suite requires TeX, +# and will fail without it (bug #718056). +DEPEND=" + app-arch/bzip2 + app-arch/xz-utils + app-text/ghostscript-gpl + dev-libs/libpcre2:= + >=dev-libs/tre-0.8.0_p20210321[approx] + net-misc/curl + virtual/blas + sys-libs/zlib[minizip] + || ( + sys-apps/coreutils + app-misc/realpath + ) + cairo? ( + x11-libs/cairo:=[X=] + x11-libs/pango:= + ) + icu? ( dev-libs/icu:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + kernel_linux? ( net-libs/libtirpc ) + lapack? ( virtual/lapack ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng:= ) + readline? ( sys-libs/readline:= ) + tiff? ( media-libs/tiff:= ) + tk? ( dev-lang/tk:= ) + X? ( + x11-libs/libXmu + x11-libs/libXt + )" +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.8:* )" +BDEPEND=" + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-fontsrecommended + ) + test? ( virtual/latex-base )" + +PATCHES=( + "${FILESDIR}"/R-4.3.0-parallel.patch + "${FILESDIR}"/R-4.3.0-no-LDFLAGS-in-libR-pkg-config.patch + "${FILESDIR}"/R-4.3.0-no-gzip-doc.patch +) + +# false positive, the linking step fails (as it should) +QA_CONFIG_IMPL_DECL_SKIP=( iconvlist ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] && use openmp; then + tc-check-
[gentoo-commits] repo/proj/prefix:master commit in: scripts/rsync-generation/
commit: 395b646f1154d1c1c625387d8decb3a1b8bed254 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 1 02:39:51 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Aug 1 02:39:51 2023 + URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=395b646f s/r-g/update-rsync-master.sh: put an alias gentoo repo name. Closes: https://bugs.gentoo.org/911543 Signed-off-by: Benda Xu gentoo.org> scripts/rsync-generation/update-rsync-master.sh | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/rsync-generation/update-rsync-master.sh b/scripts/rsync-generation/update-rsync-master.sh index f4b12787d4..6a93207518 100755 --- a/scripts/rsync-generation/update-rsync-master.sh +++ b/scripts/rsync-generation/update-rsync-master.sh @@ -271,8 +271,11 @@ START=$(date +%s) echo "($(date +"%F %R")) signing Manifest" -# we will generate thick manifests, so ensure Portage knows that -sed -i -e '/^thin-manifests/s/true/false/' "${RSYNCDIR}"/metadata/layout.conf +# we will generate thick manifests, so ensure Portage knows that. +# add a "gentoo" alias for compatibility, bug #911543. +sed -e '/^thin-manifests/s/true/false/' \ +-e '$arepo-name = gentoo_prefix\naliases = gentoo' \ +-i "${RSYNCDIR}"/metadata/layout.conf # generate Thick Manifests # Signing is done with our snapshot signing key, and only on the top
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: f13ae3d50975b32f49facd260ae1dc48afa49b18 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 31 17:27:14 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 31 17:28:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13ae3d5 profiles/prefix/darwin/macos: welcome guile-3 to macos. Bug: https://bugs.gentoo.org/825334 Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.mask | 4 profiles/prefix/darwin/macos/package.unmask | 6 ++ 2 files changed, 10 insertions(+) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index 82ecbd1c566d..fe6ed33ee38a 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-08-01) +# embrace guile-3. (bug #825334) +media-sound/lilypond + # Fabian Groffen (2023-06-24) # Fails to link due to missing libintl, already fixed upstream: # https://git.savannah.gnu.org/cgit/tar.git/commit/?id=8632df398b2f548465ebe68b8f494c0d6f8d913d diff --git a/profiles/prefix/darwin/macos/package.unmask b/profiles/prefix/darwin/macos/package.unmask new file mode 100644 index ..c83ace0c1e3e --- /dev/null +++ b/profiles/prefix/darwin/macos/package.unmask @@ -0,0 +1,6 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Benda Xu (2023-08-01) +# embrace guile-3. (bug #825334) +>=dev-scheme/guile-3.0.4
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: dc105a6efbb47cb7347cc6d00c83d32a570c9a7c Author: Benda Xu gentoo org> AuthorDate: Mon Jul 31 17:01:58 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 31 17:05:16 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc105a6e profiles: last rite sci-electronics/gwave. Bug: https://bugs.gentoo.org/824966 Suggested-by: Paul Jewell teulu.org> Signed-off-by: Benda Xu gentoo.org> profiles/package.mask | 5 + 1 file changed, 5 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 1bec4fb19236..a3b3c9d28078 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,11 @@ #--- END OF EXAMPLES --- +# Benda Xu (2023-08-01) +# Dead upstream. blocking guile-3 migration and gtk+-2 removal. +# Removal on 2023-09-01. (bug #824966) +sci-electronics/gwave + # David Seifert (2023-07-29) # EAPI 6, fetch restrictions require annoying registration, no other # distro packages this, over 10 years old. Removal on 2023-08-28.
[gentoo-commits] repo/gentoo:master commit in: dev-python/agate/, dev-python/python-slugify/, dev-python/agate-excel/, ...
commit: 8515bcdf8a6d43813480051af417d37e1b7eade7 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 31 04:32:16 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 31 04:38:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8515bcdf dev-python/csvkit: keyword with dependencies for ~{arm,x}64-macos dev-python/agate: keyword 1.7.1 for ~arm64-macos, ~x64-macos dev-python/agate-excel: keyword 0.2.5-r2 for ~arm64-macos, ~x64-macos dev-python/agate-dbf: keyword 0.2.2-r2 for ~arm64-macos, ~x64-macos dev-python/agate-sql: keyword 0.5.9 for ~arm64-macos, ~x64-macos dev-python/dbfread: keyword 2.0.7-r1 for ~arm64-macos, ~x64-macos dev-python/openpyxl: keyword 3.1.2 for ~arm64-macos, ~x64-macos dev-python/xlrd: keyword 2.0.1-r1 for ~arm64-macos, ~x64-macos dev-python/et_xmlfile: keyword 1.1.0-r1 for ~arm64-macos, ~x64-macos dev-python/pytimeparse: keyword 1.1.8-r1 for ~arm64-macos, ~x64-macos dev-python/parsedatetime: keyword 2.6-r1 for ~arm64-macos, ~x64-macos dev-python/isodate: keyword 0.6.1-r1 for ~arm64-macos, ~x64-macos dev-python/pyicu: keyword 2.11 for ~arm64-macos, ~x64-macos dev-python/python-slugify: keyword 8.0.1 for ~arm64-macos, ~x64-macos dev-python/leather: keyword 0.3.4-r1 for ~arm64-macos, ~x64-macos dev-python/text-unidecode: keyword 1.3-r1 for ~arm64-macos, ~x64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/agate-dbf/agate-dbf-0.2.2-r2.ebuild | 2 +- dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild | 2 +- dev-python/agate-sql/agate-sql-0.5.9.ebuild| 2 +- dev-python/agate/agate-1.7.1.ebuild| 2 +- dev-python/csvkit/csvkit-1.1.1.ebuild | 2 +- dev-python/dbfread/dbfread-2.0.7-r1.ebuild | 2 +- dev-python/et_xmlfile/et_xmlfile-1.1.0-r1.ebuild | 2 +- dev-python/isodate/isodate-0.6.1-r1.ebuild | 2 +- dev-python/leather/leather-0.3.4-r1.ebuild | 2 +- dev-python/openpyxl/openpyxl-3.1.2.ebuild | 2 +- dev-python/parsedatetime/parsedatetime-2.6-r1.ebuild | 2 +- dev-python/pyicu/pyicu-2.11.ebuild | 2 +- dev-python/python-slugify/python-slugify-8.0.1.ebuild | 2 +- dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild | 2 +- dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild | 2 +- dev-python/xlrd/xlrd-2.0.1-r1.ebuild | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dev-python/agate-dbf/agate-dbf-0.2.2-r2.ebuild b/dev-python/agate-dbf/agate-dbf-0.2.2-r2.ebuild index 908732f2a4db..ebbcc0e848f3 100644 --- a/dev-python/agate-dbf/agate-dbf-0.2.2-r2.ebuild +++ b/dev-python/agate-dbf/agate-dbf-0.2.2-r2.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/agate-1.5.0[${PYTHON_USEDEP}] diff --git a/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild b/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild index 56d3d732c99d..bf09524990f3 100644 --- a/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild +++ b/dev-python/agate-excel/agate-excel-0.2.5-r2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/agate-1.5.0[${PYTHON_USEDEP}] diff --git a/dev-python/agate-sql/agate-sql-0.5.9.ebuild b/dev-python/agate-sql/agate-sql-0.5.9.ebuild index 6fec0ae83d1f..7d0761c8198b 100644 --- a/dev-python/agate-sql/agate-sql-0.5.9.ebuild +++ b/dev-python/agate-sql/agate-sql-0.5.9.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/agate-1.5.0[${PYTHON_USEDEP}] diff --git a/dev-python/agate/agate-1.7.1.ebuild b/dev-python/agate/agate-1.7.1.ebuild index 8e2701c8125b..8f58a4dec687 100644 --- a/dev-python/agate/agate-1.7.1.ebuild +++ b/dev-python/agate/agate-1.7.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv" +KEYWORDS="~amd64 ~riscv ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}] diff --git a/dev-python/csvkit/csvkit-1.1.1.ebuild b/dev-python/csvkit/csvkit-1.1.1.ebuild index c65988ea5d16..2469cabfedb4 100644 --- a/dev-python/csvkit/csvkit-1.1.1.ebuild +++ b/dev-python/csvkit/csvkit-1.1.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE=" " LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/agate-1.6.1[${PYTHON_USEDEP}] diff --git a/dev-python/dbfread/dbfread-2.0.7-r1.ebuild b/dev-python/dbfread/dbfread-2.0.7-r1.ebuild index e4b8f12535c3..71d9e
[gentoo-commits] repo/gentoo:master commit in: app-forensics/foremost/files/
commit: cbb557262a820ed960408d225152bc5ccaab3bcf Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 11:11:41 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 11:52:27 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb55726 app-forensics/foremost: simplify the musl patch. This make it work also for Darwin. Bug: https://bugs.gentoo.org/830473 Signed-off-by: Benda Xu gentoo.org> .../foremost/files/foremost-1.5.7-musl.patch | 76 -- 1 file changed, 14 insertions(+), 62 deletions(-) diff --git a/app-forensics/foremost/files/foremost-1.5.7-musl.patch b/app-forensics/foremost/files/foremost-1.5.7-musl.patch index 0f8994b2328f..18bca055c584 100644 --- a/app-forensics/foremost/files/foremost-1.5.7-musl.patch +++ b/app-forensics/foremost/files/foremost-1.5.7-musl.patch @@ -1,78 +1,30 @@ a/cli.c -+++ b/cli.c -@@ -4,7 +4,7 @@ - - void fatal_error (f_state * s, char *msg) - { -- fprintf(stderr, "%s: %s%s", __progname, msg, NEWLINE); -+ fprintf(stderr, "%s: %s%s", program_invocation_short_name, msg, NEWLINE); - if (get_audit_file_open(s)) - { - audit_msg(s, msg); -@@ -16,7 +16,7 @@ - void print_error(f_state *s, char *fn, char *msg) - { - if (!(get_mode(s, mode_quiet))) -- fprintf(stderr, "%s: %s: %s%s", __progname, fn, msg, NEWLINE); -+ fprintf(stderr, "%s: %s: %s%s", program_invocation_short_name, fn, msg, NEWLINE); - } - - void print_message(f_state *s, char *format, va_list argp) a/helpers.c -+++ b/helpers.c -@@ -133,7 +133,7 @@ - if (ioctl(fd, BLKGETSIZE, &num_sectors)) - { - #if defined(__DEBUG) -- fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", __progname, NEWLINE); -+ fprintf(stderr, "%s: ioctl call to BLKGETSIZE failed.%s", program_invocation_short_name, NEWLINE); - #endif - } - else a/main.c -+++ b/main.c -@@ -55,18 +55,18 @@ - - void try_msg(void) - { -- fprintf(stderr, "Try `%s -h` for more information.%s", __progname, NEWLINE); -+ fprintf(stderr, "Try `%s -h` for more information.%s", program_invocation_short_name, NEWLINE); - } - - /* The usage function should, at most, display 22 lines of text to fit -on a single screen */ - void usage(void) - { -- fprintf(stderr, "%s version %s by %s.%s", __progname, VERSION, AUTHOR, NEWLINE); -+ fprintf(stderr, "%s version %s by %s.%s", program_invocation_short_name, VERSION, AUTHOR, NEWLINE); - fprintf(stderr, - "%s %s [-v|-V|-h|-T|-Q|-q|-a|-w-d] [-t ] [-s ] [-k ] \n\t[-b ] [-c ] [-o ] [-i
[gentoo-commits] repo/gentoo:master commit in: app-forensics/foremost/
commit: 9a6ec44dcc26a52c273ac0a2d0826052c0607c24 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 11:46:49 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 11:52:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a6ec44d app-forensics/foremost: support Prefix and keyword {x64,arm64}-macos Signed-off-by: Benda Xu gentoo.org> app-forensics/foremost/foremost-1.5.7-r4.ebuild | 46 + 1 file changed, 46 insertions(+) diff --git a/app-forensics/foremost/foremost-1.5.7-r4.ebuild b/app-forensics/foremost/foremost-1.5.7-r4.ebuild new file mode 100644 index ..7efec700c421 --- /dev/null +++ b/app-forensics/foremost/foremost-1.5.7-r4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs prefix + +DESCRIPTION="Console program to recover files based on their headers and footers" +HOMEPAGE="http://foremost.sourceforge.net/"; +#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +# starting to hate sf.net ... +SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"; + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~arm64-macos ~x64-macos" +IUSE="" + +src_prepare() { + PATCHES=( + "${FILESDIR}/${PN}-1.4-config-location.patch" + "${FILESDIR}/${PN}-1.5.7-format-security.patch" # bug 521038 + "${FILESDIR}/${PN}-1.5.7-set-but-unused.patch" # bug 706886 + "${FILESDIR}/${PN}-1.5.7-fno-common.patch" # bug 722196 + "${FILESDIR}/${PN}-1.5.7-musl.patch" # bug 830473 + ) + + default + hprefixify config.c +} + +src_compile() { + emake \ + RAW_FLAGS="${CFLAGS} -Wall ${LDFLAGS}" \ + RAW_CC="$(tc-getCC) -DVERSION=\\\"${PV}\\\"" \ + CONF=/etc +} + +src_install() { + dobin foremost + gunzip foremost.8.gz || die + doman foremost.8 + insinto /etc + doins foremost.conf + dodoc README CHANGES +}
[gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/files/
commit: c9b6b13dc48291d8edf9b5db9cc83d673981114c Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 08:05:36 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 08:22:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b6b13d dev-python/pybind11: update the information on the patch. The macOS fix is actually upstream. Signed-off-by: Benda Xu gentoo.org> dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch index 5bfa88348110..cbfcff84a684 100644 --- a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch +++ b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch @@ -2,8 +2,7 @@ Break the toolchain assumption of LLVM on Prefix/macOS. At Prefix/macOS, the system compiler is GCC with libstdc++. -This patch is only useful to Gentoo Prefix. We don't have plans to -forward it upstream. +Reference: https://github.com/pybind/pybind11/pull/4639 Signed-off-by: Benda Xu
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocBLAS/
commit: 888f51e9cc6faea00654bd3d9e6b3d13c3a61056 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 07:46:34 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 07:48:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=888f51e9 sci-libs/rocBLAS: drop versioned dependence on rocm-cmake. Signed-off-by: Benda Xu gentoo.org> sci-libs/rocBLAS/{rocBLAS-5.1.3-r3.ebuild => rocBLAS-5.1.3-r4.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild similarity index 99% rename from sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild rename to sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild index 7027067623c7..94c7e5177af0 100644 --- a/sci-libs/rocBLAS/rocBLAS-5.1.3-r3.ebuild +++ b/sci-libs/rocBLAS/rocBLAS-5.1.3-r4.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE="${ROCM_REQUIRED_USE}" RESTRICT="!test? ( test )" BDEPEND=" - dev-util/rocm-cmake:${SLOT} + dev-util/rocm-cmake dev-util/Tensile:${SLOT} "
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/, sci-libs/rocRAND/, sci-libs/rocRAND/files/
commit: d5326b32678303ec9ece262931f0b0e5588d4fc6 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 02:21:44 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5326b32 sci-libs/rocRAND: bump to 5.6.0 and split out hipRAND. Signed-off-by: Benda Xu gentoo.org> sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild | 1 + sci-libs/rocRAND/Manifest | 1 + .../rocRAND/files/rocRAND-5.1.3_no-symlink.patch | 38 ++ .../rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch | 33 .../rocRAND/files/rocRAND-5.4.2_stdint-gcc13.patch | 59 ++ sci-libs/rocRAND/rocRAND-5.1.3.ebuild | 8 +-- .../{rocRAND-5.1.3.ebuild => rocRAND-5.6.0.ebuild} | 29 +++ 7 files changed, 144 insertions(+), 25 deletions(-) diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index 00c17e869d2e..8d4bed88c3a0 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -108,6 +108,7 @@ src_configure() { -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -Wno-dev -DCMAKE_INSTALL_INCLUDEDIR="include/rocfft/" + -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) -DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF) -DPYTHON3_EXE=${EPYTHON} diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest index 0016770f25d1..e49a7db31d6a 100644 --- a/sci-libs/rocRAND/Manifest +++ b/sci-libs/rocRAND/Manifest @@ -1,2 +1,3 @@ DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85 DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28 +DIST rocRAND-5.6.0.tar.gz 23189913 BLAKE2B 2418a90c323f483d1f92630df7134bc060b9052f580259924e79680a7ec37857574973dda69dc3c28fdd5b88a5fc1d29757ed637fcde0730c53b9a5f09668aba SHA512 cccd26a6b80a7705644803a85dad3a43de3f4e2f73f964f2b5aa410f71d3782b68d6cc1ad60b7f7be5193a94098ed3fa25cad30c3acbc141522cdd738d3328a5 diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch new file mode 100644 index ..e0a4b8d66ae1 --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_no-symlink.patch @@ -0,0 +1,38 @@ +commit 3b24ff660f83e18cadd3da272f182aaf8f98a755 +Author: Liam Wrubleski +Date: Mon Jan 24 13:49:52 2022 -0700 + +Revert symlinks + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 17a8c4c..89322d8 100644 +--- a/library/CMakeLists.txt b/library/CMakeLists.txt +@@ -60,27 +60,6 @@ rocm_install( + "${CMAKE_BINARY_DIR}/library/include" + ) + +-# Create symlinks +-if(WIN32) +-set(SYMLINK_COMMAND "file(COPY \${SRC} DESTINATION \${DEST_DIR})" ) +-else() +-set(SYMLINK_COMMAND "execute_process(COMMAND ln -sf \${SRC_REL} \${DEST})" ) +-endif() +-set(INSTALL_SYMLINK_COMMAND " +-set(SRC_DIR \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/include/rocrand) +-file(GLOB_RECURSE FILES RELATIVE \${SRC_DIR} \${SRC_DIR}/*) +-foreach(FILE \${FILES}) +-set(SRC \${SRC_DIR}/\${FILE}) +-set(DEST \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/rocrand/include/\${FILE}) +-get_filename_component(DEST_DIR \${DEST} DIRECTORY) +-file(MAKE_DIRECTORY \${DEST_DIR}) +-file(RELATIVE_PATH SRC_REL \${DEST_DIR} \${SRC}) +-message(STATUS \"symlink: \${SRC_REL} -> \${DEST}\") +-${SYMLINK_COMMAND} +-endforeach() +-") +-rocm_install(CODE "${INSTALL_SYMLINK_COMMAND}") +- + set(FORTRAN_SRCS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/rocrand/src/fortran") + configure_file( + src/rocrand-fortran-config.cmake.in diff --git a/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch new file mode 100644 index ..e80155f24da7 --- /dev/null +++ b/sci-libs/rocRAND/files/rocRAND-5.1.3_stdint-gcc13.patch @@ -0,0 +1,33 @@ +commit d79e778080766cf359d6658367e1c7ce0668daa4 +Author: Benda Xu +Date: Sat Jul 29 23:03:22 2023 +0800 + +sobol*_direction_vector_generator.cpp: include stdint.h for uint*_t + +Reference: https://gcc.gnu.org/gcc-13/porting_to.html +Signed-off-by: Benda Xu + +diff --git a/to
[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-cmake/
commit: 483694a8aaec6a222930e0070a583df1a8ecc4fe Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 03:16:10 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=483694a8 dev-util/rocm-cmake: drop 5.1.3, 5.3.3, Version >=5.4 of rocm-cmake plays well with Gentoo baselayout. Closes: https://bugs.gentoo.org/842366 Closes: https://bugs.gentoo.org/911400 Signed-off-by: Benda Xu gentoo.org> dev-util/rocm-cmake/Manifest| 2 -- dev-util/rocm-cmake/metadata.xml| 4 dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild | 31 - dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild | 31 - dev-util/rocm-cmake/rocm-cmake-.ebuild | 26 5 files changed, 4 insertions(+), 90 deletions(-) diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest index b5270672249d..056da6da31f1 100644 --- a/dev-util/rocm-cmake/Manifest +++ b/dev-util/rocm-cmake/Manifest @@ -1,3 +1 @@ -DIST rocm-cmake-5.1.3.tar.gz 39781 BLAKE2B 9ffe9ce6390889b651ffbb8019dc8f0274f8aa3ac7cf14da05f828ab952c575ff34e120f0cef3b3fd46bff208f47a3d293feff2c77a1104e942c5d9f4303f61c SHA512 31dfbfd822a9b6f817ef459df171e4a2ba16556d00ad8b3b5be3ebebffe03cbbd815d394cc6452509e47424a3cac50e523e31923b2b9c48d586163ead2338c74 -DIST rocm-cmake-5.3.3.tar.gz 45846 BLAKE2B d2560c28505b43bba242e02c79faebef6f9a87b6175825c1fe9c98f1a55804286a3d417f7eb325b0d56ffc9b081617046ba212fcb399c788cc41479da508d5c9 SHA512 0d2f06eb68fec297db0001529bf0780bec3f25a7e915f30713736068075bf13445faea3f47c811002cd2fdf0cab4baefd69420497391e27bee466744eafd46ce DIST rocm-cmake-5.4.3.tar.gz 46215 BLAKE2B ecdf93829ae77c1046157e4c8f219b74ebd30798e11be5fd270fe8dd568cbe5bbf25abdafbe18b0dcb185d97ca535a9aa2a1dfb7d973d17f167776b120f553d3 SHA512 fe039ea5bcab142c8cd3723aa570253f13f03fe5c500b0828275cc246a034ed52b9b7a47994e4caf72ae0402acf4e73e80b28224cc7874d85f94fd8e0e42947c diff --git a/dev-util/rocm-cmake/metadata.xml b/dev-util/rocm-cmake/metadata.xml index 35af674e4e15..e13f2f7b5728 100644 --- a/dev-util/rocm-cmake/metadata.xml +++ b/dev-util/rocm-cmake/metadata.xml @@ -1,6 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> + +s...@gentoo.org +Gentoo Science Project + candr...@gentoo.org Craig Andrews diff --git a/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild b/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild deleted file mode 100644 index ac9cb2351f34.. --- a/dev-util/rocm-cmake/rocm-cmake-5.1.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == * ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"; - inherit git-r3 -else - SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm-cmake-rocm-${PV}" -fi - -DESCRIPTION="Radeon Open Compute CMake Modules" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.2-license.patch -) - -src_prepare() { - sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \ - -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die - cmake_src_prepare -} diff --git a/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild b/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild deleted file mode 100644 index ac9cb2351f34.. --- a/dev-util/rocm-cmake/rocm-cmake-5.3.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -if [[ ${PV} == * ]] ; then - EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm-cmake/"; - inherit git-r3 -else - SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/rocm-cmake-rocm-${PV}" -fi - -DESCRIPTION="Radeon Open Compute CMake Modules" -HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"; -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-5.0.2-license.patch -) - -src_prepare() { - sed -e "/ROCM_INSTALL_LIBDIR/s:lib:$(get_libdir):" \ - -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die - cmake_src_prepare -} diff --git a/dev-util/rocm-cmake/rocm-cmake-.ebuild b/dev-util/
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipRAND/
commit: 9edc7b68ee8a0e1f2e6e18f4675e97e5f257dc7f Author: Benda Xu gentoo org> AuthorDate: Sun Jul 30 03:10:20 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9edc7b68 sci-libs/hipRAND: new package, add 5.6.0 Signed-off-by: Benda Xu gentoo.org> sci-libs/hipRAND/Manifest | 1 + sci-libs/hipRAND/hipRAND-5.6.0.ebuild | 36 +++ sci-libs/hipRAND/metadata.xml | 15 +++ 3 files changed, 52 insertions(+) diff --git a/sci-libs/hipRAND/Manifest b/sci-libs/hipRAND/Manifest new file mode 100644 index ..bdb2c56b0452 --- /dev/null +++ b/sci-libs/hipRAND/Manifest @@ -0,0 +1 @@ +DIST hipFFT-rocm-5.6.0.tar.gz 477597 BLAKE2B fdc88ac7076ab6b31ba794f9274881323fba32295bab5b90e38d8c8f336e0255b7d20dcba6e334b7bacd8b67eaac8a3ac6e11e3d490e7c95a973d16c9598922f SHA512 47d0cca92b458f8ef682b3c15fe4ccc5201370b1458e541080dc2150e98256962b78806c20b26d789b232d420eb305639fa50180e379ba123851d35d24d40cb2 diff --git a/sci-libs/hipRAND/hipRAND-5.6.0.ebuild b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild new file mode 100644 index ..d0bd5ace71e4 --- /dev/null +++ b/sci-libs/hipRAND/hipRAND-5.6.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm + +DESCRIPTION="CU / ROCM agnostic hip RAND implementation" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipRAND"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipRAND/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RESTRICT="test" + +RDEPEND="dev-util/hip + sci-libs/rocRAND:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}/hipRAND-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DAMDGPU_TARGETS="$(get_amdgpu_flags)" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +} diff --git a/sci-libs/hipRAND/metadata.xml b/sci-libs/hipRAND/metadata.xml new file mode 100644 index ..27c8916b67d4 --- /dev/null +++ b/sci-libs/hipRAND/metadata.xml @@ -0,0 +1,15 @@ + +https://www.gentoo.org/dtd/metadata.dtd";> + + +s...@gentoo.org +Gentoo Science Project + + +xgreenlandfor...@gmail.com +Yiyang Wu + + +ROCmSoftwarePlatform/hipRAND + +
[gentoo-commits] repo/gentoo:master commit in: dev-util/rocm-smi/
commit: 3c56e197e0e103859570e056cde29bf0af93701a Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 07:23:21 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c56e197 dev-util/rocm-smi: enable py3.11 Closes: https://bugs.gentoo.org/906131 Suggested-by: e-mmh caramail.fr> Signed-off-by: Benda Xu gentoo.org> dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild index f2b4fc660707..71783873843a 100644 --- a/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild +++ b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-r1
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
commit: 347288d94323b0bfe2d9eab31b3143556dd5ebec Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 07:13:00 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=347288d9 sci-libs/rocFFT: remove versioned dependence on rocm-cmake. enable py3.11 Closes: https://bugs.gentoo.org/897226 Suggested-by: e-mmh caramail.fr> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocFFT/{rocFFT-5.1.3.ebuild => rocFFT-5.1.3-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild similarity index 98% rename from sci-libs/rocFFT/rocFFT-5.1.3.ebuild rename to sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index af9d3e7fad22..811f27fa261b 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) ROCM_VERSION=${PV} inherit cmake check-reqs edo multiprocessing python-r1 rocm @@ -36,7 +36,7 @@ BDEPEND=" test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 - dev-util/rocm-cmake:${SLOT} + dev-util/rocm-cmake " CHECKREQS_DISK_BUILD="7G"
[gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/
commit: 04c4db705d35f2f540a797df8763444315e4e156 Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 07:19:07 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c4db70 dev-util/roctracer: enable py3.11 Closes: https://github.com/gentoo/gentoo/pull/30987 Closes: https://bugs.gentoo.org/906132 Suggested-by: e-mmh caramail.fr> Signed-off-by: Benda Xu gentoo.org> dev-util/roctracer/roctracer-5.1.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild index f70bf95675a4..22befb0d4430 100644 --- a/dev-util/roctracer/roctracer-5.1.3-r1.ebuild +++ b/dev-util/roctracer/roctracer-5.1.3-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake prefix python-any-r1
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocFFT/
commit: 4949344c990b09713c1f8a3895c902916170fed0 Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 07:27:48 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4949344c sci-libs/rocFFT: normalize the header directory. Closes: https://bugs.gentoo.org/900727 Suggested-by: Jan-Matthias Braun gmx.net> Signed-off-by: Benda Xu gentoo.org> sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild index 811f27fa261b..00c17e869d2e 100644 --- a/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild +++ b/sci-libs/rocFFT/rocFFT-5.1.3-r1.ebuild @@ -80,7 +80,7 @@ pkg_setup() { src_prepare() { sed -e "s/PREFIX rocfft//" \ -e "/rocm_install_symlink_subdir/d" \ - -e "/
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipFFT/files/, sci-libs/hipFFT/
commit: 20ba0493ccc5cd9ffd83ebc27f03879024717871 Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 07:07:22 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 30 04:35:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ba0493 sci-libs/hipFFT: do not use cmake module to find HIP. Loosen the versioned dependence on dev-util/hip. Reference: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/66 Signed-off-by: Benda Xu gentoo.org> .../hipFFT/files/hipFFT-5.1.3_hip-config.patch | 90 ++ ...{hipFFT-5.1.3.ebuild => hipFFT-5.1.3-r1.ebuild} | 16 ++-- 2 files changed, 95 insertions(+), 11 deletions(-) diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch new file mode 100644 index ..2f63a0f8e6f7 --- /dev/null +++ b/sci-libs/hipFFT/files/hipFFT-5.1.3_hip-config.patch @@ -0,0 +1,90 @@ +reverts the following commit. + +Upstream: https://github.com/ROCmSoftwarePlatform/hipFFT/pull/67 + +commit 41491c9a70f808ed74690a538ca7bd25ff1ae1ca +Author: Steve Leung +Date: Wed Sep 1 11:25:26 2021 -0600 + +cmake: use HIP CONFIG on Windows + +diff --git a/clients/rider/CMakeLists.txt b/clients/rider/CMakeLists.txt +index de1fc7d..8b88103 100644 +--- b/clients/rider/CMakeLists.txt a/clients/rider/CMakeLists.txt +@@ -43,11 +43,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +-if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +-else() +- find_package( HIP MODULE REQUIRED ) +-endif() ++find_package( HIP REQUIRED ) + target_link_libraries( hipfft-rider PRIVATE hip::host ) + else() + +diff --git a/clients/samples/CMakeLists.txt b/clients/samples/CMakeLists.txt +index 5a882c6..37162ab 100644 +--- b/clients/samples/CMakeLists.txt a/clients/samples/CMakeLists.txt +@@ -48,11 +48,7 @@ + target_link_libraries( ${sample} PRIVATE hip::hipfft ) + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) +-if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +-else() +- find_package( HIP MODULE REQUIRED ) +-endif() ++find_package( HIP REQUIRED ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) + target_link_libraries( ${sample} PRIVATE hip::host ) + else() +diff --git a/clients/tests/CMakeLists.txt b/clients/tests/CMakeLists.txt +index 2b965e2..0442a79 100644 +--- b/clients/tests/CMakeLists.txt a/clients/tests/CMakeLists.txt +@@ -81,11 +81,7 @@ + + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +-if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +-else() +- find_package( HIP MODULE REQUIRED ) +-endif() ++find_package( HIP REQUIRED ) + target_link_libraries( hipfft-test PRIVATE hip::host ) + else() + target_compile_definitions( hipfft-test PRIVATE __HIP_PLATFORM_NVIDIA__) +diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake +index 022e3e4..0c8b3f8 100644 +--- b/cmake/dependencies.cmake a/cmake/dependencies.cmake +@@ -27,22 +27,14 @@ + # HIP + if( NOT CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" ) + if( NOT BUILD_WITH_LIB STREQUAL "CUDA" ) +-if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +-else() +- find_package( HIP MODULE REQUIRED ) +-endif() ++find_package( HIP REQUIRED ) + list( APPEND HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include" ) + endif() + else() + if( BUILD_WITH_LIB STREQUAL "CUDA" ) + set(HIP_INCLUDE_DIRS "${HIP_ROOT_DIR}/include") + else() +-if( WIN32 ) +- find_package( HIP CONFIG REQUIRED ) +-else() +- find_package( HIP MODULE REQUIRED ) +-endif() ++find_package( HIP REQUIRED ) + endif() + endif() + diff --git a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild similarity index 73% rename from sci-libs/hipFFT/hipFFT-5.1.3.ebuild rename to sci-libs/hipFFT/hipFFT-5.1.3-r1.ebuild index 216d15841546..79eb8052324f 100644 --- a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild +++ b/sci-libs/hipFFT/hipFFT-5.1.3-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 @@ -18,7 +18,7 @@ SLOT="0/$(ver_cut 1-2)" RESTRICT="test" -RDEPEND="dev-util/hip:${SLOT} +RDEPEND="dev-util/hip sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]" DEPEND="${RDEPEND}" BDEPEND="" @@ -26,25 +26,19 @@ BDEPEND="" S="${WORKDIR}/hipFFT-rocm-${PV}" PATCHES=( + "${FILESDIR}/${PN}-5.1.3_hip-config.patch" "${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch" "${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch&q
[gentoo-commits] repo/gentoo:master commit in: dev-util/roctracer/
commit: b61b623c63f19b2cdc6f3c1b40a21a5dc086a411 Author: Benda Xu gentoo org> AuthorDate: Fri Jul 28 14:08:00 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Jul 29 02:54:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61b623c dev-util/roctracer: break the tight version coupling. roctracer does not require specific versions of hip and rocr-runtime. Signed-off-by: Benda Xu gentoo.org> .../roctracer/{roctracer-5.3.3.ebuild => roctracer-5.3.3-r1.ebuild} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/roctracer/roctracer-5.3.3.ebuild b/dev-util/roctracer/roctracer-5.3.3-r1.ebuild similarity index 96% rename from dev-util/roctracer/roctracer-5.3.3.ebuild rename to dev-util/roctracer/roctracer-5.3.3-r1.ebuild index 23e3d7e714e7..54def42e46a6 100644 --- a/dev-util/roctracer/roctracer-5.3.3.ebuild +++ b/dev-util/roctracer/roctracer-5.3.3-r1.ebuild @@ -20,8 +20,8 @@ KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/rocr-runtime:${SLOT} - dev-util/hip:${SLOT}" +RDEPEND="dev-libs/rocr-runtime + dev-util/hip" DEPEND="${RDEPEND}" BDEPEND=" $(python_gen_any_dep '
[gentoo-commits] repo/gentoo:master commit in: sci-libs/hipBLAS/
commit: c2b4cbc54fa45e1145ecc7d91d5545a90391de62 Author: Benda Xu gentoo org> AuthorDate: Fri Jul 28 14:39:31 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Jul 29 02:54:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2b4cbc5 sci-libs/hipBLAS: add 5.4.2 to stick to FHS header locations. Bug: https://bugs.gentoo.org/911400 Signed-off-by: Benda Xu gentoo.org> sci-libs/hipBLAS/Manifest | 1 + sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild | 35 +++ 2 files changed, 36 insertions(+) diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest index 99698f6b1488..6dcf1b1dd925 100644 --- a/sci-libs/hipBLAS/Manifest +++ b/sci-libs/hipBLAS/Manifest @@ -1 +1,2 @@ DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707 +DIST hipBLAS-5.4.2.tar.gz 930814 BLAKE2B 702df09010b50652feb8f7e5741b27117aa58fc3e3b1b5f89f5043073a47581d1710f0831740453e84f7594b1b305e95d2681709898e5231c3eee2e8207404a3 SHA512 a941350d2d25022cf5142f68559242a048136bdd048dafcd544a0241cf3b510062273163f7a0eecc55f17ec47a1063d84d6102ca766ba7cde9b704eee5c44cd8 diff --git a/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild b/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild new file mode 100644 index ..b61f8865b925 --- /dev/null +++ b/sci-libs/hipBLAS/hipBLAS-5.4.2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ROCM_VERSION=${PV} + +inherit cmake rocm +DESCRIPTION="ROCm BLAS marshalling library" +HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS"; +SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" +REQUIRED_USE="${ROCM_REQUIRED_USE}" + +LICENSE="MIT" +KEYWORDS="~amd64" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="dev-util/hip + sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] + sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]" +DEPEND="${RDEPEND}" +BDEPEND="" + +S="${WORKDIR}/hipBLAS-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DBUILD_CLIENTS_TESTS=OFF # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here + -DBUILD_CLIENTS_BENCHMARKS=OFF + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF + ) + + CXX=hipcc cmake_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocSOLVER/
commit: 781f83d7790d50472c14e9baee71d89f83679dfc Author: Benda Xu gentoo org> AuthorDate: Sat Jul 29 02:36:44 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Jul 29 02:54:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781f83d7 sci-libs/rocSOLVER: disable all the non-FHS symlinks. Bug: https://bugs.gentoo.org/911400 Signed-off-by: Benda Xu gentoo.org> sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild index dce60e072b37..8088b8523a68 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild @@ -33,14 +33,6 @@ RESTRICT="!test? ( test )" S=${WORKDIR}/${PN}-rocm-${PV} -src_prepare() { - sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i library/src/CMakeLists.txt - sed -e "s:\$:\$:" -i library/src/CMakeLists.txt - sed -e "s:rocm_install_symlink_subdir( rocsolver ):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt - - cmake_src_prepare -} - src_configure() { # avoid sandbox violation addpredict /dev/kfd @@ -50,7 +42,8 @@ src_configure() { -DCMAKE_SKIP_RPATH=On -DAMDGPU_TARGETS="$(get_amdgpu_flags)" -Wno-dev - -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver" + -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF + -DROCM_SYMLINK_LIBS=OFF -DBUILD_CLIENTS_SAMPLES=NO -DBUILD_CLIENTS_TESTS=$(usex test ON OFF) -DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
[gentoo-commits] repo/gentoo:master commit in: sci-libs/rocSOLVER/files/, sci-libs/rocSOLVER/
commit: 640e352f19bbc428ce82f043b15f6677dfdc26ea Author: Benda Xu gentoo org> AuthorDate: Fri Jul 28 14:34:37 2023 + Commit: Benda XU gentoo org> CommitDate: Sat Jul 29 02:54:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640e352f sci-libs/rocSOLVER: non-versioned dependency on libfmt. Version bump to 5.4.2, in line with rocBLAS. Bug: https://bugs.gentoo.org/908651 Signed-off-by: Benda Xu gentoo.org> sci-libs/rocSOLVER/Manifest| 1 + .../rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch | 34 ++ ...LVER-5.1.3.ebuild => rocSOLVER-5.1.3-r1.ebuild} | 6 ++-- ...cSOLVER-5.1.3.ebuild => rocSOLVER-5.4.2.ebuild} | 11 +++ 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest index 24a5bc028509..35de2a25db03 100644 --- a/sci-libs/rocSOLVER/Manifest +++ b/sci-libs/rocSOLVER/Manifest @@ -1 +1,2 @@ DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753 +DIST rocSOLVER-5.4.2.tar.gz 674866 BLAKE2B 0628353d567da92e3f7c3a11e19859329f3ea916184d554ee9c7172084ee4698c93408f397f493331d4dc47d833c56ead41bb4445081ba9ac73809ca0478770c SHA512 b3a60c65a18c3864568e1e0b1524850eb1b322f6005cf8a2763c9b457e43e03c8ce74be1d13f3cc3adef1f6ac979f54fb903831f4a60447a9a915a40dcbe5ff6 diff --git a/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch new file mode 100644 index ..3e0ef897b71e --- /dev/null +++ b/sci-libs/rocSOLVER/files/rocSOLVER-5.4.2-libfmt9.patch @@ -0,0 +1,34 @@ +commit bafa8f30b6f83d5f02bb65bb47b2943a0cb3c290 +Author: Cory Bloor +Date: Wed Jan 25 14:52:35 2023 -0700 + +Fix use of fmt 9.0 and later in logging test (#515) + +The implicitly defined formatter that rocsolver was using for +std::filesystem::path has been removed from fmt 9.0 and later. + +This change doesn't actually fix compatibility with the official +fmt 9.0 or 9.1 releases, because those releases are still +incompatible with HIP. However, the change is sufficient for using +rocsolver with fmt@9 from Spack (because the fix has been backported). + +diff --git a/clients/gtest/logging_gtest.cpp b/clients/gtest/logging_gtest.cpp +index e4f594a..da7ae04 100644 +--- a/clients/gtest/logging_gtest.cpp b/clients/gtest/logging_gtest.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2022 Advanced Micro Devices, Inc. ++ * Copyright (c) 2022-2023 Advanced Micro Devices, Inc. + * */ + + #include +@@ -49,7 +49,7 @@ protected: + { + if(HasFailure() && std::getenv("ROCSOLVER_TEST_DEBUG")) + fmt::print(stderr, "ROCSOLVER_TEST_DEBUG is set so {} was not removed.\n", +- log_filepath); ++ log_filepath.string()); + else + EXPECT_TRUE(fs::remove(log_filepath)); + } diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild similarity index 94% copy from sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild copy to sci-libs/rocSOLVER/rocSOLVER-5.1.3-r1.ebuild index e2db9aba2a19..11cedfb8deff 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3-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 @@ -19,8 +19,8 @@ IUSE="test benchmark" REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip - sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}] - =dev-libs/libfmt-8* + sci-libs/rocBLAS[${ROCM_USEDEP}] + dev-libs/libfmt benchmark? ( virtual/blas )" DEPEND="${RDEPEND}" BDEPEND="test? ( dev-cpp/gtest diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild similarity index 89% rename from sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild rename to sci-libs/rocSOLVER/rocSOLVER-5.4.2.ebuild index e2db9aba2a19..dce60e072b37 100644 --- a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild +++ b/sci-libs/rocSOLVER/rocSOLVER-5.4.2.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 @@ -19,18 +19,15 @@ IUSE="test benchmark" REQUIRED_USE="${ROCM_REQUIRED_USE}" RDEPEND="dev-util/hip - sci-libs
[gentoo-commits] repo/gentoo:master commit in: dev-python/lxml/
commit: 9c14fa43f51ec07efbf3d13b0a7c694506e683ea Author: Benda Xu gentoo org> AuthorDate: Wed Jul 26 03:09:45 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Jul 26 03:11:18 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c14fa43 dev-python/lxml: keyword 4.9.3 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/lxml/lxml-4.9.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/lxml/lxml-4.9.3.ebuild b/dev-python/lxml/lxml-4.9.3.ebuild index 207b59bada90..0d937323afb9 100644 --- a/dev-python/lxml/lxml-4.9.3.ebuild +++ b/dev-python/lxml/lxml-4.9.3.ebuild @@ -23,7 +23,7 @@ S=${WORKDIR}/lxml-${P} LICENSE="BSD ElementTree GPL-2 PSF-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 ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc examples +threads test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libatomic_ops/, dev-scheme/guile/, dev-libs/boehm-gc/
commit: 69d84a0e72ec63a22fd6cc8e70b79a1cd5af913c Author: Benda Xu gentoo org> AuthorDate: Tue Jul 25 17:33:15 2023 + Commit: Benda XU gentoo org> CommitDate: Tue Jul 25 17:41:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d84a0e dev-scheme/guile: keyword it and its dependencies for ~arm64-macos. dev-libs/boehm-gc: keyword 8.2.4 for ~arm64-macos dev-libs/libatomic_ops: keyword 7.8.0 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild | 2 +- dev-libs/libatomic_ops/libatomic_ops-7.8.0.ebuild | 2 +- dev-scheme/guile/guile-3.0.9.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild index 38f972105da2..8d26ca14927c 100644 --- a/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild +++ b/dev-libs/boehm-gc/boehm-gc-8.2.4.ebuild @@ -17,7 +17,7 @@ LICENSE="boehm-gc" # We've been using subslot 0 for these instead of "1.1". SLOT="0" # Upstream marked this version as "Pre-release" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cxx +large static-libs +threads" RDEPEND=">=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]" diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.8.0.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.8.0.ebuild index 07811d59b82e..24db3ba02174 100644 --- a/dev-libs/libatomic_ops/libatomic_ops-7.8.0.ebuild +++ b/dev-libs/libatomic_ops/libatomic_ops-7.8.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ivmai/libatomic_ops/releases/download/v${PV}/${P}.ta # See doc/LICENSING.txt LICENSE="MIT boehm-gc GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" multilib_src_configure() { ECONF_SOURCE="${S}" econf --enable-shared diff --git a/dev-scheme/guile/guile-3.0.9.ebuild b/dev-scheme/guile/guile-3.0.9.ebuild index 5d056fe7b783..46f8d49b2e03 100644 --- a/dev-scheme/guile/guile-3.0.9.ebuild +++ b/dev-scheme/guile/guile-3.0.9.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/guile/${P}.tar.xz" LICENSE="LGPL-3+" SLOT="12/3.0-1" # libguile-2.2.so.1 => 2.2-1 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="debug debug-malloc +deprecated +jit +networking +nls +regex +threads" # upstream recommended +networking +nls REQUIRED_USE="regex" # workaround for bug #596322
[gentoo-commits] repo/gentoo:master commit in: app-misc/neofetch/
commit: 3e9e7845cb0eb03ec057e43e9e3cf66e966cbadb Author: Benda Xu gentoo org> AuthorDate: Mon Jul 24 04:05:40 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 24 04:08:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9e7845 app-misc/neofetch: keyword 7.1.0-r1 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> app-misc/neofetch/neofetch-7.1.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild index 99eed34b3db4..95a45676825c 100644 --- a/app-misc/neofetch/neofetch-7.1.0-r1.ebuild +++ b/app-misc/neofetch/neofetch-7.1.0-r1.ebuild @@ -7,7 +7,7 @@ inherit optfeature prefix if [[ ${PV} != ** ]]; then SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"; - KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos" else inherit git-r3 EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git";
[gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/
commit: d6eda06950e37ab4ab47bc859b8dabb63b5837e2 Author: Benda Xu gentoo org> AuthorDate: Wed Jul 19 09:12:19 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Jul 19 09:17:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6eda069 dev-python/meson-python: remove IUSE. kernel_* needs not to be in IUSE. Signed-off-by: Benda Xu gentoo.org> dev-python/meson-python/meson-python-0.13.2-r1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild index 9af08d653ec5..623a5e9d23e8 100644 --- a/dev-python/meson-python/meson-python-0.13.2-r1.ebuild +++ b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild @@ -21,7 +21,6 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" -IUSE="kernel_Darwin" RDEPEND=" >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-python/scipy/
commit: 42b5eec8280378d51433a675438eca2bb0331813 Author: Benda Xu gentoo org> AuthorDate: Wed Jul 19 09:10:51 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Jul 19 09:17:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b5eec8 dev-python/scipy: do not use patchelf on macOS. macOS uses Mach-O binary format, not ELF. Signed-off-by: Benda Xu gentoo.org> dev-python/scipy/scipy-1.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-python/scipy/scipy-1.11.1.ebuild b/dev-python/scipy/scipy-1.11.1.ebuild index 9601fa77d33f..8e807feb7b5b 100644 --- a/dev-python/scipy/scipy-1.11.1.ebuild +++ b/dev-python/scipy/scipy-1.11.1.ebuild @@ -64,7 +64,7 @@ BDEPEND=" >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] >=dev-python/pybind11-2.10.4[${PYTHON_USEDEP}] >=dev-util/meson-1.1.0 - dev-util/patchelf + !kernel_Darwin? ( dev-util/patchelf ) virtual/pkgconfig doc? ( app-arch/unzip ) fortran? ( dev-python/pythran[${PYTHON_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/
commit: 391d1405b34df659dc01fc6ecb4f8522bc09d39a Author: Benda Xu gentoo org> AuthorDate: Wed Jul 19 09:17:03 2023 + Commit: Benda XU gentoo org> CommitDate: Wed Jul 19 09:17:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=391d1405 profiles/prefix/darwin: mask patchelf. It is useless under Darwin, unless cross-compiling. Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask index 47b1d8ab9f58..732fdb8edf24 100644 --- a/profiles/prefix/darwin/package.mask +++ b/profiles/prefix/darwin/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-07-19) +# Darwin does not use ELF. +dev-util/patchelf + # Fabian Groffen (2014-01-14) # util-linux has no business on Darwin systems sys-apps/util-linux
[gentoo-commits] repo/gentoo:master commit in: sys-libs/timezone-data/
commit: dd5cd873fb87a5f86dd72ec862d27c6aabd971d9 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 09:41:00 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 09:42:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5cd873 sys-libs/timezone-data: keyword 2023c for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> sys-libs/timezone-data/timezone-data-2023c.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-libs/timezone-data/timezone-data-2023c.ebuild b/sys-libs/timezone-data/timezone-data-2023c.ebuild index f5e201286221..30eabb58071a 100644 --- a/sys-libs/timezone-data/timezone-data-2023c.ebuild +++ b/sys-libs/timezone-data/timezone-data-2023c.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${MY_DATA_VER LICENSE="BSD public-domain" 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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="nls leaps-timezone zic-slim" DEPEND="nls? ( virtual/libintl )"
[gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/
commit: 8f3934b5f99e5d861989e95d58105a5ceb83cfc9 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 03:38:28 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 03:42:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f3934b5 dev-python/meson-python: donot depend on dev-util/patchelf for Darwin. kernel_Darwin uses Mach-O binary formats. No ELF patch is needed. Bug: https://bugs.gentoo.org/910061 Signed-off-by: Benda Xu gentoo.org> .../{meson-python-0.13.2.ebuild => meson-python-0.13.2-r1.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-python/meson-python/meson-python-0.13.2.ebuild b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild similarity index 96% rename from dev-python/meson-python/meson-python-0.13.2.ebuild rename to dev-python/meson-python/meson-python-0.13.2-r1.ebuild index 37341a7784da..9af08d653ec5 100644 --- a/dev-python/meson-python/meson-python-0.13.2.ebuild +++ b/dev-python/meson-python/meson-python-0.13.2-r1.ebuild @@ -21,11 +21,12 @@ SRC_URI=" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" +IUSE="kernel_Darwin" RDEPEND=" >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}] >=dev-util/meson-0.63.0[${PYTHON_USEDEP}] - dev-util/patchelf + !kernel_Darwin? ( dev-util/patchelf ) $(python_gen_cond_dep ' >=dev-python/tomli-1.0.0[${PYTHON_USEDEP}] ' 3.9 3.10)
[gentoo-commits] repo/gentoo:master commit in: dev-lang/swig/, virtual/fortran/, dev-util/b2/, sci-libs/lapack/, virtual/blas/, ...
commit: 3cde12b57447df93d17f03cd48b4a38f0da17ec6 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 03:32:50 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 03:42:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cde12b5 dev-lang/swig: keyword dev-python/numpy[lapack] dependencies. keyword for ~arm64-macos dev-util/b2: keyword 4.10.1 for ~arm64-macos virtual/blas: keyword 3.8 for ~arm64-macos virtual/cblas: keyword 3.8 for ~arm64-macos virtual/lapack: keyword 3.10 for ~arm64-macos sci-libs/lapack: keyword 3.11 for ~arm64-macos virtual/fortran: keyword 0-r1 for ~arm64-macos Signed-off-by: Benda Xu gentoo.org> dev-lang/swig/swig-4.1.1-r1.ebuild | 2 +- dev-util/b2/b2-4.10.1.ebuild| 2 +- sci-libs/lapack/lapack-3.11.ebuild | 2 +- virtual/blas/blas-3.8.ebuild| 2 +- virtual/cblas/cblas-3.8.ebuild | 2 +- virtual/fortran/fortran-0-r1.ebuild | 4 ++-- virtual/lapack/lapack-3.10.ebuild | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-lang/swig/swig-4.1.1-r1.ebuild b/dev-lang/swig/swig-4.1.1-r1.ebuild index 653722a31acb..77019af7643b 100644 --- a/dev-lang/swig/swig-4.1.1-r1.ebuild +++ b/dev-lang/swig/swig-4.1.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-3+ BSD BSD-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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="ccache doc pcre test" RESTRICT="!test? ( test )" diff --git a/dev-util/b2/b2-4.10.1.ebuild b/dev-util/b2/b2-4.10.1.ebuild index 84055fa002bc..36fbbb87e3ab 100644 --- a/dev-util/b2/b2-4.10.1.ebuild +++ b/dev-util/b2/b2-4.10.1.ebuild @@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src" LICENSE="Boost-1.0" 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 ~x64-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples" RESTRICT="test" diff --git a/sci-libs/lapack/lapack-3.11.ebuild b/sci-libs/lapack/lapack-3.11.ebuild index 07e3eb649f42..8d0bfc529500 100644 --- a/sci-libs/lapack/lapack-3.11.ebuild +++ b/sci-libs/lapack/lapack-3.11.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/Reference-LAPACK/lapack/archive/v${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" # TODO: static-libs 64bit-index IUSE="lapacke deprecated doc eselect-ldso test" RESTRICT="!test? ( test )" diff --git a/virtual/blas/blas-3.8.ebuild b/virtual/blas/blas-3.8.ebuild index 46ba39dc7be9..b97764a05237 100644 --- a/virtual/blas/blas-3.8.ebuild +++ b/virtual/blas/blas-3.8.ebuild @@ -5,7 +5,7 @@ EAPI="7" DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="eselect-ldso" RDEPEND=" diff --git a/virtual/cblas/cblas-3.8.ebuild b/virtual/cblas/cblas-3.8.ebuild index 4eadbb42e608..f7f2ebdfaa3d 100644 --- a/virtual/cblas/cblas-3.8.ebuild +++ b/virtual/cblas/cblas-3.8.ebuild @@ -5,7 +5,7 @@ EAPI="7" DESCRIPTION="Virtual for BLAS C implementation" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="eselect-ldso" RDEPEND=" diff --git a/virtual/fortran/fortran-0-r1.ebuild b/virtual/fortran/fortran-0-r1.ebuild index e3aa99622974..17ec847b58f2 100644 --- a/virtual/fortran/fortran-0-r1.ebuild +++ b/virtual/fortran/fortran-0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: 509c123c1d8c3567c4e070a0126dc19811d1931a Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 01:50:35 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:51:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509c123c p/p/darwin/macos: add reasonable USE defaults in the profile. Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.use | 12 1 file changed, 12 insertions(+) diff --git a/profiles/prefix/darwin/macos/package.use b/profiles/prefix/darwin/macos/package.use new file mode 100644 index ..f36adf8d3ddf --- /dev/null +++ b/profiles/prefix/darwin/macos/package.use @@ -0,0 +1,12 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Benda Xu (2023-07-17) +# scientific python related use flags. The Prefix/macos is widely +# used in scientific and HPC applications. Maintain some reasonable +# defaults in the profile. + +dev-python/numpy lapack +dev-python/pillow webp +virtual/imagemagick-tools tiff jpeg +media-gfx/imagemagick tiff jpeg
[gentoo-commits] repo/gentoo:master commit in: dev-python/fs/, media-libs/qhull/, dev-cpp/eigen/, dev-python/appdirs/, ...
commit: 5dfbd9a97d7948a55629311e9b31e1f330398690 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 00:05:02 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:17:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfbd9a9 virtual/imagemagick-tools: dependencies of dev-python/matploblib keyword 0-r1 for ~arm64-macos dev-cpp/eigen: keyword 3.4.0-r1 for ~arm64-macos, ~x64-macos dev-python/pyproject-metadata: keyword 0.7.1 for ~arm64-macos, ~x64-macos dev-python/appdirs: keyword 1.4.4-r3 for ~arm64-macos dev-python/fs: keyword 2.4.16 for ~arm64-macos, ~x64-macos dev-python/cppy: keyword 1.2.1-r1 for ~arm64-macos, ~x64-macos dev-python/olefile: keyword 0.46-r2 for ~arm64-macos, ~x64-macos media-libs/libwebp: keyword 1.3.1 for ~arm64-macos media-libs/qhull: keyword 2020.2-r3 for ~arm64-macos media-fonts/stix-fonts: keyword 2.11 for ~arm64-macos media-fonts/dejavu: keyword 2.37 for ~arm64-macos, ~x64-macos dev-python/pytz: keyword 2023.3-r1 for ~arm64-macos dev-python/pillow: keyword 10.0.0 for ~arm64-macos, ~x64-macos dev-python/kiwisolver: keyword 1.4.4-r1 for ~arm64-macos, ~x64-macos dev-python/fonttools: keyword 4.41.0 for ~arm64-macos dev-python/cycler: keyword 0.11.0-r1 for ~arm64-macos dev-python/contourpy: keyword 1.1.0 for ~arm64-macos, ~x64-macos Signed-off-by: Benda Xu gentoo.org> dev-cpp/eigen/eigen-3.4.0-r1.ebuild | 2 +- dev-python/appdirs/appdirs-1.4.4-r3.ebuild| 2 +- dev-python/contourpy/contourpy-1.1.0.ebuild | 2 +- dev-python/cppy/cppy-1.2.1-r1.ebuild | 2 +- dev-python/cycler/cycler-0.11.0-r1.ebuild | 2 +- dev-python/fonttools/fonttools-4.41.0.ebuild | 2 +- dev-python/fs/fs-2.4.16.ebuild| 2 +- dev-python/kiwisolver/kiwisolver-1.4.4-r1.ebuild | 2 +- dev-python/olefile/olefile-0.46-r2.ebuild | 2 +- dev-python/pillow/pillow-10.0.0.ebuild| 2 +- dev-python/pyproject-metadata/pyproject-metadata-0.7.1.ebuild | 2 +- dev-python/pytz/pytz-2023.3-r1.ebuild | 2 +- media-fonts/dejavu/dejavu-2.37.ebuild | 4 ++-- media-fonts/stix-fonts/stix-fonts-2.11.ebuild | 4 ++-- media-libs/libwebp/libwebp-1.3.1.ebuild | 2 +- media-libs/qhull/qhull-2020.2-r3.ebuild | 4 ++-- virtual/imagemagick-tools/imagemagick-tools-0-r1.ebuild | 4 ++-- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild index 3ff87e280b8f..d55a7a350a56 100644 --- a/dev-cpp/eigen/eigen-3.4.0-r1.ebuild +++ b/dev-cpp/eigen/eigen-3.4.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"; LICENSE="MPL-2.0" SLOT="3" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector # Tests failing again because of compiler issues diff --git a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild index 9338bb59e27f..bac28f7a310c 100644 --- a/dev-python/appdirs/appdirs-1.4.4-r3.ebuild +++ b/dev-python/appdirs/appdirs-1.4.4-r3.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" 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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" python_test() { "${EPYTHON}" test/test_api.py -v || die "Tests fail with ${EPYTHON}" diff --git a/dev-python/contourpy/contourpy-1.1.0.ebuild b/dev-python/contourpy/contourpy-1.1.0.ebuild index 53c3e265e1c5..4b49b594dc99 100644 --- a/dev-python/contourpy/contourpy-1.1.0.ebuild +++ b/dev-python/contourpy/contourpy-1.1.0.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~riscv ~x86 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/numpy-1.16[${PYTHON_USEDEP}] diff --git a/dev-python/cppy/cppy-1.2.1-r1.ebuild b/dev-python/cppy/cppy-1.2.1-r1.ebuild index c2bb39bf685d..7d88ad5c165b 100644 --- a/dev-python/cppy/cppy-1.2.1-r1.ebuild +++ b/dev-python/cppy/cppy-1.2.1-r1.eb
[gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/, dev-python/matplotlib/files/
commit: fd0d8fc9c944ed38be0f668286c9051c6a5e7cf9 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 00:05:56 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:17:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0d8fc9 dev-python/matplotlib: Do not build against Cocoa on macOS. keyword 3.7.2 for ~arm64-macos, ~x64-macos Signed-off-by: Benda Xu gentoo.org> .../files/matplotlib-3.7.2-macOS_no-Cocoa.patch | 21 + dev-python/matplotlib/matplotlib-3.7.2.ebuild | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dev-python/matplotlib/files/matplotlib-3.7.2-macOS_no-Cocoa.patch b/dev-python/matplotlib/files/matplotlib-3.7.2-macOS_no-Cocoa.patch new file mode 100644 index ..3f29134be621 --- /dev/null +++ b/dev-python/matplotlib/files/matplotlib-3.7.2-macOS_no-Cocoa.patch @@ -0,0 +1,21 @@ +Do not automatically build against Cocoa on macOS. + +At Prefix/macOS, we do not support the propietary Cocoa SDK. GUI +applications use X11. + +The patch is specific to our need and not forwarded upstream. + +Signed-off-by: Benda Xu + +Index: matplotlib-3.7.2/setup.py +=== +--- matplotlib-3.7.2.orig/setup.py matplotlib-3.7.2/setup.py +@@ -49,7 +49,6 @@ mpl_packages = [ + setupext.FreeType(), + setupext.Qhull(), + setupext.Tests(), +-setupext.BackendMacOSX(), + ] + + diff --git a/dev-python/matplotlib/matplotlib-3.7.2.ebuild b/dev-python/matplotlib/matplotlib-3.7.2.ebuild index 6bf2c0bcf481..213f165a0cc5 100644 --- a/dev-python/matplotlib/matplotlib-3.7.2.ebuild +++ b/dev-python/matplotlib/matplotlib-3.7.2.ebuild @@ -30,7 +30,7 @@ SRC_URI+=" # Fonts: BitstreamVera, OFL-1.1 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets" # internal copy of pycxx highly patched @@ -151,6 +151,7 @@ python_prepare_all() { local PATCHES=( "${FILESDIR}"/matplotlib-3.3.3-disable-lto.patch "${FILESDIR}"/matplotlib-3.7.1-test.patch + "${FILESDIR}"/matplotlib-3.7.2-macOS_no-Cocoa.patch ) sed \
[gentoo-commits] repo/gentoo:master commit in: sci-libs/amd/, sci-libs/suitesparseconfig/, sci-libs/gklib/, ...
commit: 89c20712071766b58c926c36abef37725d27f7f5 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 16 23:57:30 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:17:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c20712 dev-python/scipy: keyword it and its dependences. keyword 1.11.1 for ~arm64-macos, ~x64-macos dev-python/gast: keyword 0.5.3-r1 for ~arm64-macos, ~x64-macos dev-python/beniget: keyword 0.4.1-r1 for ~arm64-macos, ~x64-macos dev-python/pythran: keyword 0.13.1 for ~arm64-macos, ~x64-macos sci-libs/gklib: keyword 5.1.1_p20230327-r1 for ~arm64-macos, ~x64-macos sci-libs/metis: keyword 5.2.1-r2 for ~arm64-macos, ~x64-macos sci-libs/ccolamd: keyword 2.9.6 for ~arm64-macos, ~x64-macos sci-libs/camd: keyword 2.4.6-r1 for ~arm64-macos, ~x64-macos sci-libs/colamd: keyword 2.9.6 for ~arm64-macos, ~x64-macos sci-libs/cholmod: keyword 3.0.14 for ~arm64-macos, ~x64-macos sci-libs/suitesparseconfig: keyword 5.4.0 for ~arm64-macos, ~x64-macos sci-libs/amd: keyword 2.4.6-r1 for ~arm64-macos, ~x64-macos sci-libs/umfpack: keyword 5.7.9 for ~arm64-macos, ~x64-macos sci-libs/arpack: keyword 3.8.0 for ~arm64-macos, ~x64-macos dev-python/charset-normalizer: keyword 3.2.0 for ~arm64-macos, ~x64-macos dev-python/requests: keyword 2.31.0 for ~arm64-macos, ~x64-macos dev-python/pooch: keyword 1.7.0 for ~arm64-macos, ~x64-macos Signed-off-by: Benda Xu gentoo.org> dev-python/beniget/beniget-0.4.1-r1.ebuild| 2 +- dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild | 2 +- dev-python/gast/gast-0.5.3-r1.ebuild | 2 +- dev-python/pooch/pooch-1.7.0.ebuild | 2 +- dev-python/pythran/pythran-0.13.1.ebuild | 2 +- dev-python/requests/requests-2.31.0.ebuild| 2 +- dev-python/scipy/scipy-1.11.1.ebuild | 2 +- sci-libs/amd/amd-2.4.6-r1.ebuild | 2 +- sci-libs/arpack/arpack-3.8.0.ebuild | 2 +- sci-libs/camd/camd-2.4.6-r1.ebuild| 2 +- sci-libs/ccolamd/ccolamd-2.9.6.ebuild | 2 +- sci-libs/cholmod/cholmod-3.0.14.ebuild| 2 +- sci-libs/colamd/colamd-2.9.6.ebuild | 2 +- sci-libs/gklib/gklib-5.1.1_p20230327-r1.ebuild| 2 +- sci-libs/metis/metis-5.2.1-r2.ebuild | 2 +- sci-libs/suitesparseconfig/suitesparseconfig-5.4.0.ebuild | 2 +- sci-libs/umfpack/umfpack-5.7.9.ebuild | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild index 5dc29850a20f..3dc8e16d73a6 100644 --- a/dev-python/beniget/beniget-0.4.1-r1.ebuild +++ b/dev-python/beniget/beniget-0.4.1-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]" diff --git a/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild b/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild index 61c6e2cc0f46..b18a4cc6ff3e 100644 --- a/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild +++ b/dev-python/charset-normalizer/charset-normalizer-3.2.0.ebuild @@ -18,7 +18,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" distutils_enable_tests pytest diff --git a/dev-python/gast/gast-0.5.3-r1.ebuild b/dev-python/gast/gast-0.5.3-r1.ebuild index e9712b6d8199..f784c060c92c 100644 --- a/dev-python/gast/gast-0.5.3-r1.ebuild +++ b/dev-python/gast/gast-0.5.3-r1.ebuild @@ -12,6 +12,6 @@ HOMEPAGE="https://pypi.org/project/gast/"; LICENSE="BSD PSF-2" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos" distutils_enable_tests unittest diff --git a/dev-python/pooch/pooch-1.7.0.ebuild b/dev-python/pooch/pooch-1.7.0.ebuild index a2379d26b6bd..0ee971a881b1 100644 --- a/dev-python/pooch/pooch-1.7.0.ebuild +++ b/dev-python/pooch/pooch-1.7.0.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
[gentoo-commits] repo/gentoo:master commit in: dev-python/pybind11/, dev-python/pybind11/files/
commit: 14d6583917451b5dfdad632d9d8956c56c8a7a18 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 00:05:13 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:17:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d65839 dev-python/pybind11: keyword ~x64-macos and ~arm64-macos. A patch is need to undo the assumption of LLVM toolchain on macOS. It does not affect other architectures, incorporating without a revision bump. Signed-off-by: Benda Xu gentoo.org> .../pybind11/files/pybind11-2.10.4_macOS-GCC.patch | 23 ++ dev-python/pybind11/pybind11-2.10.4.ebuild | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch new file mode 100644 index ..5bfa88348110 --- /dev/null +++ b/dev-python/pybind11/files/pybind11-2.10.4_macOS-GCC.patch @@ -0,0 +1,23 @@ +Break the toolchain assumption of LLVM on Prefix/macOS. + +At Prefix/macOS, the system compiler is GCC with libstdc++. + +This patch is only useful to Gentoo Prefix. We don't have plans to +forward it upstream. + +Signed-off-by: Benda Xu + +Index: pybind11-2.10.4/pybind11/setup_helpers.py +=== +--- pybind11-2.10.4.orig/pybind11/setup_helpers.py pybind11-2.10.4/pybind11/setup_helpers.py +@@ -154,9 +154,6 @@ class Pybind11Extension(_Extension): # + c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags) + if not any(opt.startswith("-g") for opt in c_cpp_flags): + cflags += ["-g0"] +-if MACOS: +-cflags += ["-stdlib=libc++"] +-ldflags += ["-stdlib=libc++"] + self._add_cflags(cflags) + self._add_ldflags(ldflags) + diff --git a/dev-python/pybind11/pybind11-2.10.4.ebuild b/dev-python/pybind11/pybind11-2.10.4.ebuild index ade4adbcd5e1..cea97d04299f 100644 --- a/dev-python/pybind11/pybind11-2.10.4.ebuild +++ b/dev-python/pybind11/pybind11-2.10.4.ebuild @@ -21,7 +21,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" RDEPEND=" dev-cpp/eigen:3 @@ -38,6 +38,7 @@ distutils_enable_tests pytest python_prepare_all() { export PYBIND11_USE_CMAKE=1 cmake_src_prepare + PATCHES=( "${FILESDIR}"/pybind11-2.10.4_macOS-GCC.patch ) distutils-r1_python_prepare_all }
[gentoo-commits] repo/gentoo:master commit in: dev-python/meson-python/, dev-python/meson-python/files/
commit: f4e9370d76817e46724cfbd5f1aaa9212e11dc25 Author: Benda Xu gentoo org> AuthorDate: Mon Jul 17 00:05:11 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 17 01:17:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e9370d dev-python/meson-python: recognize python modules on Prefix/macOS keyword 0.13.2 for ~arm64-macos, ~x64-macos. At Prefix/macOS we conventionally name the python modules as .bundle. Bug: https://bugs.gentoo.org/910401 Signed-off-by: Benda Xu gentoo.org> .../files/meson-python-0.13.2_Mach-O_bundle.patch | 21 + dev-python/meson-python/meson-python-0.13.2.ebuild | 4 +++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch b/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch new file mode 100644 index ..2531c93f41e2 --- /dev/null +++ b/dev-python/meson-python/files/meson-python-0.13.2_Mach-O_bundle.patch @@ -0,0 +1,21 @@ +Support .bundle python modules at Prefix/macOS. + +Not forwarding to upstream because we are reflecting on the naming +scheme of plugin modules on Prefix/macOS. + +Bug: https://bugs.gentoo.org/910401 +Signed-off-by: Benda Xu + +Index: meson-python-0.13.2/mesonpy/__init__.py +=== +--- meson-python-0.13.2.orig/mesonpy/__init__.py meson-python-0.13.2/mesonpy/__init__.py +@@ -129,7 +129,7 @@ _STYLES = _init_colors() # holds the co + + _SUFFIXES = importlib.machinery.all_suffixes() + _EXTENSION_SUFFIXES = importlib.machinery.EXTENSION_SUFFIXES +-_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P[^.]+)\.)?(?:so|pyd|dll)$') ++_EXTENSION_SUFFIX_REGEX = re.compile(r'^\.(?:(?P[^.]+)\.)?(?:so|pyd|dll|bundle)$') + assert all(re.match(_EXTENSION_SUFFIX_REGEX, x) for x in _EXTENSION_SUFFIXES) + + diff --git a/dev-python/meson-python/meson-python-0.13.2.ebuild b/dev-python/meson-python/meson-python-0.13.2.ebuild index a3ead795daa5..37341a7784da 100644 --- a/dev-python/meson-python/meson-python-0.13.2.ebuild +++ b/dev-python/meson-python/meson-python-0.13.2.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/pyproject-metadata-0.7.1[${PYTHON_USEDEP}] @@ -40,6 +40,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/meson-python-0.13.2_Mach-O_bundle.patch ) + distutils_enable_tests pytest python_test() {
[gentoo-commits] repo/gentoo:master commit in: dev-python/pandas/, dev-python/versioneer/, dev-python/bottleneck/, ...
commit: 6badd43c9770f1bbbf0811d8f80b87c383912179 Author: Benda Xu gentoo org> AuthorDate: Fri Jul 14 14:45:01 2023 + Commit: Benda XU gentoo org> CommitDate: Fri Jul 14 14:51:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6badd43c dev-python/pandas: keyword it and its dependencies. keyword 2.0.3 for ~arm64-macos, ~x64-macos dev-python/versioneer: keyword 0.29 for ~arm64-macos, ~x64-macos dev-python/numexpr: keyword 2.8.4 for ~arm64-macos, ~x64-macos dev-python/bottleneck: keyword 1.3.7 for ~arm64-macos, ~x64-macos Suggested-by: Jiajie Chen qq.com> Signed-off-by: Benda Xu gentoo.org> dev-python/bottleneck/bottleneck-1.3.7.ebuild | 2 +- dev-python/numexpr/numexpr-2.8.4.ebuild | 2 +- dev-python/pandas/pandas-2.0.3.ebuild | 2 +- dev-python/versioneer/versioneer-0.29.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-python/bottleneck/bottleneck-1.3.7.ebuild b/dev-python/bottleneck/bottleneck-1.3.7.ebuild index 847f1e198bd8..91b897ba1875 100644 --- a/dev-python/bottleneck/bottleneck-1.3.7.ebuild +++ b/dev-python/bottleneck/bottleneck-1.3.7.ebuild @@ -21,7 +21,7 @@ S=${WORKDIR}/${P^} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/numpy-1.9.1[${PYTHON_USEDEP}] diff --git a/dev-python/numexpr/numexpr-2.8.4.ebuild b/dev-python/numexpr/numexpr-2.8.4.ebuild index 7ddec5b42f92..0f19d55cc3e5 100644 --- a/dev-python/numexpr/numexpr-2.8.4.ebuild +++ b/dev-python/numexpr/numexpr-2.8.4.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" DEPEND=" >=dev-python/numpy-1.13.3[${PYTHON_USEDEP}] diff --git a/dev-python/pandas/pandas-2.0.3.ebuild b/dev-python/pandas/pandas-2.0.3.ebuild index 9112daf38f27..f89901708f86 100644 --- a/dev-python/pandas/pandas-2.0.3.ebuild +++ b/dev-python/pandas/pandas-2.0.3.ebuild @@ -25,7 +25,7 @@ S=${WORKDIR}/${P/_/} SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos ~x64-macos" IUSE="doc full-support minimal test X" RESTRICT="!test? ( test )" diff --git a/dev-python/versioneer/versioneer-0.29.ebuild b/dev-python/versioneer/versioneer-0.29.ebuild index ed03e7b79ef0..4e6d807caf05 100644 --- a/dev-python/versioneer/versioneer-0.29.ebuild +++ b/dev-python/versioneer/versioneer-0.29.ebuild @@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P} SLOT="0" LICENSE="Unlicense" -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 ~arm64-macos ~x64-macos" IUSE="test" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/x64/, profiles/prefix/darwin/macos/10.14/x64/, ...
commit: 78ede4d591c8c16e65e14414389ab9b6a58f21eb Author: Benda Xu gentoo org> AuthorDate: Mon Jul 10 16:27:21 2023 + Commit: Benda XU gentoo org> CommitDate: Mon Jul 10 16:30:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ede4d5 p/p/darwin/macos/14.0: prepare for the upcoming macOS release. Refactorize to merge the use.mask files into single directories. Suggested-by: Jiajie Chen qq.com> Reported-by: Chuangyu Ding icloud.com> Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/10.11/x64/use.mask| 30 -- profiles/prefix/darwin/macos/10.13/x64/use.mask| 30 -- profiles/prefix/darwin/macos/10.14/x64/use.mask| 30 -- profiles/prefix/darwin/macos/10.15/x64/use.mask| 30 -- .../prefix/darwin/macos/11.0/arm64/gcc/use.mask| 5 profiles/prefix/darwin/macos/11.0/x64/use.mask | 30 -- .../prefix/darwin/macos/12.0/arm64/gcc/use.mask| 5 profiles/prefix/darwin/macos/12.0/x64/use.mask | 30 -- .../prefix/darwin/macos/13.0/arm64/gcc/use.mask| 5 profiles/prefix/darwin/macos/13.0/x64/use.mask | 30 -- profiles/prefix/darwin/macos/14.0/arm64/eapi | 1 + profiles/prefix/darwin/macos/14.0/arm64/gcc/eapi | 1 + profiles/prefix/darwin/macos/14.0/arm64/gcc/parent | 2 ++ .../prefix/darwin/macos/14.0/arm64/make.defaults | 5 profiles/prefix/darwin/macos/14.0/arm64/parent | 2 ++ profiles/prefix/darwin/macos/14.0/eapi | 1 + profiles/prefix/darwin/macos/14.0/make.defaults| 4 +++ profiles/prefix/darwin/macos/14.0/package.use.mask | 7 + profiles/prefix/darwin/macos/14.0/parent | 1 + profiles/prefix/darwin/macos/14.0/profile.bashrc | 4 +++ profiles/prefix/darwin/macos/14.0/x64/eapi | 1 + profiles/prefix/darwin/macos/14.0/x64/gcc/eapi | 1 + profiles/prefix/darwin/macos/14.0/x64/gcc/parent | 2 ++ .../prefix/darwin/macos/14.0/x64/make.defaults | 5 profiles/prefix/darwin/macos/14.0/x64/parent | 2 ++ .../darwin/macos/arch/arm64/package.use.mask | 9 ++- profiles/prefix/darwin/macos/arch/x64/use.mask | 21 ++- profiles/profiles.desc | 2 ++ 28 files changed, 69 insertions(+), 227 deletions(-) diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask deleted file mode 100644 index 3e153701348d.. --- a/profiles/prefix/darwin/macos/10.11/x64/use.mask +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This file masks out USE flags that are simply NOT allowed in the default -# x86 profile. This works, for example, if another architecture's -# profile have a USE flag associated with (such as altivec, mmx, etc). - -# Unmask x86 instruction sets --cpu_flags_x86_mmx --cpu_flags_x86_mmxext --cpu_flags_x86_sse --cpu_flags_x86_sse2 --cpu_flags_x86_ssse3 --svga - -# Unmask nvidia XvMC support --nvidia - -# Unmask dev-db/oracle-instantclient-basic support --oci8-instant-client - -# Modular X: unmask for architectures on which they are available --input_devices_synaptics --input_devices_vmmouse --input_devices_wacom --video_cards_nvidia --video_cards_vmware - -# ibm is only used for ppc64 stuff -ibm diff --git a/profiles/prefix/darwin/macos/10.13/x64/use.mask b/profiles/prefix/darwin/macos/10.13/x64/use.mask deleted file mode 100644 index 3e153701348d.. --- a/profiles/prefix/darwin/macos/10.13/x64/use.mask +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This file masks out USE flags that are simply NOT allowed in the default -# x86 profile. This works, for example, if another architecture's -# profile have a USE flag associated with (such as altivec, mmx, etc). - -# Unmask x86 instruction sets --cpu_flags_x86_mmx --cpu_flags_x86_mmxext --cpu_flags_x86_sse --cpu_flags_x86_sse2 --cpu_flags_x86_ssse3 --svga - -# Unmask nvidia XvMC support --nvidia - -# Unmask dev-db/oracle-instantclient-basic support --oci8-instant-client - -# Modular X: unmask for architectures on which they are available --input_devices_synaptics --input_devices_vmmouse --input_devices_wacom --video_cards_nvidia --video_cards_vmware - -# ibm is only used for ppc64 stuff -ibm diff --git a/profiles/prefix/darwin/macos/10.14/x64/use.mask b/profiles/prefix/darwin/macos/10.14/x64/use.mask deleted file mode 100644 index a36750571e81.. --- a/profiles/prefix/darwin/macos/10.14/x64/use.mask +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# This file masks out USE flags th
[gentoo-commits] repo/gentoo:master commit in: dev-python/regex/, dev-python/numpy/, dev-python/rfc3339-validator/, ...
commit: 71a6a81929f88171feb6e829ff0b87b2ed396d91 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 14:31:51 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 14:46:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a6a819 dev-python/h5py: keyword it and its dependencies for ~arm64-macos. dev-python/six: keyword 1.16.0-r1 for ~arm64-macos dev-python/regex: keyword 2023.6.3 for ~arm64-macos dev-python/python-dateutil: keyword 2.8.2-r1 for ~arm64-macos dev-python/idna: keyword 3.4 for ~arm64-macos dev-python/attrs: keyword 23.1.0 for ~arm64-macos dev-python/numpy: keyword 1.24.4-r1 for ~arm64-macos dev-python/jsonschema: keyword 4.17.3 for ~arm64-macos dev-python/arrow: keyword 1.2.3 for ~arm64-macos dev-python/fqdn: keyword 1.5.1-r2 for ~arm64-macos dev-python/hatch-fancy-pypi-readme: keyword 23.1.0 for ~arm64-macos dev-python/hatch-vcs: keyword 0.3.0 for ~arm64-macos dev-python/isoduration: keyword 20.11.0-r1 for ~arm64-macos dev-python/lark: keyword 1.1.5 for ~arm64-macos dev-python/pkgconfig: keyword 1.5.5-r1 for ~arm64-macos dev-python/poetry-core: keyword 1.6.1 for ~arm64-macos dev-python/pyrsistent: keyword 0.19.3 for ~arm64-macos dev-python/rfc3339-validator: keyword 0.1.4-r1 for ~arm64-macos dev-python/rfc3986-validator: keyword 0.1.1-r1 for ~arm64-macos dev-python/rfc3987: keyword 1.3.8-r2 for ~arm64-macos dev-python/strict-rfc3339: keyword 0.7-r2 for ~arm64-macos dev-python/webcolors: keyword 1.13 for ~arm64-macos dev-python/uri_template: keyword 1.3.0 for ~arm64-macos dev-python/jsonpointer: keyword 2.4 for ~arm64-macos sci-libs/hdf5: keyword 1.14.1 for ~arm64-macos Reported-by: Jiajie Chen qq.com> Signed-off-by: Benda Xu gentoo.org> dev-python/arrow/arrow-1.2.3.ebuild | 2 +- dev-python/attrs/attrs-23.1.0.ebuild| 2 +- dev-python/fqdn/fqdn-1.5.1-r2.ebuild| 2 +- dev-python/h5py/h5py-3.9.0.ebuild | 2 +- .../hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-23.1.0.ebuild | 2 +- dev-python/hatch-vcs/hatch-vcs-0.3.0.ebuild | 2 +- dev-python/idna/idna-3.4.ebuild | 2 +- dev-python/isoduration/isoduration-20.11.0-r1.ebuild| 2 +- dev-python/jsonpointer/jsonpointer-2.4.ebuild | 2 +- dev-python/jsonschema/jsonschema-4.17.3.ebuild | 2 +- dev-python/lark/lark-1.1.5.ebuild | 2 +- dev-python/numpy/numpy-1.24.4-r1.ebuild | 2 +- dev-python/pkgconfig/pkgconfig-1.5.5-r1.ebuild | 2 +- dev-python/poetry-core/poetry-core-1.6.1.ebuild | 2 +- dev-python/pyrsistent/pyrsistent-0.19.3.ebuild | 2 +- dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild | 2 +- dev-python/regex/regex-2023.6.3.ebuild | 2 +- dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild | 2 +- dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild | 2 +- dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild | 2 +- dev-python/six/six-1.16.0-r1.ebuild | 2 +- dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild | 2 +- dev-python/uri_template/uri_template-1.3.0.ebuild | 2 +- dev-python/webcolors/webcolors-1.13.ebuild | 2 +- sci-libs/hdf5/hdf5-1.14.1.ebuild| 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dev-python/arrow/arrow-1.2.3.ebuild b/dev-python/arrow/arrow-1.2.3.ebuild index 3a2847561866..329569040dec 100644 --- a/dev-python/arrow/arrow-1.2.3.ebuild +++ b/dev-python/arrow/arrow-1.2.3.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos" RDEPEND=" >=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}] diff --git a/dev-python/attrs/attrs-23.1.0.ebuild b/dev-python/attrs/attrs-23.1.0.ebuild index 50b5fd2e8173..70717b7db77d 100644 --- a/dev-python/attrs/attrs-23.1.0.ebuild +++ b/dev-python/attrs/attrs-23.1.0.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" 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 ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~r
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/x64/
commit: 503fa9bc402353c5a89995e13c5a2f98772ccb76 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 05:14:01 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 05:14:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503fa9bc p/p/darwin/macos/arch/x64: allow users to tune the x86 CPU flags. This is useful to fine tune the number crunching performance on macOS. Signed-off-by: Benda Xu gentoo.org> .../prefix/darwin/macos/arch/x64/make.defaults | 3 ++- profiles/prefix/darwin/macos/arch/x64/use.mask | 23 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults index 9dee8c00f5f0..e4b9746c663a 100644 --- a/profiles/prefix/darwin/macos/arch/x64/make.defaults +++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults @@ -1,9 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 ARCH="x64-macos" ACCEPT_KEYWORDS="~x64-macos" +USE_EXPAND_HIDDEN="-CPU_FLAGS_X86" CPU_FLAGS_X86="mmx mmxext sse sse2" # multilib build stuff, single ABI (no multilib) diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask b/profiles/prefix/darwin/macos/arch/x64/use.mask index 01a9fae674b6..6bf08722e781 100644 --- a/profiles/prefix/darwin/macos/arch/x64/use.mask +++ b/profiles/prefix/darwin/macos/arch/x64/use.mask @@ -4,3 +4,26 @@ # Unmask the flag corresponding to the default ABI -x64-macos -abi_x86_64 + +# Benda Xu (2023-07-09) +# Unmask the CPU-flag related USE EXPAND, as in the general arch/amd64 + +-cpu_flags_x86_3dnow +-cpu_flags_x86_3dnowext +-cpu_flags_x86_aes +-cpu_flags_x86_avx +-cpu_flags_x86_avx2 +-cpu_flags_x86_fma3 +-cpu_flags_x86_fma4 +-cpu_flags_x86_mmx +-cpu_flags_x86_mmxext +-cpu_flags_x86_padlock +-cpu_flags_x86_popcnt +-cpu_flags_x86_sse +-cpu_flags_x86_sse2 +-cpu_flags_x86_sse3 +-cpu_flags_x86_sse4_1 +-cpu_flags_x86_sse4_2 +-cpu_flags_x86_sse4a +-cpu_flags_x86_ssse3 +-cpu_flags_x86_xop
[gentoo-commits] repo/gentoo:master commit in: sys-apps/the_silver_searcher/
commit: bf5062d5c5ff8c3c42c8630b4c6b36101d1af2e9 Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 04:56:11 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 05:05:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5062d5 sys-apps/the_silver_searcher: keyword 2.2.0_p20201217-r1 for ~x64-macos Signed-off-by: Benda Xu gentoo.org> .../the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild index eb85f58a5cd2..b1f5f48499dd 100644 --- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild +++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos" IUSE="lzma test zlib" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/sunos/, profiles/prefix/sunos/solaris/, ...
commit: 200dcd061e685c809a8d2859afdf1781b23020ee Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 05:02:59 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 05:05:33 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=200dcd06 p/p/{darwin/macos,sunos/solaris}: move the xattr masks downwards. The masks are more related to userland libc implementations than kernels, and suits better to macos and solaris subdirectories. Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.mask| 6 ++ profiles/prefix/{sunos => darwin/macos}/use.mask | 20 profiles/prefix/darwin/package.mask | 6 -- profiles/prefix/darwin/use.mask | 4 profiles/prefix/sunos/package.mask | 8 profiles/prefix/sunos/solaris/package.mask | 6 ++ profiles/prefix/sunos/{ => solaris}/use.mask | 20 profiles/prefix/sunos/use.mask | 4 8 files changed, 12 insertions(+), 62 deletions(-) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index 0eeeffbc554e..a0d4caecafae 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -1,6 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-07-09) +# Requires Glibc to work properly. +# For example, 'lgetxattr' is not available on macOS or gnulib. +# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html +sys-apps/attr + # Fabian Groffen (2023-06-05) # Fails to compile using GCC, misdetecting sincosf # https://github.com/harfbuzz/harfbuzz/issues/4266 diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/darwin/macos/use.mask similarity index 54% copy from profiles/prefix/sunos/use.mask copy to profiles/prefix/darwin/macos/use.mask index d9cbd55a4b77..334d27168fee 100644 --- a/profiles/prefix/sunos/use.mask +++ b/profiles/prefix/darwin/macos/use.mask @@ -1,26 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Re-add SunOS libc --elibc_SunOS --kernel_SunOS - # Benda Xu (2023-07-09) # xattr requires sys-apps/attr, which is masked. xattr - -# these will more than likely never work on solaris -3dfx -acpi -alsa -apm -caps -djbfft -fbcon -ggi -gpm -hardened -oss -svga -rtc -v4l diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask index 770d57809b9a..47b1d8ab9f58 100644 --- a/profiles/prefix/darwin/package.mask +++ b/profiles/prefix/darwin/package.mask @@ -1,12 +1,6 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Benda Xu (2023-07-09) -# Requires Glibc to work properly. -# For example, 'lgetxattr' is not available on macOS or gnulib. -# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html -sys-apps/attr - # Fabian Groffen (2014-01-14) # util-linux has no business on Darwin systems sys-apps/util-linux diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask index 79035bfa7912..b3b6dcd4f1e3 100644 --- a/profiles/prefix/darwin/use.mask +++ b/profiles/prefix/darwin/use.mask @@ -34,9 +34,5 @@ introspection # libcap doesn't work on OSX (fcaps.eclass), bug #534264 filecaps -# Benda Xu (2023-07-09) -# xattr requires sys-apps/attr, which is masked. -xattr - # linux-exclusive feature inotify diff --git a/profiles/prefix/sunos/package.mask b/profiles/prefix/sunos/package.mask deleted file mode 100644 index 1d933faa70cb.. --- a/profiles/prefix/sunos/package.mask +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Benda Xu (2023-07-09) -# Requires Glibc to work properly. -# For example, 'lgetxattr' is not available on Solaris or gnulib. -# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html -sys-apps/attr diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask index bd2fe8fd3273..dbb1185a8cae 100644 --- a/profiles/prefix/sunos/solaris/package.mask +++ b/profiles/prefix/sunos/solaris/package.mask @@ -1,6 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-07-09) +# Requires Glibc to work properly. +# For example, 'lgetxattr' is not available on Solaris or gnulib. +# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html +sys-apps/attr + # Fabian Groffen (2023-06-09) # Fails to compile due to missing DT_* symbols # fix: https://lore.kernel.org/git/20230606205935.3183276-1-ased...@google.com/ diff --git a/profiles/prefix/sunos/use.mask b/profiles/
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/sunos/, profiles/prefix/darwin/
commit: e89144f2c9ac889fa99bff752ea2065bf1a735fb Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 03:32:43 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 03:40:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89144f2 p/prefix/{darwin,sunos}: mask sys-apps/attr and USE=xattr. The required headers are not available on macOS or Solaris. Bug: https://bugs.gentoo.org/910070 Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/package.mask | 8 +++- profiles/prefix/darwin/use.mask | 6 +- profiles/prefix/sunos/package.mask | 8 profiles/prefix/sunos/use.mask | 6 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask index fbda04428af4..770d57809b9a 100644 --- a/profiles/prefix/darwin/package.mask +++ b/profiles/prefix/darwin/package.mask @@ -1,6 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Benda Xu (2023-07-09) +# Requires Glibc to work properly. +# For example, 'lgetxattr' is not available on macOS or gnulib. +# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html +sys-apps/attr + # Fabian Groffen (2014-01-14) # util-linux has no business on Darwin systems sys-apps/util-linux diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask index 980886cdc0dc..79035bfa7912 100644 --- a/profiles/prefix/darwin/use.mask +++ b/profiles/prefix/darwin/use.mask @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 #Add USE flags that don't work on Darwin/OpenDarwin/OS X here @@ -34,5 +34,9 @@ introspection # libcap doesn't work on OSX (fcaps.eclass), bug #534264 filecaps +# Benda Xu (2023-07-09) +# xattr requires sys-apps/attr, which is masked. +xattr + # linux-exclusive feature inotify diff --git a/profiles/prefix/sunos/package.mask b/profiles/prefix/sunos/package.mask new file mode 100644 index ..1d933faa70cb --- /dev/null +++ b/profiles/prefix/sunos/package.mask @@ -0,0 +1,8 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Benda Xu (2023-07-09) +# Requires Glibc to work properly. +# For example, 'lgetxattr' is not available on Solaris or gnulib. +# https://www.gnu.org/software/gnulib/manual/html_node/lgetxattr.html +sys-apps/attr diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask index 875fdb97c4dd..d9cbd55a4b77 100644 --- a/profiles/prefix/sunos/use.mask +++ b/profiles/prefix/sunos/use.mask @@ -1,10 +1,14 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Re-add SunOS libc -elibc_SunOS -kernel_SunOS +# Benda Xu (2023-07-09) +# xattr requires sys-apps/attr, which is masked. +xattr + # these will more than likely never work on solaris 3dfx acpi
[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/
commit: e0fffb403b42ad4ff381c454480c70b53bf273ef Author: Benda Xu gentoo org> AuthorDate: Sun Jul 9 03:38:21 2023 + Commit: Benda XU gentoo org> CommitDate: Sun Jul 9 03:40:44 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fffb40 p/p/darwin/macos/package.mask: harfbuzz-7.2 droped in a7f050bbcecb. Signed-off-by: Benda Xu gentoo.org> profiles/prefix/darwin/macos/package.mask | 1 - 1 file changed, 1 deletion(-) diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask index cc6f25ce78cf..0eeeffbc554e 100644 --- a/profiles/prefix/darwin/macos/package.mask +++ b/profiles/prefix/darwin/macos/package.mask @@ -4,5 +4,4 @@ # Fabian Groffen (2023-06-05) # Fails to compile using GCC, misdetecting sincosf # https://github.com/harfbuzz/harfbuzz/issues/4266 -=media-libs/harfbuzz-7.2.0 =media-libs/harfbuzz-7.3.0