commit: 305afefbac4a3490aa5f7086e203cf5fdf5741c2 Author: Z. Liu <zhixu.liu <AT> gmail <DOT> com> AuthorDate: Wed Jun 11 15:40:02 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 10:55:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305afefb
x11-wm/xpra: enable build with clang * w/o NVCC_PREPEND_FLAGS, build failed with: > sh: line 1: /g++: No such file or directory Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42557 Closes: https://github.com/gentoo/gentoo/pull/42557 Signed-off-by: Sam James <sam <AT> gentoo.org> x11-wm/xpra/xpra-6.2.5-r1.ebuild | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/x11-wm/xpra/xpra-6.2.5-r1.ebuild b/x11-wm/xpra/xpra-6.2.5-r1.ebuild index 1d6d6a6234c7..bc0d1f75dea8 100644 --- a/x11-wm/xpra/xpra-6.2.5-r1.ebuild +++ b/x11-wm/xpra/xpra-6.2.5-r1.ebuild @@ -19,7 +19,7 @@ DISTUTILS_USE_PEP517=setuptools DISTUTILS_SINGLE_IMPL=yes DISTUTILS_EXT=1 -inherit cuda xdg distutils-r1 prefix tmpfiles udev +inherit cuda distutils-r1 prefix tmpfiles toolchain-funcs udev xdg DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" HOMEPAGE="https://xpra.org/"; @@ -157,12 +157,11 @@ src_prepare() { -i "${S}/tests/unittests/run" || die } -python_prepare_all() { - distutils-r1_python_prepare_all - +python_configure_all() { hprefixify xpra/scripts/config.py - sed -r -e "/\bdoc_dir =/s:/${PN}/\":/${PF}/html\":" \ + sed -r -e "/\bdoc_dir =/s:(/share/doc/)$PN(/):\1$PF/html\2:" \ + -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ -i setup.py || die if use minimal; then @@ -170,11 +169,6 @@ python_prepare_all() { -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ -i setup.py || die fi -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die DISTUTILS_ARGS=( --with-PIC @@ -225,7 +219,7 @@ python_configure_all() { "$(use_with X Xdummy)" "$(use_with test tests)" - --with-strict + --without-strict # --with-verbose # --with-warn # --with-cythonize_more @@ -289,7 +283,13 @@ python_configure_all() { python_compile() { if use cuda; then - export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + if tc-is-gcc ; then + export NVCC_PREPEND_FLAGS="-ccbin $(cuda_gccdir)/g++" + elif tc-is-clang ; then + export NVCC_PREPEND_FLAGS="-ccbin /usr/lib/llvm/$(clang-major-version)/bin/clang++" + else + die "unsupported compiler: ${CC}" + fi fi PYTHONPATH="${S}" distutils-r1_python_compile
