Attachment #874610 for bug #758167

View | Details | Raw Unified | Return to bug 758167 | Differences between

and this patch

Lines 14-20 DISTUTILS_OPTIONAL=1 Link Here

(-)a/app-crypt/gpgme/gpgme-1.21.0.ebuild (-2 / +2 lines)
14	PYTHON_COMPAT=( python3_{10..12} )	14	PYTHON_COMPAT=( python3_{10..12} )
15	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc	15	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
16		16
17	inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig	17	inherit autotools distutils-r1 flag-o-matic qmake-utils toolchain-funcs verify-sig
18		18
19	DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"	19	DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
20	HOMEPAGE="https://www.gnupg.org/related_software/gpgme"	20	HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
Lines 63-69 PATCHES=( Link Here
63	src_prepare() {	63	src_prepare() {
64	default	64	default
65		65
66	elibtoolize	66	eautoreconf
67		67
68	# bug #697456	68	# bug #697456
69	addpredict /run/user/$(id -u)/gnupg	69	addpredict /run/user/$(id -u)/gnupg

Lines 46-52 multilib_src_configure() { Link Here

(-)a/app-crypt/rhash/rhash-1.4.3.ebuild (-1 / +3 lines)
46	# https://github.com/gentoo/gentoo/pull/28355	46	# https://github.com/gentoo/gentoo/pull/28355
47	# mold needs this too but right now tc-ld-is-mold is also not available	47	# mold needs this too but right now tc-ld-is-mold is also not available
48	if tc-ld-is-lld; then	48	if tc-ld-is-lld; then
49	append-ldflags -Wl,--undefined-version	49	if ! use kernel_Darwin; then
		50	append-ldflags -Wl,--undefined-version
		51	fi
50	fi	52	fi
51		53
52	set -- \	54	set -- \

Lines 110-116 multilib_src_configure() { Link Here

(-)a/dev-libs/libgcrypt/libgcrypt-1.10.2.ebuild (-1 / +3 lines)
110	# https://github.com/gentoo/gentoo/pull/28355	110	# https://github.com/gentoo/gentoo/pull/28355
111	# mold needs this too but right now tc-ld-is-mold is also not available	111	# mold needs this too but right now tc-ld-is-mold is also not available
112	if tc-ld-is-lld; then	112	if tc-ld-is-lld; then
113	append-ldflags -Wl,--undefined-version	113	if ! use kernel_Darwin; then
		114	append-ldflags -Wl,--undefined-version
		115	fi
114	fi	116	fi
115		117
116	local myeconfargs=(	118	local myeconfargs=(

Lines 25-31 src_configure() { Link Here

(-)a/dev-libs/npth/npth-1.6-r1.ebuild (-1 / +3 lines)
25	# https://github.com/gentoo/gentoo/pull/28355	25	# https://github.com/gentoo/gentoo/pull/28355
26	# mold needs this too but right now tc-ld-is-mold is also not available	26	# mold needs this too but right now tc-ld-is-mold is also not available
27	if tc-ld-is-lld; then	27	if tc-ld-is-lld; then
28	append-ldflags -Wl,--undefined-version	28	if ! use kernel_Darwin; then
		29	append-ldflags -Wl,--undefined-version
		30	fi
29	fi	31	fi
30		32
31	econf \	33	econf \

Lines 33-39 multilib_src_configure() { Link Here

(-)a/dev-libs/popt/popt-1.19.ebuild (-1 / +3 lines)
33	# https://github.com/gentoo/gentoo/pull/28355	33	# https://github.com/gentoo/gentoo/pull/28355
34	# mold needs this too but right now tc-ld-is-mold is also not available	34	# mold needs this too but right now tc-ld-is-mold is also not available
35	if tc-ld-is-lld; then	35	if tc-ld-is-lld; then
36	append-ldflags -Wl,--undefined-version	36	if ! use kernel_Darwin ; then
		37	append-ldflags -Wl,--undefined-version
		38	fi
37	fi	39	fi
38		40
39	local myeconfargs=(	41	local myeconfargs=(

Lines 41-47 multilib_src_configure() { Link Here

(-)a/net-dns/libidn2/libidn2-2.3.4.ebuild (-1 / +3 lines)
41	# https://github.com/gentoo/gentoo/pull/28355	41	# https://github.com/gentoo/gentoo/pull/28355
42	# mold needs this too but right now tc-ld-is-mold is also not available	42	# mold needs this too but right now tc-ld-is-mold is also not available
43	if tc-ld-is-lld; then	43	if tc-ld-is-lld; then
44	append-ldflags -Wl,--undefined-version	44	if ! use kernel_Darwin; then
		45	append-ldflags -Wl,--undefined-version
		46	fi
45	fi	47	fi
46		48
47	local myconf=(	49	local myconf=(

Lines 4-10 Link Here

(-)a/net-libs/gnutls/gnutls-3.8.0.ebuild (-2 / +2 lines)
4	EAPI=8	4	EAPI=8
5		5
6	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc	6	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
7	inherit libtool multilib-minimal verify-sig	7	inherit autotools multilib-minimal verify-sig
8		8
9	DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"	9	DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
10	HOMEPAGE="https://www.gnutls.org/"	10	HOMEPAGE="https://www.gnutls.org/"
Lines 69-75 src_prepare() { Link Here
69	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c \|\| die	69	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c \|\| die
70		70
71	# Use sane .so versioning on FreeBSD.	71	# Use sane .so versioning on FreeBSD.
72	elibtoolize	72	eautoreconf
73	}	73	}
74		74
75	multilib_src_configure() {	75	multilib_src_configure() {

Lines 4-9 Link Here

(-)a/profiles/base/use.mask (+4 lines)
4	# This file is only for generic masks. For arch-specific masks (i.e.	4	# This file is only for generic masks. For arch-specific masks (i.e.
5	# mask everywhere, unmask on arch/*) use arch/base.	5	# mask everywhere, unmask on arch/*) use arch/base.
6		6
		7	# Alexey Sokolov <alexey+gentoo@asokolov.org> (2023-08-07)
		8	# Only needed during bootstrap of prefix
		9	bootstrap-prefix
		10
7	# Hans de Graaff <graaff@gentoo.org> (2023-04-10)	11	# Hans de Graaff <graaff@gentoo.org> (2023-04-10)
8	# Ruby 2.7 is masked for removal.	12	# Ruby 2.7 is masked for removal.
9	ruby_targets_ruby27	13	ruby_targets_ruby27

Lines 11-17 CXX="clang++" Link Here

(-)a/profiles/features/llvm/make.defaults (-1 / +1 lines)
11	LD="ld.lld"	11	LD="ld.lld"
12		12
13	# linker flags	13	# linker flags
14	LDFLAGS="${LDFLAGS} -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind -Wl,--as-needed"	14	#LDFLAGS="${LDFLAGS} -fuse-ld=lld -rtlib=compiler-rt -unwindlib=libunwind"
15		15
16	## hardening flags	16	## hardening flags
17	#SOME_HARDENING_CFLAGS="-fPIC -fstack-protector-strong -D_FORTIFY_SOURCE=2"	17	#SOME_HARDENING_CFLAGS="-fPIC -fstack-protector-strong -D_FORTIFY_SOURCE=2"

Lines 16-18 pam Link Here

(-)a/profiles/features/prefix/use.mask (+3 lines)
16	# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)	16	# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
17	# sci-libs/mkl does not have prefix keywords	17	# sci-libs/mkl does not have prefix keywords
18	mkl	18	mkl
		19
		20	# Allow bootstrapping the prefix
		21	-bootstrap-prefix

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/eapi (+1 lines)
	1	5

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/make.defaults (+4 lines)
	1	LD=ld64.lld
	2	#CFLAGS="${CFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"
	3	#CXXFLAGS="${CXXFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"
	4	#LDFLAGS="${LDFLAGS} -Wl,-search_paths_first -L${EPREFIX}/usr/lib -Wl,-rpath,${EPREFIX}/usr/lib"

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.mask (+2 lines)
	1	# If installed, causes some miscompilation somewhere, and cmake crashes during bootstrap
	2	sys-devel/binutils-apple

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.unmask (+4 lines)
	1	# For Darwin bootstraps
	2	sys-devel/native-cctools
	3	# For Darwin bootstraps
	4	sys-devel/native-cctools




# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold
# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/packages (+1 lines)
	1	-*sys-devel/binutils-apple

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/parent (+2 lines)
	1	..
	2	../../../../../../features/llvm

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/package.unmask (+10 lines)
	1	# For Darwin bootstraps
	2	sys-devel/native-cctools
	3	# For Darwin bootstraps
	4	sys-devel/native-cctools
	5	# For Darwin bootstraps
	6	sys-devel/native-cctools
	7	# For Darwin bootstraps
	8	sys-devel/native-cctools
	9	# For Darwin bootstraps
	10	sys-devel/native-cctools




# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold
# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold
# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold
# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold
# Disable bootstrapping libcxx* with libunwind
sys-libs/libcxxabi -libunwind
sys-libs/libcxx -libunwind
# Most binary Linux distributions seem to fancy toolchains that
# do not do c++ support (need to install a separate package).
sys-libs/ncurses -cxx
sys-devel/binutils -cxx
# gmp has cxx flag enabled by default. When dealing with a host
# compiler without cxx support this causes configure failure.
# In addition, The stage2 g++ is only for compiling stage3 compiler,
# because the host libstdc++.so runtime may be not compatible and
# stage2 libstdc++.so might conflict with that of stage3.  The
# trade-off is just not to use cxx.
dev-libs/gmp -cxx
sys-devel/binutils -gold

Lines 29-34 big-endian - Big-endian toolchain support Link Here

(-)a/profiles/use.desc (+1 lines)
29	bindist - Flag to enable or disable options for prebuilt (GRP) packages (eg. due to licensing issues)	29	bindist - Flag to enable or disable options for prebuilt (GRP) packages (eg. due to licensing issues)
30	blas - Add support for the virtual/blas numerical library	30	blas - Add support for the virtual/blas numerical library
31	bluetooth - Enable Bluetooth Support	31	bluetooth - Enable Bluetooth Support
		32	bootstrap-prefix - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for bootstrapping Gentoo Prefix
32	branding - Enable Gentoo specific branding	33	branding - Enable Gentoo specific branding
33	build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating build images and the first half of bootstrapping [make stage1]	34	build - !!internal use only!! DO NOT SET THIS FLAG YOURSELF!, used for creating build images and the first half of bootstrapping [make stage1]
34	bzip2 - Use the bzlib compression library	35	bzip2 - Use the bzlib compression library

Lines 33-38 PATCHES=( Link Here

(-)a/sys-apps/debianutils/debianutils-4.11.2.ebuild (+1 lines)
33	src_prepare() {	33	src_prepare() {
34	default	34	default
35	eautoreconf	35	eautoreconf
		36	sed -i -e 's/int cleanup_tmpfile/void cleanup_tmpfile/' run-parts.c \|\| die
36	}	37	}
37		38
38	src_configure() {	39	src_configure() {




During first part of stage3, some programs are installed from EPREFIX/tmp to EPREFIX which break this qa check
The check I'm adding is heavy-handed, but I don't know how to fix this better

TODO: check whether portage-3.0.30-prefix-stack.patch fixes the same issue

--- a/bin/install-qa-check.d/05prefix
+++ b/bin/install-qa-check.d/05prefix
@@ -95,6 +95,8 @@ install_qa_check_prefix() {
 				# reasons
 				sed -i -e '1s:^#! \?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
 				continue
+			elif [[ -n "${PORTAGE_OVERRIDE_EPREFIX}"  ]] ; then
+				continue
 			else
 				# this is definitely wrong: script in ${PATH} and invalid shebang
 				echo "${fn#${D}}:${line[0]} (script ${fn##*/} installed in PATH but interpreter ${line[0]} not found)" \

Lines 92-97 python_prepare_all() { Link Here

(-)a/sys-apps/portage/portage-3.0.49.ebuild (+1 lines)
92	# disabled in 3.0.24: does not apply, while useful, rarely used if ever	92	# disabled in 3.0.24: does not apply, while useful, rarely used if ever
93	# "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161	93	# "${FILESDIR}"/${PN}-3.0.30-ebuildshell.patch # 155161
94	"${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062	94	"${FILESDIR}"/${PN}-3.0.30-interrevisions.patch # 832062
		95	"${FILESDIR}"/${PN}-3.0.49-prefix-stage2.patch
95	)	96	)
96		97
97	distutils-r1_python_prepare_all	98	distutils-r1_python_prepare_all





LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
IUSE="
	default-compiler-rt default-libcxx default-lld llvm-libunwind
	hardened stricter
	bootstrap-prefix
"

PDEPEND="

	newbashcomp bash-autocomplete.sh clang

	insinto /etc/clang

	newins - gentoo-runtimes.cfg <<-EOF
		# This file is initially generated by sys-devel/clang-runtime.
		# It is used to control the default runtimes using by clang.

			@gentoo-common.cfg
		EOF
	done

	if use kernel_Darwin; then
		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
			# Gentoo Prefix on Darwin
			-Wl,-search_paths_first
			-Wl,-rpath,${EPREFIX}/usr/lib
			-L ${EPREFIX}/usr/lib
			-isystem ${EPREFIX}/usr/include
			-isysroot ${EPREFIX}/MacOSX.sdk
		EOF
		if use bootstrap-prefix ; then
			cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
				-Wl,-rpath,${EPREFIX}/../usr/lib
			EOF
		fi
		cat >> "${ED}/etc/clang/clang++.cfg" <<-EOF || die
			-lc++abi
		EOF
	fi
}

pkg_preinst() {

Lines 10-16 HOMEPAGE="https://clang.llvm.org/" Link Here

(-)a/sys-devel/clang-runtime/clang-runtime-16.0.6.ebuild (-1 / +1 lines)
10		10
11	LICENSE="metapackage"	11	LICENSE="metapackage"
12	SLOT="${PV%%.*}"	12	SLOT="${PV%%.*}"
13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
14	IUSE="+compiler-rt libcxx openmp +sanitize"	14	IUSE="+compiler-rt libcxx openmp +sanitize"
15	REQUIRED_USE="sanitize? ( compiler-rt )"	15	REQUIRED_USE="sanitize? ( compiler-rt )"
16		16

Lines 12-18 S=${WORKDIR} Link Here

(-)a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-16-r2.ebuild (-1 / +1 lines)
12		12
13	LICENSE="public-domain"	13	LICENSE="public-domain"
14	SLOT="${PV}"	14	SLOT="${PV}"
15	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"	15	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
16	IUSE="gcc-symlinks multilib-symlinks +native-symlinks"	16	IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
17		17
18	# Blocker for bug #872416	18	# Blocker for bug #872416

Lines 16-22 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-devel/clang/clang-16.0.6.ebuild (-1 / +1 lines)
16		16
17	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"	17	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
18	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"	18	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
19	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"	19	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~x64-macos"
20	IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"	20	IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
21	REQUIRED_USE="${PYTHON_REQUIRED_USE}"	21	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
22	RESTRICT="!test? ( test )"	22	RESTRICT="!test? ( test )"

Lines 76-81 src_prepare() { Link Here

(-)a/sys-devel/libtool/libtool-2.4.7-r1.ebuild (+1 lines)
76	# return the correct result for -print-search-dirs (doesn't	76	# return the correct result for -print-search-dirs (doesn't
77	# include prefix dirs ...).	77	# include prefix dirs ...).
78	eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch	78	eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
		79	sed -i -e 's/.keep_private_externs./:/' m4/libtool.m4 \|\| die
79	eprefixify m4/libtool.m4	80	eprefixify m4/libtool.m4
80	fi	81	fi
81		82

Lines 12-18 S=${WORKDIR} Link Here

(-)a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-16-r2.ebuild (-1 / +1 lines)
12		12
13	LICENSE="public-domain"	13	LICENSE="public-domain"
14	SLOT="${PV}"	14	SLOT="${PV}"
15	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86"	15	KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 ~riscv ~x86 ~arm64-macos"
16	IUSE="multilib-symlinks +native-symlinks"	16	IUSE="multilib-symlinks +native-symlinks"
17		17
18	RDEPEND="	18	RDEPEND="

Lines 11-17 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-devel/lld/lld-16.0.6.ebuild (-1 / +1 lines)
11		11
12	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"	12	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
13	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"	13	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
14	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"	14	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~arm64-macos"
15	IUSE="debug test zstd"	15	IUSE="debug test zstd"
16	RESTRICT="!test? ( test )"	16	RESTRICT="!test? ( test )"
17		17

Lines 10-16 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-devel/llvm-common/llvm-common-16.0.6.ebuild (-1 / +1 lines)
10		10
11	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"	11	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
12	SLOT="0"	12	SLOT="0"
13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
14		14
15	RDEPEND="	15	RDEPEND="
16	!sys-devel/llvm:0	16	!sys-devel/llvm:0

Lines 12-18 S=${WORKDIR} Link Here

(-)a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-16-r1.ebuild (-1 / +1 lines)
12		12
13	LICENSE="public-domain"	13	LICENSE="public-domain"
14	SLOT="${PV}"	14	SLOT="${PV}"
15	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	15	KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
16	IUSE="multilib-symlinks +native-symlinks"	16	IUSE="multilib-symlinks +native-symlinks"
17		17
18	RDEPEND="	18	RDEPEND="

Lines 19-25 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-devel/llvm/llvm-16.0.6.ebuild (-2 / +1 lines)
19		19
20	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"	20	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
21	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"	21	SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
22	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	22	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
23	IUSE="	23	IUSE="
24	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar	24	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
25	xml z3 zstd	25	xml z3 zstd
Lines 48-54 BDEPEND=" Link Here
48	sys-devel/gnuconfig	48	sys-devel/gnuconfig
49	kernel_Darwin? (	49	kernel_Darwin? (
50	<sys-libs/libcxx-${LLVM_VERSION}.9999	50	<sys-libs/libcxx-${LLVM_VERSION}.9999
51	>=sys-devel/binutils-apple-5.1
52	)	51	)
53	doc? ( $(python_gen_any_dep '	52	doc? ( $(python_gen_any_dep '
54	dev-python/recommonmark[${PYTHON_USEDEP}]	53	dev-python/recommonmark[${PYTHON_USEDEP}]

Lines 18-24 else Link Here

(-)a/sys-devel/slibtool/slibtool-0.5.34.ebuild (-1 / +1 lines)
18	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"	18	SRC_URI="https://dl.midipix.org/slibtool/${P}.tar.xz"
19	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"	19	SRC_URI+=" verify-sig? ( https://dl.midipix.org/slibtool/${P}.tar.xz.sig )"
20		20
21	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"	21	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
22		22
23	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"	23	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-midipix )"
24	fi	24	fi

Lines 22-28 SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz Link Here

(-)a/sys-libs/binutils-libs/binutils-libs-2.40-r5.ebuild (-1 / +1 lines)
22	LICENSE="\|\| ( GPL-3 LGPL-3 )"	22	LICENSE="\|\| ( GPL-3 LGPL-3 )"
23	SLOT="0/${PV%_p?}"	23	SLOT="0/${PV%_p?}"
24	IUSE="64-bit-bfd cet multitarget nls static-libs test"	24	IUSE="64-bit-bfd cet multitarget nls static-libs test"
25	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"	25	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
26	RESTRICT="!test? ( test )"	26	RESTRICT="!test? ( test )"
27		27
28	BDEPEND="	28	BDEPEND="

Lines 11-17 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-libs/compiler-rt/compiler-rt-16.0.6.ebuild (-1 / +1 lines)
11		11
12	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"	12	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"
13	SLOT="${LLVM_MAJOR}"	13	SLOT="${LLVM_MAJOR}"
14	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	14	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
15	IUSE="+abi_x86_32 abi_x86_64 +clang debug test"	15	IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
16	RESTRICT="!test? ( test ) !clang? ( test )"	16	RESTRICT="!test? ( test ) !clang? ( test )"
17		17

Lines 12-18 HOMEPAGE="https://libcxx.llvm.org/" Link Here

(-)a/sys-libs/libcxx/libcxx-16.0.6.ebuild (-1 / +1 lines)
12		12
13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"	13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"	15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
16	IUSE="+clang +libcxxabi static-libs test"	16	IUSE="+clang +libcxxabi static-libs test"
17	REQUIRED_USE="test? ( clang )"	17	REQUIRED_USE="test? ( clang )"
18	RESTRICT="!test? ( test )"	18	RESTRICT="!test? ( test )"

Lines 12-18 HOMEPAGE="https://libcxxabi.llvm.org/" Link Here

(-)a/sys-libs/libcxxabi/libcxxabi-16.0.6.ebuild (-1 / +1 lines)
12		12
13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"	13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~x64-macos"	15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
16	IUSE="+clang static-libs test"	16	IUSE="+clang static-libs test"
17	REQUIRED_USE="test? ( clang )"	17	REQUIRED_USE="test? ( clang )"
18	RESTRICT="!test? ( test )"	18	RESTRICT="!test? ( test )"

Lines 12-18 HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" Link Here

(-)a/sys-libs/llvm-libunwind/llvm-libunwind-16.0.6.ebuild (-1 / +1 lines)
12		12
13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"	13	LICENSE="Apache-2.0-with-LLVM-exceptions \|\| ( UoI-NCSA MIT )"
14	SLOT="0"	14	SLOT="0"
15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"	15	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~arm64-macos ~x64-macos"
16	IUSE="+clang debug static-libs test"	16	IUSE="+clang debug static-libs test"
17	REQUIRED_USE="test? ( clang )"	17	REQUIRED_USE="test? ( clang )"
18	RESTRICT="!test? ( test )"	18	RESTRICT="!test? ( test )"

Lines 70-76 multilib_src_configure() { Link Here

(-)a/sys-libs/zlib/zlib-1.2.13-r1.ebuild (-1 / +3 lines)
70	# https://github.com/gentoo/gentoo/pull/28355	70	# https://github.com/gentoo/gentoo/pull/28355
71	# mold needs this too but right now tc-ld-is-mold is also not available	71	# mold needs this too but right now tc-ld-is-mold is also not available
72	if tc-ld-is-lld; then	72	if tc-ld-is-lld; then
73	append-ldflags -Wl,--undefined-version	73	if ! use kernel_Darwin; then
		74	append-ldflags -Wl,--undefined-version
		75	fi
74	fi	76	fi
75		77
76	case ${CHOST} in	78	case ${CHOST} in

Return to bug 758167

Line 0 Link Here

(-)a/profiles/prefix/darwin/macos/13.0/arm64/clang/package.use (+30 lines)
	1	# Disable bootstrapping libcxx* with libunwind
	2	sys-libs/libcxxabi -libunwind
	3	sys-libs/libcxx -libunwind
	4	# Most binary Linux distributions seem to fancy toolchains that
	5	# do not do c++ support (need to install a separate package).
	6	sys-libs/ncurses -cxx
	7	sys-devel/binutils -cxx
	8	# gmp has cxx flag enabled by default. When dealing with a host
	9	# compiler without cxx support this causes configure failure.
	10	# In addition, The stage2 g++ is only for compiling stage3 compiler,
	11	# because the host libstdc++.so runtime may be not compatible and
	12	# stage2 libstdc++.so might conflict with that of stage3. The
	13	# trade-off is just not to use cxx.
	14	dev-libs/gmp -cxx
	15	sys-devel/binutils -gold
	16	# Disable bootstrapping libcxx* with libunwind
	17	sys-libs/libcxxabi -libunwind
	18	sys-libs/libcxx -libunwind
	19	# Most binary Linux distributions seem to fancy toolchains that
	20	# do not do c++ support (need to install a separate package).
	21	sys-libs/ncurses -cxx
	22	sys-devel/binutils -cxx
	23	# gmp has cxx flag enabled by default. When dealing with a host
	24	# compiler without cxx support this causes configure failure.
	25	# In addition, The stage2 g++ is only for compiling stage3 compiler,
	26	# because the host libstdc++.so runtime may be not compatible and
	27	# stage2 libstdc++.so might conflict with that of stage3. The
	28	# trade-off is just not to use cxx.
	29	dev-libs/gmp -cxx
	30	sys-devel/binutils -gold

Line 0 Link Here

(-)a/sys-apps/portage/files/portage-3.0.49-prefix-stage2.patch (+16 lines)
	1	During first part of stage3, some programs are installed from EPREFIX/tmp to EPREFIX which break this qa check
	2	The check I'm adding is heavy-handed, but I don't know how to fix this better
	3
	4	TODO: check whether portage-3.0.30-prefix-stack.patch fixes the same issue
	5
	6	--- a/bin/install-qa-check.d/05prefix
	7	+++ b/bin/install-qa-check.d/05prefix
	8	@@ -95,6 +95,8 @@ install_qa_check_prefix() {
	9	# reasons
	10	sed -i -e '1s:^#! \?'"${line[0]}"':#!'"${EPREFIX}"${line[0]}':' "${rf}"
	11	continue
	12	+ elif [[ -n "${PORTAGE_OVERRIDE_EPREFIX}" ]] ; then
	13	+ continue
	14	else
	15	# this is definitely wrong: script in ${PATH} and invalid shebang
	16	echo "${fn#${D}}:${line[0]} (script ${fn##*/} installed in PATH but interpreter ${line[0]} not found)" \

Lines 10-19 HOMEPAGE="https://llvm.org/" Link Here

(-)a/sys-devel/clang-common/clang-common-16.0.6-r1.ebuild (-1 / +22 lines)
10		10
11	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"	11	LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
12	SLOT="0"	12	SLOT="0"
13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"	13	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos"
14	IUSE="	14	IUSE="
15	default-compiler-rt default-libcxx default-lld llvm-libunwind	15	default-compiler-rt default-libcxx default-lld llvm-libunwind
16	hardened stricter	16	hardened stricter
		17	bootstrap-prefix
17	"	18	"
18		19
19	PDEPEND="	20	PDEPEND="
Lines 67-72 src_install() { Link Here
67	newbashcomp bash-autocomplete.sh clang	68	newbashcomp bash-autocomplete.sh clang
68		69
69	insinto /etc/clang	70	insinto /etc/clang
		71
70	newins - gentoo-runtimes.cfg <<-EOF	72	newins - gentoo-runtimes.cfg <<-EOF
71	# This file is initially generated by sys-devel/clang-runtime.	73	# This file is initially generated by sys-devel/clang-runtime.
72	# It is used to control the default runtimes using by clang.	74	# It is used to control the default runtimes using by clang.
Lines 175-180 src_install() { Link Here
175	@gentoo-common.cfg	177	@gentoo-common.cfg
176	EOF	178	EOF
177	done	179	done
		180
		181	if use kernel_Darwin; then
		182	cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF \|\| die
		183	# Gentoo Prefix on Darwin
		184	-Wl,-search_paths_first
		185	-Wl,-rpath,${EPREFIX}/usr/lib
		186	-L ${EPREFIX}/usr/lib
		187	-isystem ${EPREFIX}/usr/include
		188	-isysroot ${EPREFIX}/MacOSX.sdk
		189	EOF
		190	if use bootstrap-prefix ; then
		191	cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF \|\| die
		192	-Wl,-rpath,${EPREFIX}/../usr/lib
		193	EOF
		194	fi
		195	cat >> "${ED}/etc/clang/clang++.cfg" <<-EOF \|\| die
		196	-lc++abi
		197	EOF
		198	fi
178	}	199	}
179		200
180	pkg_preinst() {	201	pkg_preinst() {