Attachment #225625 for bug #255550

Lines 1-8 Link Here

(-)b/devel/meson/Makefile (-2 / +1 lines)
1	# Created by: Ting-Wei Lan <lantw44@gmail.com>	1	# Created by: Ting-Wei Lan <lantw44@gmail.com>
2		2
3	PORTNAME= meson	3	PORTNAME= meson
4	PORTVERSION= 0.57.1	4	PORTVERSION= 0.58.1
5	PORTREVISION= 1
6	CATEGORIES= devel python	5	CATEGORIES= devel python
7	MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/	6	MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/
8		7

Lines 1-3 Link Here

(-)b/devel/meson/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1613827273	1	TIMESTAMP = 1623087375
2	SHA256 (meson-0.57.1.tar.gz) = 72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6	2	SHA256 (meson-0.58.1.tar.gz) = 3144a3da662fcf79f1e5602fa929f2821cba4eba28c2c923fe0a7d3e3db04d5d
3	SIZE (meson-0.57.1.tar.gz) = 1849222	3	SIZE (meson-0.58.1.tar.gz) = 1896205




From c24a0f852489124fa002bdc90b5753547899b1cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Ma=C5=82ysa?= <varqox@gmail.com>
Date: Tue, 16 Feb 2021 18:46:06 +0100
Subject: [PATCH] compilers: clang: Drop -Xclang before -fcolor-diagnostics
 flag

Using -Xclang -fcolor-diagnostics provides no advantage to using just -fcolor-diagnostics option and sometimes causes problems:
* uncolored diagnostics on Arch Linux: https://bugs.archlinux.org/task/69662
* simple problem with removing flag -fcolor-diagnostics:  https://github.com/clangd/clangd/issues/279
--- mesonbuild/compilers/mixins/clang.py.orig	2021-02-20 13:17:16 UTC
+++ mesonbuild/compilers/mixins/clang.py
@@ -29,9 +29,9 @@ if T.TYPE_CHECKING:
     from ...dependencies import Dependency  # noqa: F401
 
 clang_color_args = {
-    'auto': ['-Xclang', '-fcolor-diagnostics'],
-    'always': ['-Xclang', '-fcolor-diagnostics'],
-    'never': ['-Xclang', '-fno-color-diagnostics'],
+    'auto': ['-fcolor-diagnostics'],
+    'always': ['-fcolor-diagnostics'],
+    'never': ['-fno-color-diagnostics'],
 }  # type: T.Dict[str, T.List[str]]
 
 clang_optimization_args = {




https://github.com/mesonbuild/meson/pull/4324

--- run_unittests.py.orig	2021-05-02 09:37:39 UTC
+++ run_unittests.py
@@ -7840,7 +7840,7 @@ class LinuxlikeTests(BasePlatformTests):
         # Test that installed libraries works
         self.new_builddir()
         self.prefix = oldprefix
-        meson_args = [f'-Dc_link_args=-L{libdir}',
+        meson_args = [f'-Dc_link_args=-L{libdir} -Wl,-rpath,{libdir}',
                       '--fatal-meson-warnings']
         testdir = os.path.join(self.unit_test_dir, '67 static link')
         env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}

Return to bug 255550

Removed Link Here

(-)a/devel/meson/files/patch-mesonbuild_compilers_mixins_clang.py (-24 lines)
1	From c24a0f852489124fa002bdc90b5753547899b1cb Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?Krzysztof=20Ma=C5=82ysa?= <varqox@gmail.com>
3	Date: Tue, 16 Feb 2021 18:46:06 +0100
4	Subject: [PATCH] compilers: clang: Drop -Xclang before -fcolor-diagnostics
5	flag
6
7	Using -Xclang -fcolor-diagnostics provides no advantage to using just -fcolor-diagnostics option and sometimes causes problems:
8	* uncolored diagnostics on Arch Linux: https://bugs.archlinux.org/task/69662
9	* simple problem with removing flag -fcolor-diagnostics: https://github.com/clangd/clangd/issues/279
10	--- mesonbuild/compilers/mixins/clang.py.orig 2021-02-20 13:17:16 UTC
11	+++ mesonbuild/compilers/mixins/clang.py
12	@@ -29,9 +29,9 @@ if T.TYPE_CHECKING:
13	from ...dependencies import Dependency # noqa: F401
14
15	clang_color_args = {
16	- 'auto': ['-Xclang', '-fcolor-diagnostics'],
17	- 'always': ['-Xclang', '-fcolor-diagnostics'],
18	- 'never': ['-Xclang', '-fno-color-diagnostics'],
19	+ 'auto': ['-fcolor-diagnostics'],
20	+ 'always': ['-fcolor-diagnostics'],
21	+ 'never': ['-fno-color-diagnostics'],
22	} # type: T.Dict[str, T.List[str]]
23
24	clang_optimization_args = {

Lines 1-13 Link Here

(-)b/devel/meson/files/patch-run__unittests.py (-5 / +5 lines)
1	https://github.com/mesonbuild/meson/pull/4324	1	https://github.com/mesonbuild/meson/pull/4324
2		2
3	--- run_unittests.py.orig 2019-10-06 17:01:35 UTC	3	--- run_unittests.py.orig 2021-05-02 09:37:39 UTC
4	+++ run_unittests.py	4	+++ run_unittests.py
5	@@ -5680,7 +5703,7 @@ c = ['{0}']	5	@@ -7840,7 +7840,7 @@ class LinuxlikeTests(BasePlatformTests):
6	# Test that installed libraries works	6	# Test that installed libraries works
7	self.new_builddir()	7	self.new_builddir()
8	self.prefix = oldprefix	8	self.prefix = oldprefix
9	- meson_args = ['-Dc_link_args=-L{}'.format(libdir),	9	- meson_args = [f'-Dc_link_args=-L{libdir}',
10	+ meson_args = ['-Dc_link_args=-L{} -Wl,-rpath,{}'.format(libdir, libdir),	10	+ meson_args = [f'-Dc_link_args=-L{libdir} -Wl,-rpath,{libdir}',
11	'--fatal-meson-warnings']	11	'--fatal-meson-warnings']
12	testdir = os.path.join(self.unit_test_dir, '69 static link')	12	testdir = os.path.join(self.unit_test_dir, '67 static link')
13	env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}	13	env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}