Received: by mail.netbsd.org (Postfix, from userid 605) id 8255684F5B; Wed, 13 Jul 2022 03:57:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B862F84EFE for ; Wed, 13 Jul 2022 03:57:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id LhdTt2Eu7CHN for ; Wed, 13 Jul 2022 03:57:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9841084D31 for ; Wed, 13 Jul 2022 03:57:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8A951FB1A; Wed, 13 Jul 2022 03:57:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165768464241280" MIME-Version: 1.0 Date: Wed, 13 Jul 2022 03:57:22 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20220713035722.8A951FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165768464241280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Wed Jul 13 03:57:22 UTC 2022 Modified Files: pkgsrc/devel/meson: Makefile build.mk distinfo pkgsrc/devel/meson/patches: patch-mesonbuild_compilers_detect.py patch-mesonbuild_compilers_mixins_gnu.py patch-mesonbuild_dependencies_dev.py patch-mesonbuild_modules_pkgconfig.py patch-mesonbuild_scripts_depfixer.py Log Message: commit.msg To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/meson/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/meson/build.mk cvs rdiff -u -r1.37 -r1.38 pkgsrc/devel/meson/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py cvs rdiff -u -r1.4 -r1.5 \ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165768464241280 Content-Disposition: inline Content-Length: 10438 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/meson/Makefile diff -u pkgsrc/devel/meson/Makefile:1.41 pkgsrc/devel/meson/Makefile:1.42 --- pkgsrc/devel/meson/Makefile:1.41 Thu Jun 30 11:18:16 2022 +++ pkgsrc/devel/meson/Makefile Wed Jul 13 03:57:22 2022 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2022/06/30 11:18:16 nia Exp $ +# $NetBSD: Makefile,v 1.42 2022/07/13 03:57:22 triaxx Exp $ -DISTNAME= meson-0.62.2 -PKGREVISION= 1 +DISTNAME= meson-0.63.0 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/meson/build.mk diff -u pkgsrc/devel/meson/build.mk:1.14 pkgsrc/devel/meson/build.mk:1.15 --- pkgsrc/devel/meson/build.mk:1.14 Sun Apr 3 23:49:19 2022 +++ pkgsrc/devel/meson/build.mk Wed Jul 13 03:57:22 2022 @@ -1,4 +1,4 @@ -# $NetBSD: build.mk,v 1.14 2022/04/03 23:49:19 riastradh Exp $ +# $NetBSD: build.mk,v 1.15 2022/07/13 03:57:22 triaxx Exp $ MESON_REQD?= 0 .for version in ${MESON_REQD} @@ -86,21 +86,21 @@ MESON_CROSS_FILE= ${WRKDIR}/.meson_cross meson-configure: ${MESON_CROSS_FILE} ${MESON_CROSS_FILE}: ${RUN}${ECHO} '[properties]' >$@.tmp -.for _v_ in ${MESON_CROSS_VARS} -.if defined(MESON_CROSS.${_v_}) +. for _v_ in ${MESON_CROSS_VARS} +. if defined(MESON_CROSS.${_v_}) ${RUN}${ECHO} ${_v_} = ${MESON_CROSS.${_v_}:Q} >>$@.tmp -.endif -.endfor -.for _v_ in ${MESON_CROSS_OPSYS_VARS} -.if defined(MESON_CROSS.${OPSYS}.${_v_}) +. endif +. endfor +. for _v_ in ${MESON_CROSS_OPSYS_VARS} +. if defined(MESON_CROSS.${OPSYS}.${_v_}) ${RUN}${ECHO} ${_v_} = ${MESON_CROSS.${OPSYS}.${_v_}:Q} >>$@.tmp -.endif -.endfor -.for _v_ in ${MESON_CROSS_ARCH_VARS} -.if defined(MESON_CROSS.${MACHINE_ARCH}.${_v_}) +. endif +. endfor +. for _v_ in ${MESON_CROSS_ARCH_VARS} +. if defined(MESON_CROSS.${MACHINE_ARCH}.${_v_}) ${RUN}${ECHO} ${_v_} = ${MESON_CROSS.${MACHINE_ARCH}.${_v_}:Q} >>$@.tmp -.endif -.endfor +. endif +. endfor ${RUN}${ECHO} '[host_machine]' >>$@.tmp ${RUN}${ECHO} "system = '${LOWER_OPSYS}'" >>$@.tmp ${RUN}${ECHO} "cpu_family = '${MESON_CPU_FAMILY}'" >>$@.tmp Index: pkgsrc/devel/meson/distinfo diff -u pkgsrc/devel/meson/distinfo:1.37 pkgsrc/devel/meson/distinfo:1.38 --- pkgsrc/devel/meson/distinfo:1.37 Wed Jun 8 08:27:47 2022 +++ pkgsrc/devel/meson/distinfo Wed Jul 13 03:57:22 2022 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.37 2022/06/08 08:27:47 adam Exp $ +$NetBSD: distinfo,v 1.38 2022/07/13 03:57:22 triaxx Exp $ -BLAKE2s (meson-0.62.2.tar.gz) = 56b8954136f224a4b28a6952e359034fa72f8ea68d2ae6d0691519d28f69d2e7 -SHA512 (meson-0.62.2.tar.gz) = 4089588701f0f702eb3b794e0ede78b99f13ec7545d1a7470c7bfd6a857de59673684a543928dd578402578c53f38365a3a59e3e29022fd30a525353818a4195 -Size (meson-0.62.2.tar.gz) = 2038542 bytes -SHA1 (patch-mesonbuild_compilers_detect.py) = 6379aaae55a7175291133335f15307b53aee4384 -SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = cc9fe3204c7cf003d288ef5635fa7853a44a2e34 -SHA1 (patch-mesonbuild_dependencies_dev.py) = 44a3bdb96a1afad1f1a9110b6187c9daad0d449f +BLAKE2s (meson-0.63.0.tar.gz) = 8d4c14d32dfdda1f75157050919413bcb8b6d38f05525f08de44a08977665a7e +SHA512 (meson-0.63.0.tar.gz) = 8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea +Size (meson-0.63.0.tar.gz) = 2060688 bytes +SHA1 (patch-mesonbuild_compilers_detect.py) = e94972df4035a556f40e236d2400ef31784a53f0 +SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f +SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9 SHA1 (patch-mesonbuild_linkers_linkers.py) = 4ca793f71aac2119f94464bb2beb83ed3da3e9a0 -SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 8962056c6966cb38e98661226128b4c9c65ecea7 -SHA1 (patch-mesonbuild_scripts_depfixer.py) = b8673de86f49f7a9876afcd05536766e0555d217 +SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 3f40c48a0c9ddc4eef143217f7f0eab44b263564 +SHA1 (patch-mesonbuild_scripts_depfixer.py) = 0abd3326f7872e4d53006ff3de5716007c8f22b7 Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.1 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.2 --- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py:1.1 Mon Sep 27 18:50:06 2021 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_detect.py Wed Jul 13 03:57:22 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.1 2021/09/27 18:50:06 adam Exp $ +$NetBSD: patch-mesonbuild_compilers_detect.py,v 1.2 2022/07/13 03:57:22 triaxx Exp $ Specify c++ language when making CXX parse standard input. Fixes problem where graphics/MesaLib fails to build due to: @@ -8,7 +8,7 @@ Fixes problem where graphics/MesaLib fai --- mesonbuild/compilers/detect.py.orig 2021-09-10 05:30:31.000000000 +0000 +++ mesonbuild/compilers/detect.py -@@ -1162,7 +1162,10 @@ def _get_gnu_compiler_defines(compiler: +@@ -1224,7 +1224,10 @@ def _get_gnu_compiler_defines(compiler: """ # Arguments to output compiler pre-processor defines to stdout # gcc, g++, and gfortran all support these arguments @@ -20,7 +20,7 @@ Fixes problem where graphics/MesaLib fai p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE) if p.returncode != 0: raise EnvironmentException('Unable to detect GNU compiler type:\n' + output + error) -@@ -1186,7 +1189,10 @@ def _get_clang_compiler_defines(compiler +@@ -1248,7 +1251,10 @@ def _get_clang_compiler_defines(compiler """ Get the list of Clang pre-processor defines """ Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.2 pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.3 --- pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py:1.2 Sun Feb 21 12:45:23 2021 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_mixins_gnu.py Wed Jul 13 03:57:22 2022 @@ -1,10 +1,10 @@ -$NetBSD: patch-mesonbuild_compilers_mixins_gnu.py,v 1.2 2021/02/21 12:45:23 adam Exp $ +$NetBSD: patch-mesonbuild_compilers_mixins_gnu.py,v 1.3 2022/07/13 03:57:22 triaxx Exp $ Do not default to -z ignore on SunOS, it breaks for example -fstack-protector. --- mesonbuild/compilers/mixins/gnu.py.orig 2021-02-08 21:39:00.000000000 +0000 +++ mesonbuild/compilers/mixins/gnu.py -@@ -153,7 +153,7 @@ class GnuLikeCompiler(Compiler, metaclas +@@ -147,7 +147,7 @@ class GnuLikeCompiler(Compiler, metaclas 'b_ndebug', 'b_staticpic', 'b_pie']} if not (self.info.is_windows() or self.info.is_cygwin() or self.info.is_openbsd()): self.base_options.add(OptionKey('b_lundef')) Index: pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.5 pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.6 --- pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.5 Mon Sep 27 18:50:06 2021 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py Wed Jul 13 03:57:22 2022 @@ -1,10 +1,10 @@ -$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.5 2021/09/27 18:50:06 adam Exp $ +$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.6 2022/07/13 03:57:22 triaxx Exp $ Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH. --- mesonbuild/dependencies/dev.py.orig 2021-08-18 11:22:33.000000000 +0000 +++ mesonbuild/dependencies/dev.py -@@ -204,7 +204,10 @@ class LLVMDependencyConfigTool(ConfigToo +@@ -208,7 +208,10 @@ class LLVMDependencyConfigTool(ConfigToo __cpp_blacklist = {'-DNDEBUG'} def __init__(self, name: str, environment: 'Environment', kwargs: T.Dict[str, T.Any]): Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.4 pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.5 --- pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.4 Sun Nov 7 13:23:05 2021 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py Wed Jul 13 03:57:22 2022 @@ -1,11 +1,11 @@ -$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.4 2021/11/07 13:23:05 adam Exp $ +$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.5 2022/07/13 03:57:22 triaxx Exp $ Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced a condition to match FreeBSD path norm for pkg-config files. ---- mesonbuild/modules/pkgconfig.py.orig 2021-11-02 20:00:40.000000000 +0000 +--- mesonbuild/modules/pkgconfig.py.orig 2022-06-19 19:10:14.000000000 +0000 +++ mesonbuild/modules/pkgconfig.py -@@ -545,12 +545,8 @@ class PkgConfigModule(ExtensionModule): +@@ -593,12 +593,8 @@ class PkgConfigModule(ExtensionModule): pcfile = filebase + '.pc' pkgroot = pkgroot_name = kwargs.get('install_dir', default_install_dir) if pkgroot is None: @@ -19,4 +19,4 @@ a condition to match FreeBSD path norm f + pkgroot_name = os.path.join('{libdir}', 'pkgconfig') if not isinstance(pkgroot, str): raise mesonlib.MesonException('Install_dir must be a string.') - self._generate_pkgconfig_file(state, deps, subdirs, name, description, url, + relocatable = state.get_option('relocatable', module='pkgconfig') Index: pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py diff -u pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.3 pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.4 --- pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.3 Sat Nov 21 11:27:23 2020 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py Wed Jul 13 03:57:22 2022 @@ -1,10 +1,10 @@ -$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.3 2020/11/21 11:27:23 adam Exp $ +$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.4 2022/07/13 03:57:22 triaxx Exp $ Do not touch rpath for ELF. --- mesonbuild/scripts/depfixer.py.orig 2020-09-17 22:00:44.000000000 +0000 +++ mesonbuild/scripts/depfixer.py -@@ -465,8 +465,6 @@ def fix_rpath(fname: str, rpath_dirs_to_ +@@ -482,8 +482,6 @@ def fix_rpath(fname: str, rpath_dirs_to_ return if isinstance(new_rpath, str): new_rpath = new_rpath.encode('utf8') --_----------=_165768464241280--