mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 22:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

dev-build/meson: Sync with Gentoo

Browse Source 
It's from Gentoo commit 7eca49abfbb82f783f10318780b53224d17968f0.
This commit is contained in:
Krzesimir Nowak 2024-01-15 15:11:25 +01:00
parent a00b1ebb45
commit e66a4b1e6e
11 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sdk_container/src/third_party/portage-stable/dev-build/meson/files/meson-1.3.1-xtools-support.patch vendored Normal file
View File

@ -0,0 +1,26 @@
linkers_detect: detect xtools (Apple ld64 derivative)
xtools is in use on x86_64 and ppc based darwin Prefix installs. Pick
it up as a valid linker.
Meson is the only thing known at this point to try and figure out what
linker is in use exactly, so instead of changing the linker (xtools),
just teach Meson about xtools.
Author: Fabian Groffen <grobian@gentoo.org>
Bug: https://bugs.gentoo.org/868516
--- a/mesonbuild/linkers/detect.py
+++ b/mesonbuild/linkers/detect.py
@@ -185,6 +185,11 @@
v = search_version(o)
linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
+ # detect xtools first, bug #868516
+ elif 'xtools-' in o.split('\n')[0]:
+ xtools = o.split(' ')[0]
+ v = xtools.split('-')[1]
+ linker = AppleDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v)
# First might be apple clang, second is for real gcc, the third is icc.
# Note that "ld: unknown option: " sometimes instead is "ld: unknown options:".
elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e or 'ld: unknown option' in e:

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.1.1.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r1.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.1-r2.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2-r1.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.2.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.2.3.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r1.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

6
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.0-r2.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -24,7 +24,7 @@ else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
if [[ ${PV} != *_rc* ]] ; then if [[ ${PV} != *_rc* ]] ; then
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" 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"
fi fi
fi fi
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig

5
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-1.3.1.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig
@ -54,6 +54,7 @@ RDEPEND="
PATCHES=( PATCHES=(
"${FILESDIR}"/${PN}-1.2.1-python-path.patch "${FILESDIR}"/${PN}-1.2.1-python-path.patch
"${FILESDIR}"/${PN}-1.3.1-xtools-support.patch
# backport fix for hiding compiler warnings (such as Modern C) in vala and cython # backport fix for hiding compiler warnings (such as Modern C) in vala and cython
"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch

4
sdk_container/src/third_party/portage-stable/dev-build/meson/meson-9999.ebuild vendored
View File

@ -1,4 +1,4 @@
# Copyright 2016-2023 Gentoo Authors # Copyright 2016-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=8
@ -42,7 +42,7 @@ DEPEND="
test? ( test? (
dev-libs/glib:2 dev-libs/glib:2
dev-libs/gobject-introspection dev-libs/gobject-introspection
dev-util/ninja app-alternatives/ninja
dev-vcs/git dev-vcs/git
sys-libs/zlib[static-libs(+)] sys-libs/zlib[static-libs(+)]
virtual/pkgconfig virtual/pkgconfig