* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2018-10-07 0:26 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2018-10-07 0:26 UTC (permalink / raw
To: gentoo-commits
commit: fbc2ce256a57d79917378e5e16916771c58c84e2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 00:26:14 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 00:26:14 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbc2ce25
dev-util/meson: backport fix for meson test -u
Closes: https://bugs.gentoo.org/667010
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/files/0.48.0-test-u.patch | 28 ++++++++++++++++++++++
...son-0.48.0-r1.ebuild => meson-0.48.0-r2.ebuild} | 1 +
2 files changed, 29 insertions(+)
diff --git a/dev-util/meson/files/0.48.0-test-u.patch b/dev-util/meson/files/0.48.0-test-u.patch
new file mode 100644
index 00000000000..099d4686b96
--- /dev/null
+++ b/dev-util/meson/files/0.48.0-test-u.patch
@@ -0,0 +1,28 @@
+From 99ecedc0930a99fb4d084208964e4c7922a6efec Mon Sep 17 00:00:00 2001
+From: Masanori Kakura <kakurasan@gmail.com>
+Date: Tue, 25 Sep 2018 18:04:06 +0900
+Subject: [PATCH] environment: Use os.path.basename() when checking
+ mesonlib.meson_command
+
+Without this, when one of Meson's parent directories contains
+"python", unexpected option "-u" will be passed to Meson.
+---
+ mesonbuild/environment.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 7a44f2fd..a0c2fda4 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -375,7 +375,7 @@ class Environment:
+
+ def get_build_command(self, unbuffered=False):
+ cmd = mesonlib.meson_command[:]
+- if unbuffered and 'python' in cmd[0]:
++ if unbuffered and 'python' in os.path.basename(cmd[0]):
+ cmd.insert(1, '-u')
+ return cmd
+
+--
+2.19.0
+
diff --git a/dev-util/meson/meson-0.48.0-r1.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
similarity index 96%
rename from dev-util/meson/meson-0.48.0-r1.ebuild
rename to dev-util/meson/meson-0.48.0-r2.ebuild
index d0fbb01b472..aa2d0f068eb 100644
--- a/dev-util/meson/meson-0.48.0-r1.ebuild
+++ b/dev-util/meson/meson-0.48.0-r2.ebuild
@@ -27,6 +27,7 @@ RDEPEND=""
PATCHES=(
"${FILESDIR}"/0.48.0-multilib.patch
+ "${FILESDIR}"/0.48.0-test-u.patch
)
python_test() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2018-10-07 2:27 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2018-10-07 2:27 UTC (permalink / raw
To: gentoo-commits
commit: 259dbf56826547e21d7d3a0b6764f030db7e0782
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 7 02:26:40 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 7 02:27:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259dbf56
dev-util/meson: enable test phase
Closes: https://bugs.gentoo.org/615028
Package-Manager: Portage-2.3.50_p14, Repoman-2.3.11_p21
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/files/test-llvm.patch | 26 ++++++++++++++++++++++++++
dev-util/meson/meson-0.48.0-r2.ebuild | 12 ++++++++++--
dev-util/meson/meson-9999.ebuild | 15 +++++++++++++--
3 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/dev-util/meson/files/test-llvm.patch b/dev-util/meson/files/test-llvm.patch
new file mode 100644
index 00000000000..af7b9834bf3
--- /dev/null
+++ b/dev-util/meson/files/test-llvm.patch
@@ -0,0 +1,26 @@
+From 40457b1faa2c5b274447838ff1a041a8030c6c22 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 6 Oct 2018 21:11:36 -0400
+Subject: [PATCH] Disable testing of static llvm linkage
+
+Gentoo doesn't provide static libs for llvm.
+---
+ test cases/frameworks/15 llvm/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test cases/frameworks/15 llvm/meson.build b/test cases/frameworks/15 llvm/meson.build
+index e05fddd2..9b38a454 100644
+--- a/test cases/frameworks/15 llvm/meson.build
++++ b/test cases/frameworks/15 llvm/meson.build
+@@ -20,7 +20,7 @@ if not dep_tinfo.found()
+ dep_tinfo = cpp.find_library('tinfo', required: false)
+ endif
+
+-foreach static : [true, false]
++foreach static : [false]
+ llvm_dep = dependency(
+ 'llvm',
+ modules : ['bitwriter', 'asmprinter', 'executionengine', 'target',
+--
+2.19.0
+
diff --git a/dev-util/meson/meson-0.48.0-r2.ebuild b/dev-util/meson/meson-0.48.0-r2.ebuild
index aa2d0f068eb..653033f818b 100644
--- a/dev-util/meson/meson-0.48.0-r2.ebuild
+++ b/dev-util/meson/meson-0.48.0-r2.ebuild
@@ -20,18 +20,26 @@ HOMEPAGE="http://mesonbuild.com/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-RESTRICT="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
PATCHES=(
+ "${FILESDIR}"/test-llvm.patch
"${FILESDIR}"/0.48.0-multilib.patch
"${FILESDIR}"/0.48.0-test-u.patch
)
python_test() {
- ${EPYTHON} run_tests.py || die
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ ${EPYTHON} -u run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
}
python_install_all() {
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index aace7f3caa4..0d5b9b4711c 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -20,13 +20,24 @@ HOMEPAGE="http://mesonbuild.com/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-RESTRICT="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
+PATCHES=(
+ "${FILESDIR}"/test-llvm.patch
+)
+
python_test() {
- ${EPYTHON} run_tests.py || die
+ (
+ # test_meson_installed
+ unset PYTHONDONTWRITEBYTECODE
+
+ # test_cross_file_system_paths
+ unset XDG_DATA_HOME
+
+ ${EPYTHON} -u run_tests.py
+ ) || die "Testing failed with ${EPYTHON}"
}
python_install_all() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2019-08-22 15:52 William Hubbs
0 siblings, 0 replies; 12+ messages in thread
From: William Hubbs @ 2019-08-22 15:52 UTC (permalink / raw
To: gentoo-commits
commit: b2e403b1859fddabf72e812090e1f7107eb26617
Author: William Hubbs <william.hubbs <AT> sony <DOT> com>
AuthorDate: Thu Aug 22 15:48:59 2019 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 15:52:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e403b1
dev-util/meson: remove several old versions
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
dev-util/meson/Manifest | 2 -
.../meson/files/meson-0.49-python3.5-tests.patch | 34 ----------
dev-util/meson/meson-0.48.2.ebuild | 73 ---------------------
dev-util/meson/meson-0.49.2.ebuild | 76 ----------------------
4 files changed, 185 deletions(-)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 0abdbfd7c1c..f0545ae0c90 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,4 +1,2 @@
-DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
-DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
deleted file mode 100644
index 640348b2bc2..00000000000
--- a/dev-util/meson/files/meson-0.49-python3.5-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 11 Jan 2019 18:03:15 +0000
-Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess
- invocation
-
-subprocess.run() didn't get the encoding parameter until 3.6.
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- run_unittests.py | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 342ad883..e1246140 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests):
- ret = subprocess.run(
- ["{}"] + extra_args,
- stdout=subprocess.PIPE,
-- stderr=subprocess.PIPE,
-- encoding='utf-8')
-- print(ret.stdout)
-- print(ret.stderr, file=sys.stderr)
-+ stderr=subprocess.PIPE)
-+ print(ret.stdout.decode('utf-8'))
-+ print(ret.stderr.decode('utf-8'), file=sys.stderr)
- sys.exit(ret.returncode)
-
- if __name__ == '__main__':
---
-2.21.0
-
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
deleted file mode 100644
index b6374c8e969..00000000000
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- if tc-is-gcc; then
- # LTO fails for static libs because the bfd plugin in missing.
- # Remove this workaround after sys-devel/gcc-config-2.0 is stable.
- # https://bugs.gentoo.org/672706
- tc-getPROG AR gcc-ar >/dev/null
- fi
- distutils-r1_src_test
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
deleted file mode 100644
index 795f89a188d..00000000000
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- virtual/pkgconfig
- )
-"
-
-PATCHES=(
- "${FILESDIR}/meson-0.49-python3.5-tests.patch"
-)
-
-python_prepare_all() {
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2020-05-24 16:46 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2020-05-24 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 61fb31c86760964f605b8e78cf9c6450a8a0fbbd
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:41:30 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:41:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fb31c8
dev-util/meson: bump to 0.45.2
Closes: https://bugs.gentoo.org/721786
Closes: https://bugs.gentoo.org/723224
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/Manifest | 1 +
dev-util/meson/files/0.54.2-multilib-clang.patch | 181 +++++++++++++++++++++
.../{meson-9999.ebuild => meson-0.54.2.ebuild} | 19 +++
dev-util/meson/meson-9999.ebuild | 15 ++
4 files changed, 216 insertions(+)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fab95ba0c3e..3ac6a08caa1 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,3 +2,4 @@ DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda
DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
+DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
diff --git a/dev-util/meson/files/0.54.2-multilib-clang.patch b/dev-util/meson/files/0.54.2-multilib-clang.patch
new file mode 100644
index 00000000000..b3aa3693e69
--- /dev/null
+++ b/dev-util/meson/files/0.54.2-multilib-clang.patch
@@ -0,0 +1,181 @@
+From 9dc3ca2c1c9fbb47e731551c6432df144f725261 Mon Sep 17 00:00:00 2001
+From: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
+Date: Thu, 21 May 2020 18:58:47 +0300
+Subject: [PATCH] compilers: add fetching of define list for clang
+
+Simmilar to gcc, the list of pre-processor defines can be fetched with
+`-dM -E` option. The way cpu_family is determined on linux relies on
+this list.
+
+Fixes incorrect value of cpu_family on linux, when crosscompiling:
+
+```
+CC="clang -m32" meson ./build
+```
+
+Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
+Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
+---
+ mesonbuild/compilers/c.py | 5 +++--
+ mesonbuild/compilers/cpp.py | 5 +++--
+ mesonbuild/compilers/fortran.py | 2 +-
+ mesonbuild/compilers/mixins/clang.py | 9 ++++++++-
+ mesonbuild/compilers/objc.py | 2 +-
+ mesonbuild/compilers/objcpp.py | 2 +-
+ mesonbuild/environment.py | 26 +++++++++++++++++++++++++-
+ 7 files changed, 42 insertions(+), 9 deletions(-)
+
+diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
+index 1bc9e84998..aac99b4269 100644
+--- a/mesonbuild/compilers/c.py
++++ b/mesonbuild/compilers/c.py
+@@ -86,9 +86,10 @@ class ClangCCompiler(ClangCompiler, CCompiler):
+ _C18_VERSION = '>=8.0.0'
+
+ def __init__(self, exelist, version, for_machine: MachineChoice,
+- is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
++ is_cross, info: 'MachineInfo', exe_wrapper=None,
++ defines: T.Optional[T.List[str]] = None, **kwargs):
+ CCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
+- ClangCompiler.__init__(self)
++ ClangCompiler.__init__(self, defines)
+ default_warn_args = ['-Wall', '-Winvalid-pch']
+ self.warn_args = {'0': [],
+ '1': default_warn_args,
+diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
+index f4bcfa9f89..478a68c13c 100644
+--- a/mesonbuild/compilers/cpp.py
++++ b/mesonbuild/compilers/cpp.py
+@@ -155,10 +155,11 @@ def _find_best_cpp_std(self, cpp_std):
+
+ class ClangCPPCompiler(ClangCompiler, CPPCompiler):
+ def __init__(self, exelist, version, for_machine: MachineChoice,
+- is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
++ is_cross, info: 'MachineInfo', exe_wrapper=None,
++ defines : T.Optional[T.List[str]] = None, **kwargs):
+ CPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
+ info, exe_wrapper, **kwargs)
+- ClangCompiler.__init__(self)
++ ClangCompiler.__init__(self, defines)
+ default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
+ self.warn_args = {'0': [],
+ '1': default_warn_args,
+diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
+index c155b5b4f3..af83c0e564 100644
+--- a/mesonbuild/compilers/fortran.py
++++ b/mesonbuild/compilers/fortran.py
+@@ -424,7 +424,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
+ **kwargs):
+ FortranCompiler.__init__(self, exelist, version, for_machine,
+ is_cross, info, exe_wrapper, **kwargs)
+- ClangCompiler.__init__(self)
++ ClangCompiler.__init__(self, [])
+ self.id = 'flang'
+ default_warn_args = ['-Minform=inform']
+ self.warn_args = {'0': [],
+diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
+index 1c0ee452f4..0ee10ad5d5 100644
+--- a/mesonbuild/compilers/mixins/clang.py
++++ b/mesonbuild/compilers/mixins/clang.py
+@@ -42,9 +42,10 @@
+ } # type: T.Dict[str, T.List[str]]
+
+ class ClangCompiler(GnuLikeCompiler):
+- def __init__(self):
++ def __init__(self, defines: T.Optional[T.Dict[str, str]]):
+ super().__init__()
+ self.id = 'clang'
++ self.defines = defines or {}
+ self.base_options.append('b_colorout')
+ # TODO: this really should be part of the linker base_options, but
+ # linkers don't have base_options.
+@@ -56,6 +57,12 @@ def __init__(self):
+ def get_colorout_args(self, colortype: str) -> T.List[str]:
+ return clang_color_args[colortype][:]
+
++ def has_builtin_define(self, define: str) -> bool:
++ return define in self.defines
++
++ def get_builtin_define(self, define: str) -> T.Optional[str]:
++ return self.defines.get(define)
++
+ def get_optimization_args(self, optimization_level: str) -> T.List[str]:
+ return clang_optimization_args[optimization_level]
+
+diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
+index 52d258dcdb..d351c8826a 100644
+--- a/mesonbuild/compilers/objc.py
++++ b/mesonbuild/compilers/objc.py
+@@ -86,7 +86,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
+ **kwargs):
+ ObjCCompiler.__init__(self, exelist, version, for_machine, is_cross,
+ info, exe_wrapper, **kwargs)
+- ClangCompiler.__init__(self)
++ ClangCompiler.__init__(self, [])
+ default_warn_args = ['-Wall', '-Winvalid-pch']
+ self.warn_args = {'0': [],
+ '1': default_warn_args,
+diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
+index c8b422b35d..10555b4551 100644
+--- a/mesonbuild/compilers/objcpp.py
++++ b/mesonbuild/compilers/objcpp.py
+@@ -84,7 +84,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
+ is_cross, info: 'MachineInfo', exe_wrapper=None,
+ **kwargs):
+ ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
+- ClangCompiler.__init__(self)
++ ClangCompiler.__init__(self, [])
+ default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
+ self.warn_args = {'0': [],
+ '1': default_warn_args,
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index 8fad6288b1..cb6ae7d514 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -726,6 +726,28 @@ def get_lcc_version_from_defines(defines):
+ minor = defines.get('__LCC_MINOR__', '0')
+ return dot.join((generation, major, minor))
+
++ @staticmethod
++ def get_clang_compiler_defines(compiler):
++ """
++ Get the list of Clang pre-processor defines
++ """
++ args = compiler + ['-E', '-dM', '-']
++ p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
++ if p.returncode != 0:
++ raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)
++ defines = {}
++ for line in output.split('\n'):
++ if not line:
++ continue
++ d, *rest = line.split(' ', 2)
++ if d != '#define':
++ continue
++ if len(rest) == 1:
++ defines[rest] = True
++ if len(rest) == 2:
++ defines[rest[0]] = rest[1]
++ return defines
++
+ def _get_compilers(self, lang, for_machine):
+ '''
+ The list of compilers is detected in the exact same way for
+@@ -1043,6 +1065,8 @@ def sanitize(p):
+ if 'clang' in out:
+ linker = None
+
++ defines = self.get_clang_compiler_defines(compiler)
++
+ # Even if the for_machine is darwin, we could be using vanilla
+ # clang.
+ if 'Apple' in out:
+@@ -1063,7 +1087,7 @@ def sanitize(p):
+
+ return cls(
+ ccache + compiler, version, for_machine, is_cross, info,
+- exe_wrap, full_version=full_version, linker=linker)
++ exe_wrap, defines, full_version=full_version, linker=linker)
+
+ if 'Intel(R) C++ Intel(R)' in err:
+ version = search_version(err)
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-0.54.2.ebuild
similarity index 73%
copy from dev-util/meson/meson-9999.ebuild
copy to dev-util/meson/meson-0.54.2.ebuild
index 77f6244e6e2..2ef1f787f28 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-0.54.2.ebuild
@@ -34,6 +34,25 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/0.54.2-multilib-clang.patch
+)
+
+python_prepare_all() {
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
src_test() {
tc-export PKG_CONFIG
if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 77f6244e6e2..053a12bbeb2 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -34,6 +34,21 @@ DEPEND="
)
"
+python_prepare_all() {
+ # ASAN and sandbox both want control over LD_PRELOAD
+ # https://bugs.gentoo.org/673016
+ sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # ASAN is unsupported on some targets
+ # https://bugs.gentoo.org/692822
+ sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
+
+ # Broken due to python2 script created by python_wrapper_setup
+ rm -r "test cases/frameworks/1 boost" || die
+
+ distutils-r1_python_prepare_all
+}
+
src_test() {
tc-export PKG_CONFIG
if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2020-06-19 18:38 Fabian Groffen
0 siblings, 0 replies; 12+ messages in thread
From: Fabian Groffen @ 2020-06-19 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 52e6f6885bc2ad773632576a5262b5f51509c4cc
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 19 18:36:55 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 19 18:37:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52e6f688
dev-util/meson-0.54.2: fix installing binaries on Prefix
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../files/0.54.2-prefix-dont-strip-rpath.patch | 25 ++++++++++++++++++++++
dev-util/meson/meson-0.54.2.ebuild | 2 ++
dev-util/meson/meson-9999.ebuild | 2 ++
3 files changed, 29 insertions(+)
diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
new file mode 100644
index 00000000000..1fe2e1ac4cc
--- /dev/null
+++ b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
@@ -0,0 +1,25 @@
+https://bz-attachments.freebsd.org/attachment.cgi?id=204611
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128
+
+Stripping RPATH on Prefix is really bad, because it means the default
+RPATH entries disappear, and any installed binaries don't work (get
+kernel traps).
+
+Extracted the minstall patch from the FreeBSD full patch.
+
+--- a/mesonbuild/minstall.py
++++ b/mesonbuild/minstall.py
+@@ -488,8 +488,11 @@
+ printed_symlink_error = True
+ if os.path.isfile(outname):
+ try:
+- depfixer.fix_rpath(outname, install_rpath, final_path,
+- install_name_mappings, verbose=False)
++ if install_rpath:
++ depfixer.fix_rpath(outname, install_rpath, final_path,
++ install_name_mappings, verbose=False)
++ else:
++ print("RPATH changes at install time disabled")
+ except SystemExit as e:
+ if isinstance(e.code, int) and e.code == 0:
+ pass
diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild
index 7f1a4c1f652..eee417491e8 100644
--- a/dev-util/meson/meson-0.54.2.ebuild
+++ b/dev-util/meson/meson-0.54.2.ebuild
@@ -60,6 +60,8 @@ python_prepare_all() {
# Broken due to python2 script created by python_wrapper_setup
rm -r "test cases/frameworks/1 boost" || die
+ use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
+
distutils-r1_python_prepare_all
}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 5cd9c5f13bb..edbd30f5116 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -56,6 +56,8 @@ python_prepare_all() {
# Broken due to python2 script created by python_wrapper_setup
rm -r "test cases/frameworks/1 boost" || die
+ use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
+
distutils-r1_python_prepare_all
}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2020-07-04 23:45 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2020-07-04 23:45 UTC (permalink / raw
To: gentoo-commits
commit: 51a987701a7e0541fde86acad1cd9de3c6e6272c
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 23:44:54 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 23:44:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a98770
dev-util/meson: remove old
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/Manifest | 4 -
.../files/0.52.1-test_pkgconfig_gen_deps.patch | 46 ------------
.../files/0.53.1-remove-asan-ld_preload.patch | 27 -------
dev-util/meson/files/0.53.1-remove-asan.patch | 27 -------
dev-util/meson/meson-0.52.1.ebuild | 86 ----------------------
dev-util/meson/meson-0.53.1.ebuild | 84 ---------------------
dev-util/meson/meson-0.54.0.ebuild | 67 -----------------
dev-util/meson/meson-0.54.1.ebuild | 82 ---------------------
8 files changed, 423 deletions(-)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 5252e89d8ce..8f3c5fdd8c9 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,2 @@
-DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
-DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
-DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
-DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
deleted file mode 100644
index ec753e00230..00000000000
--- a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 13 Jan 2020 23:46:09 -0500
-Subject: [PATCH] test_pkgconfig_gen_deps: set
- PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib
-
-pkgconf automatically prunes "system library paths" from its output. The
-system library paths depend on the system toolchain. A common value on a
-64-bit system is as follows:
-
-/lib64:/usr/lib64:/usr/local/lib64
-
-So, if -L/usr/lib64 appears in the Libs section, it will be pruned from
-the output of pkg-config --libs.
-
-The pc files generated for this test contain something like this:
-
-libdir=/usr/lib
-Libs: -L${libdir} ...
-
-pkgconf may not consider /usr/lib to be a system library path, so it is
-not pruned as the test expects. To work around this, override the
-compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH
-environment variable.
-
-Fixes: https://github.com/mesonbuild/meson/issues/6004
----
- run_unittests.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 898f05e54d..5a60b9b6a4 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self):
- privatedir2 = self.privatedir
-
- os.environ
-- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])}
-+ env = {
-+ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]),
-+ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib',
-+ }
- self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env)
-
- # pkg-config strips some duplicated flags so we have to parse the
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
deleted file mode 100644
index 4ee11829904..00000000000
--- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:24:42 -0600
-Subject: [PATCH 1/2] remove asan ld_preload
-
-ASAN and sandbox both want control over LD_PRELOAD
-https://bugs.gentoo.org/673016
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 676604f4..1c9aaf0c 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
- r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
-
- @skip_if_not_base_option('b_sanitize')
-- def test_generate_gir_with_address_sanitizer(self):
-+ def _test_generate_gir_with_address_sanitizer(self):
- if is_cygwin():
- raise unittest.SkipTest('asan not available on Cygwin')
- if is_openbsd():
---
-2.24.1
-
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
deleted file mode 100644
index 4cc2aead0ba..00000000000
--- a/dev-util/meson/files/0.53.1-remove-asan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Sat, 15 Feb 2020 12:28:35 -0600
-Subject: [PATCH 2/2] remove asan
-
-ASAN is unsupported on some targets
-https://bugs.gentoo.org/692822
----
- run_unittests.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/run_unittests.py b/run_unittests.py
-index 1c9aaf0c..171ee0f0 100755
---- a/run_unittests.py
-+++ b/run_unittests.py
-@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
- self.assertEqual(install_rpath, 'baz')
-
- @skip_if_not_base_option('b_sanitize')
-- def test_pch_with_address_sanitizer(self):
-+ def _test_pch_with_address_sanitizer(self):
- if is_cygwin():
- raise unittest.SkipTest('asan not available on Cygwin')
- if is_openbsd():
---
-2.24.1
-
diff --git a/dev-util/meson/meson-0.52.1.ebuild b/dev-util/meson/meson-0.52.1.ebuild
deleted file mode 100644
index 077d7508af2..00000000000
--- a/dev-util/meson/meson-0.52.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- local PATCHES=(
- "${FILESDIR}"/0.52.1-test_pkgconfig_gen_deps.patch
- )
-
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.53.1.ebuild b/dev-util/meson/meson-0.53.1.ebuild
deleted file mode 100644
index a0802ef4fcb..00000000000
--- a/dev-util/meson/meson-0.53.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-PATCHES=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- "${FILESDIR}"/0.53.1-remove-asan-ld_preload.patch
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- "${FILESDIR}"/0.53.1-remove-asan.patch
- )
-
-python_prepare_all() {
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.0.ebuild b/dev-util/meson/meson-0.54.0.ebuild
deleted file mode 100644
index 77f6244e6e2..00000000000
--- a/dev-util/meson/meson-0.54.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.54.1.ebuild b/dev-util/meson/meson-0.54.1.ebuild
deleted file mode 100644
index 053a12bbeb2..00000000000
--- a/dev-util/meson/meson-0.54.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 2016-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- sed -i -e 's/test_pch_with_address_sanitizer/_&/' run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2021-08-27 17:06 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2021-08-27 17:06 UTC (permalink / raw
To: gentoo-commits
commit: c7c6ead31a2d6047ef2d3dd3fb60182f1456124f
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 27 17:05:07 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 27 17:05:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7c6ead3
dev-util/meson: accept floating point values for load-average
Closes: https://bugs.gentoo.org/810655
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
...on-mcompile-treat-load-average-as-a-float.patch | 28 ++++++++++++++++++++++
...{meson-0.58.2.ebuild => meson-0.58.2-r1.ebuild} | 4 ++++
...{meson-0.59.1.ebuild => meson-0.59.1-r1.ebuild} | 4 ++++
3 files changed, 36 insertions(+)
diff --git a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
new file mode 100644
index 00000000000..9effb382be2
--- /dev/null
+++ b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch
@@ -0,0 +1,28 @@
+From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 27 Aug 2021 10:17:14 -0400
+Subject: [PATCH] mcompile: treat load-average as a float
+
+`ninja -l` accepts a double. We should do the same.
+
+Bug: https://bugs.gentoo.org/810655
+---
+ mesonbuild/mcompile.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py
+index bb7ecae9b..e20485c76 100644
+--- a/mesonbuild/mcompile.py
++++ b/mesonbuild/mcompile.py
+@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None:
+ '-l', '--load-average',
+ action='store',
+ default=0,
+- type=int,
++ type=float,
+ help='The system load average to try to maintain (if supported).'
+ )
+ parser.add_argument(
+--
+2.33.0
+
diff --git a/dev-util/meson/meson-0.58.2.ebuild b/dev-util/meson/meson-0.58.2-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.58.2.ebuild
rename to dev-util/meson/meson-0.58.2-r1.ebuild
index 3056c22a3bd..0b7b12ebfbb 100644
--- a/dev-util/meson/meson-0.58.2.ebuild
+++ b/dev-util/meson/meson-0.58.2-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/dev-util/meson/meson-0.59.1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.59.1.ebuild
rename to dev-util/meson/meson-0.59.1-r1.ebuild
index e2a175666ca..5d637ceeedd 100644
--- a/dev-util/meson/meson-0.59.1.ebuild
+++ b/dev-util/meson/meson-0.59.1-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2021-12-27 3:41 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2021-12-27 3:41 UTC (permalink / raw
To: gentoo-commits
commit: d75dac93ff5c2314a224d5e9486b624a1bb0b972
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 27 03:40:45 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Dec 27 03:40:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d75dac93
dev-util/meson: drop 0.59.1-r1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/Manifest | 1 -
.../meson/files/meson-tests-rust-add-libm.patch | 22 -----
dev-util/meson/meson-0.59.1-r1.ebuild | 106 ---------------------
3 files changed, 129 deletions(-)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 450d1d3524f6..fd415add0961 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,4 +1,3 @@
-DIST meson-0.59.1.tar.gz 1944678 BLAKE2B 08dee8ada7824faf93b730bd8cf86113fe85ecf57c53a7ee4be89371004e13b99e14933761398e6db5a359c5aad07a96f99c0b5be144a75c749e40d153cefa7f SHA512 c45e29869dc681675b2643c37c892e7fff365c051edce4f2ec278fc6cee25bac6818add819e4db69d2fe3c1ba9572fc55bb8f67fe791cdc9c187627c71b01963
DIST meson-0.59.4.tar.gz 1953211 BLAKE2B e8699c274e60708e798ab7a57e096e606ba1552d4062a909610f5a8db8d27b864a9b9f01f32d68f65e0dcc2a75add7916617861edcc6058fc44c312e7a56048c SHA512 e02d13a4af592078c4dc34a1d9531e49d3b99f0996bcc2b04d9b9b446f0f7748fc2ccfeb9e6090a9fd2d95ad06594c770f90a87fafd9b1974117f24c5fb491e3
DIST meson-0.60.2.tar.gz 1998788 BLAKE2B 7fa59723e49f34a016eb3692ac63ebf38b5a7db1bfada522cc317c8500e29107783ef386a1312aa1ed73018fd93b22c6ee81fa9511e80e85461469d0129581ff SHA512 96064b49a479f81d6def321b4c3c24073b307c3ecd917ab2be2020fedf102da119b205e3d88b6fd1cd13af38949600abc72d4172967d651c78d2e9011276cb80
DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
diff --git a/dev-util/meson/files/meson-tests-rust-add-libm.patch b/dev-util/meson/files/meson-tests-rust-add-libm.patch
deleted file mode 100644
index 45803976bb9b..000000000000
--- a/dev-util/meson/files/meson-tests-rust-add-libm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7ad54cce49ce22b063e0cd56edb4b7f722dc5e8e Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar@opensuse.org>
-Date: Wed, 29 Sep 2021 14:20:53 +0200
-Subject: [PATCH] tests/rust: add libm to fix build with rust 1.55
-
-Fixes #9309
----
- test cases/rust/5 polyglot static/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test cases/rust/5 polyglot static/meson.build b/test cases/rust/5 polyglot static/meson.build
-index de2e61bcbc3..a6e9550b6e2 100644
---- a/test cases/rust/5 polyglot static/meson.build
-+++ b/test cases/rust/5 polyglot static/meson.build
-@@ -2,6 +2,7 @@ project('static rust and c polyglot executable', 'c', 'rust')
-
- deps = [
- meson.get_compiler('c').find_library('dl', required: false),
-+ meson.get_compiler('c').find_library('m', required: false),
- dependency('threads'),
- ]
-
diff --git a/dev-util/meson/meson-0.59.1-r1.ebuild b/dev-util/meson/meson-0.59.1-r1.ebuild
deleted file mode 100644
index f5024d59f182..000000000000
--- a/dev-util/meson/meson-0.59.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-PATCHES=(
- "${FILESDIR}/meson-mcompile-treat-load-average-as-a-float.patch"
- "${FILESDIR}/meson-tests-rust-add-libm.patch"
-)
-
-python_prepare_all() {
- local disable_unittests=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- -e 's/test_pch_with_address_sanitizer/_&/'
-
- # https://github.com/mesonbuild/meson/issues/7203
- -e 's/test_templates/_&/'
-
- # Broken due to python2 wrapper
- -e 's/test_python_module/_&/'
- )
-
- sed -i "${disable_unittests[@]}" run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- # 'test cases/unit/73 summary' expects 80 columns
- export COLUMNS=80
-
- # If JAVA_HOME is not set, meson looks for javac in PATH.
- # If javac is in /usr/bin, meson assumes /usr/include is a valid
- # JDK include path. Setting JAVA_HOME works around this broken
- # autodection. If no JDK is installed, we should end up with an empty
- # value in JAVA_HOME, and the tests should get skipped.
- export JAVA_HOME=$(java-config -O 2>/dev/null)
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2022-03-28 5:44 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2022-03-28 5:44 UTC (permalink / raw
To: gentoo-commits
commit: f97a560be2de84ac8d5f911eb77e68e3036744e3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 05:43:52 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 05:44:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97a560b
dev-util/meson: fix gtk-update-icon-cache check
Was checking for gtk4* twice.
Bug: https://bugs.gentoo.org/836294
Closes: https://bugs.gentoo.org/836293
Closes: https://bugs.gentoo.org/836281
Signed-off-by: Sam James <sam <AT> gentoo.org>
...on-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 ++++++++++++++++++++++
...{meson-0.61.4.ebuild => meson-0.61.4-r1.ebuild} | 4 +++
2 files changed, 33 insertions(+)
diff --git a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
new file mode 100644
index 000000000000..7be12b7a98ac
--- /dev/null
+++ b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
@@ -0,0 +1,29 @@
+https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04
+
+From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Wed, 23 Mar 2022 22:15:11 +0100
+Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
+
+Commit a0cade8f introduced a typo and wrongly check for
+gtk4-update-icon-cache twice.
+If gtk4-update-icon-cache (gtk4) is not found, look for
+gtk-update-icon-cache (gtk3) instead.
+---
+ mesonbuild/modules/gnome.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
+index 673a781a41d..501be9ae4da 100644
+--- a/mesonbuild/modules/gnome.py
++++ b/mesonbuild/modules/gnome.py
+@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
+ prog = state.find_program('gtk4-update-icon-cache', required=False)
+ found = isinstance(prog, build.Executable) or prog.found()
+ if not found:
+- prog = state.find_program('gtk4-update-icon-cache')
++ prog = state.find_program('gtk-update-icon-cache')
+ icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
+ script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
+ script.skip_if_destdir = True
+
diff --git a/dev-util/meson/meson-0.61.4.ebuild b/dev-util/meson/meson-0.61.4-r1.ebuild
similarity index 97%
rename from dev-util/meson/meson-0.61.4.ebuild
rename to dev-util/meson/meson-0.61.4-r1.ebuild
index 52bbb982abcc..bbc8938fb7ed 100644
--- a/dev-util/meson/meson-0.61.4.ebuild
+++ b/dev-util/meson/meson-0.61.4-r1.ebuild
@@ -35,6 +35,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2022-07-14 0:40 Mike Gilbert
0 siblings, 0 replies; 12+ messages in thread
From: Mike Gilbert @ 2022-07-14 0:40 UTC (permalink / raw
To: gentoo-commits
commit: f99bf97e0729200cc0e7d1dba39712df271c9fca
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 00:38:54 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 00:39:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99bf97e
dev-util/meson: drop 0.60.3, 0.61.4-r2, 0.62.1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
dev-util/meson/Manifest | 3 -
...on-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 ------
dev-util/meson/meson-0.60.3.ebuild | 101 -------------------
dev-util/meson/meson-0.61.4-r2.ebuild | 111 ---------------------
dev-util/meson/meson-0.62.1.ebuild | 108 --------------------
5 files changed, 352 deletions(-)
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 115618ae4227..e6bd1e90d8fa 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,2 @@
-DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc
-DIST meson-0.61.4.tar.gz 2014265 BLAKE2B 09e6630f8a1786143832007c929e652e743bbf11d1b55ffcf366dd127779f61e8fd4a8be5cb23fa6bc949938a3bd0222f19ad1fec883f0ca6ed8cd6d4bbd6aef SHA512 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195
-DIST meson-0.62.1.tar.gz 2034805 BLAKE2B 6370b6bf07e6e875f6a0cabbf6284f97c89a4653b62c4765f365fbf083e607853094aa37d5dc97042f086ca1db569b2f8dabd14b37f674615d3b9d267d3d0d0f SHA512 52d2d06c27275b824046164403908be8555faed33aef862940623cef3e4f84b4c9b8d461c291642e6ea2c0db30b2ec4a99f46bde5d54945a26c1dbeca219cc32
DIST meson-0.62.2.tar.gz 2038542 BLAKE2B 51446cd348f3e8681a61ebecf95f5aafcafd90654e3c86d87ee2b68239237bd889b667f3c6543faba7d4b98d7e0ed73d96c6a988913e5262d3b9611b80ff8db2 SHA512 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195
DIST meson-0.63.0.tar.gz 2060688 BLAKE2B 763d35a6dee42d7ef61b00c472681042289f38737374178d43eb8e66c3abe38affd372fca7aea4f4c7cd52f25ad3754485f54f24ac5e453b7a58011397ddbbb8 SHA512 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea
diff --git a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
deleted file mode 100644
index 7be12b7a98ac..000000000000
--- a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04
-
-From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001
-From: Antoine Jacoutot <ajacoutot@gnome.org>
-Date: Wed, 23 Mar 2022 22:15:11 +0100
-Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache
-
-Commit a0cade8f introduced a typo and wrongly check for
-gtk4-update-icon-cache twice.
-If gtk4-update-icon-cache (gtk4) is not found, look for
-gtk-update-icon-cache (gtk3) instead.
----
- mesonbuild/modules/gnome.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
-index 673a781a41d..501be9ae4da 100644
---- a/mesonbuild/modules/gnome.py
-+++ b/mesonbuild/modules/gnome.py
-@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: '
- prog = state.find_program('gtk4-update-icon-cache', required=False)
- found = isinstance(prog, build.Executable) or prog.found()
- if not found:
-- prog = state.find_program('gtk4-update-icon-cache')
-+ prog = state.find_program('gtk-update-icon-cache')
- icondir = os.path.join(datadir_abs, 'icons', 'hicolor')
- script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir])
- script.skip_if_destdir = True
-
diff --git a/dev-util/meson/meson-0.60.3.ebuild b/dev-util/meson/meson-0.60.3.ebuild
deleted file mode 100644
index 72eb2e56f912..000000000000
--- a/dev-util/meson/meson-0.60.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- local disable_unittests=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- -e 's/test_pch_with_address_sanitizer/_&/'
-
- # https://github.com/mesonbuild/meson/issues/7203
- -e 's/test_templates/_&/'
-
- # Broken due to python2 wrapper
- -e 's/test_python_module/_&/'
- )
-
- sed -i "${disable_unittests[@]}" run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- # 'test cases/unit/73 summary' expects 80 columns
- export COLUMNS=80
-
- # If JAVA_HOME is not set, meson looks for javac in PATH.
- # If javac is in /usr/bin, meson assumes /usr/include is a valid
- # JDK include path. Setting JAVA_HOME works around this broken
- # autodetection. If no JDK is installed, we should end up with an empty
- # value in JAVA_HOME, and the tests should get skipped.
- export JAVA_HOME=$(java-config -O 2>/dev/null)
-
- ${EPYTHON} -u run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-}
diff --git a/dev-util/meson/meson-0.61.4-r2.ebuild b/dev-util/meson/meson-0.61.4-r2.ebuild
deleted file mode 100644
index 14d44511eeea..000000000000
--- a/dev-util/meson/meson-0.61.4-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch
-)
-
-python_prepare_all() {
- local disable_unittests=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- -e 's/test_pch_with_address_sanitizer/_&/'
-
- # https://github.com/mesonbuild/meson/issues/7203
- -e 's/test_templates/_&/'
-
- # Broken due to python2 wrapper
- -e 's/test_python_module/_&/'
- )
-
- sed -i "${disable_unittests[@]}" run_unittests.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- # 'test cases/unit/73 summary' expects 80 columns
- export COLUMNS=80
-
- # If JAVA_HOME is not set, meson looks for javac in PATH.
- # If javac is in /usr/bin, meson assumes /usr/include is a valid
- # JDK include path. Setting JAVA_HOME works around this broken
- # autodetection. If no JDK is installed, we should end up with an empty
- # value in JAVA_HOME, and the tests should get skipped.
- export JAVA_HOME=$(java-config -O 2>/dev/null)
-
- # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
- python3 run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
- dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/meson/meson-0.62.1.ebuild b/dev-util/meson/meson-0.62.1.ebuild
deleted file mode 100644
index 9743e5a1839f..000000000000
--- a/dev-util/meson/meson-0.62.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mesonbuild/meson"
- inherit git-r3
-else
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-libs/glib:2
- dev-libs/gobject-introspection
- dev-util/ninja
- dev-vcs/git
- sys-libs/zlib[static-libs(+)]
- virtual/pkgconfig
- )
-"
-
-python_prepare_all() {
- local disable_unittests=(
- # ASAN and sandbox both want control over LD_PRELOAD
- # https://bugs.gentoo.org/673016
- -e 's/test_generate_gir_with_address_sanitizer/_&/'
-
- # ASAN is unsupported on some targets
- # https://bugs.gentoo.org/692822
- -e 's/test_pch_with_address_sanitizer/_&/'
-
- # https://github.com/mesonbuild/meson/issues/7203
- -e 's/test_templates/_&/'
-
- # Broken due to python2 wrapper
- -e 's/test_python_module/_&/'
- )
-
- sed -i "${disable_unittests[@]}" unittests/*.py || die
-
- # Broken due to python2 script created by python_wrapper_setup
- rm -r "test cases/frameworks/1 boost" || die
-
- distutils-r1_python_prepare_all
-}
-
-src_test() {
- tc-export PKG_CONFIG
- if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
- ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
- else
- distutils-r1_src_test
- fi
-}
-
-python_test() {
- (
- # test_meson_installed
- unset PYTHONDONTWRITEBYTECODE
-
- # https://bugs.gentoo.org/687792
- unset PKG_CONFIG
-
- # test_cross_file_system_paths
- unset XDG_DATA_HOME
-
- # 'test cases/unit/73 summary' expects 80 columns
- export COLUMNS=80
-
- # If JAVA_HOME is not set, meson looks for javac in PATH.
- # If javac is in /usr/bin, meson assumes /usr/include is a valid
- # JDK include path. Setting JAVA_HOME works around this broken
- # autodetection. If no JDK is installed, we should end up with an empty
- # value in JAVA_HOME, and the tests should get skipped.
- export JAVA_HOME=$(java-config -O 2>/dev/null)
-
- # Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
- python3 run_tests.py
- ) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /usr/share/vim/vimfiles
- doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
- insinto /usr/share/zsh/site-functions
- doins data/shell-completions/zsh/_meson
-
- dobashcomp data/shell-completions/bash/meson
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2023-12-03 1:09 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-12-03 1:09 UTC (permalink / raw
To: gentoo-commits
commit: 2556ee17fb54aea6c0b6d766f239db009f7b57fc
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 3 00:53:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 01:05:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2556ee17
dev-util/meson: backport fix for broken configure_file output
This broke portage itself.
Bug: https://github.com/mesonbuild/meson/pull/12532
Bug: https://bugs.gentoo.org/919072
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-convert-boolean-values-for-cmake-formats.patch | 31 ++++++++++++++++++++++
.../{meson-1.3.0.ebuild => meson-1.3.0-r1.ebuild} | 3 +++
2 files changed, 34 insertions(+)
diff --git a/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
new file mode 100644
index 000000000000..394b1bbb7c1b
--- /dev/null
+++ b/dev-util/meson/files/0001-Only-convert-boolean-values-for-cmake-formats.patch
@@ -0,0 +1,31 @@
+From 9016e6958bb83feb9a724f20d8badb116bf7c5f2 Mon Sep 17 00:00:00 2001
+From: Jan200101 <sentrycraft123@gmail.com>
+Date: Tue, 21 Nov 2023 08:42:56 +0100
+Subject: [PATCH] Only convert boolean values for cmake formats
+
+This caused a regression with mesondefine where
+ `conf_data.set("FOO", true)`
+turned into
+ `#define FOO 1`
+instead of
+ `#define FOO`
+---
+ mesonbuild/utils/universal.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mesonbuild/utils/universal.py b/mesonbuild/utils/universal.py
+index 26194628c..93e64c0a2 100644
+--- a/mesonbuild/utils/universal.py
++++ b/mesonbuild/utils/universal.py
+@@ -1210,7 +1210,7 @@ def do_replacement(regex: T.Pattern[str], line: str,
+ var, _ = confdata.get(varname)
+ if isinstance(var, str):
+ var_str = var
+- elif isinstance(var, bool):
++ elif variable_format.startswith("cmake") and isinstance(var, bool):
+ var_str = str(int(var))
+ elif isinstance(var, int):
+ var_str = str(var)
+--
+2.41.0
+
diff --git a/dev-util/meson/meson-1.3.0.ebuild b/dev-util/meson/meson-1.3.0-r1.ebuild
similarity index 96%
rename from dev-util/meson/meson-1.3.0.ebuild
rename to dev-util/meson/meson-1.3.0-r1.ebuild
index 429bfd5ba7d3..1621828da199 100644
--- a/dev-util/meson/meson-1.3.0.ebuild
+++ b/dev-util/meson/meson-1.3.0-r1.ebuild
@@ -54,6 +54,9 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-1.2.1-python-path.patch
+
+ # backport fix for broken configure_file()
+ "${FILESDIR}"/0001-Only-convert-boolean-values-for-cmake-formats.patch
)
python_prepare_all() {
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
@ 2024-01-13 16:24 Fabian Groffen
0 siblings, 0 replies; 12+ messages in thread
From: Fabian Groffen @ 2024-01-13 16:24 UTC (permalink / raw
To: gentoo-commits
commit: b7035fb0da8ffcf1577b68d43f49511adee8237d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 16:23:49 2024 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 16:24:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7035fb0
dev-util/meson-1.3.1: fix for Darwin with native linker again
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
.../meson/files/meson-1.3.1-xtools-support.patch | 26 ++++++++++++++++++++++
dev-util/meson/meson-1.3.1.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/dev-util/meson/files/meson-1.3.1-xtools-support.patch b/dev-util/meson/files/meson-1.3.1-xtools-support.patch
new file mode 100644
index 000000000000..6e9e670ba8da
--- /dev/null
+++ b/dev-util/meson/files/meson-1.3.1-xtools-support.patch
@@ -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:
diff --git a/dev-util/meson/meson-1.3.1.ebuild b/dev-util/meson/meson-1.3.1.ebuild
index 2498ea56a83a..0f026f75c31e 100644
--- a/dev-util/meson/meson-1.3.1.ebuild
+++ b/dev-util/meson/meson-1.3.1.ebuild
@@ -54,6 +54,7 @@ RDEPEND="
PATCHES=(
"${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
"${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-01-13 16:24 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-04 23:45 [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2024-01-13 16:24 Fabian Groffen
2023-12-03 1:09 Sam James
2022-07-14 0:40 Mike Gilbert
2022-03-28 5:44 Sam James
2021-12-27 3:41 Mike Gilbert
2021-08-27 17:06 Mike Gilbert
2020-06-19 18:38 Fabian Groffen
2020-05-24 16:46 Mike Gilbert
2019-08-22 15:52 William Hubbs
2018-10-07 2:27 Mike Gilbert
2018-10-07 0:26 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox