gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2024-01-02 05:31:47 +00:00
parent ec91f58b63 11b322b55f
commit d43d6135e2
8 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dev-lang/php/php-8.3.0-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,7 +20,7 @@ LICENSE="PHP-3.01
unicode? ( BSD-2 LGPL-2.1 )"
SLOT="$(ver_cut 1-2)"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~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 ~ppc-macos ~x64-macos"
# We can build the following SAPIs in the given order
SAPIS="embed cli cgi fpm apache2 phpdbg"

6
profiles/arch/alpha/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# matoro <matoro_gentoo@matoro.tk> (2023-11-24)
# dev-util/glslang not keyworded here.
media-video/ffmpeg glslang

6
profiles/arch/hppa/package.use.mask
View File

@@ -1,9 +1,13 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NOTE: When masking a USE flag due to missing keywords, please file a keyword
# request bug for the hppa arch.
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
# sys-apps/xdg-desktop-portal not keyworded here yet
x11-base/xwayland libei

6
profiles/arch/ia64/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# David Seifert <soap@gentoo.org> (2023-12-30)
# sys-auth/sssd not keyworded here anymore
app-admin/sudo sssd

6
profiles/arch/mips/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# matoro <matoro_gentoo@matoro.tk> (2023-12-22)
# Overflows R_MIPS_TLS_GOTTPREL with LTO
# https://github.com/rust-lang/rust/issues/118794

6
profiles/arch/s390/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
# sys-apps/xdg-desktop-portal not keyworded here yet
x11-base/xwayland libei

7
profiles/arch/sparc/package.use.mask
View File

@@ -1,6 +1,10 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2024-01-02)
# dev-libs/capstone not keyworded here
dev-lang/php capstone
# Mart Raudsepp <leio@gentoo.org> (2023-12-25)
# sys-apps/xdg-desktop-portal not keyworded here yet
x11-base/xwayland libei
@@ -212,7 +216,6 @@ dev-cpp/eigen test
# Sam James <sam@gentoo.org> (2021-04-27)
# Deps not yet tested/keyworded.
sys-devel/clang default-compiler-rt default-lld
sys-devel/clang-common default-compiler-rt default-lld
sys-devel/clang-runtime compiler-rt
sys-devel/llvm z3

21
www-client/chromium/chromium-120.0.6099.129.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 2009-2023 Gentoo Authors
# Copyright 2009-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,6 +23,9 @@ GN_MIN_VER=0.2122
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120:
# webrtc - no matching member function for call to 'emplace'
: ${CHROMIUM_FORCE_LIBCXX=yes}
# This variable is set to yes when building with bfd is broken.
# See bug #918897 for arm64 where bfd can't handle the size.
: ${CHROMIUM_FORCE_LLD=no}
VIRTUALX_REQUIRED="pgo"
@@ -210,6 +213,13 @@ if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
BDEPEND+=" >=sys-devel/clang-${LLVM_MIN_SLOT}"
fi
if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then
BDEPEND+=" >=sys-devel/lld-${LLVM_MIN_SLOT}"
else
# XXX: Hack for arm64 for bug #918897
BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )"
fi
if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
fi
@@ -247,6 +257,11 @@ python_check_deps() {
python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
}
needs_lld() {
# XXX: Temporary hack w/ use arm64 for bug #918897
[[ ${CHROMIUM_FORCE_LLD} == yes ]] || use arm64
}
needs_clang() {
[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
}
@@ -705,7 +720,9 @@ chromium_configure() {
fi
# Force lld for lto and pgo builds, otherwise disable, bug 641556
if use lto || use pgo; then
if needs_lld || use lto || use pgo; then
# https://bugs.gentoo.org/918897#c32
append-ldflags -Wl,--undefined-version
myconf_gn+=" use_lld=true"
else
myconf_gn+=" use_lld=false"