Received: by mail.netbsd.org (Postfix, from userid 605) id D3AC384D75; Fri, 4 Oct 2019 14:06:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5B54784CEF for ; Fri, 4 Oct 2019 14:06:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id pv5CydUP4Kl7 for ; Fri, 4 Oct 2019 14:06:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4F93184C2B for ; Fri, 4 Oct 2019 14:06:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48F21FBF4; Fri, 4 Oct 2019 14:06:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1570197979130500" MIME-Version: 1.0 Date: Fri, 4 Oct 2019 14:06:19 +0000 From: "Patrick Welche" Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: prlw1@netbsd.org X-Mailer: log_accum Message-Id: <20191004140619.48F21FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1570197979130500 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: prlw1 Date: Fri Oct 4 14:06:19 UTC 2019 Added Files: pkgsrc/devel/meson: DESCR Makefile PLIST build.mk distinfo pkgsrc/devel/meson/patches: patch-mesonbuild_compilers_compilers.py patch-mesonbuild_dependencies_dev.py patch-mesonbuild_envconfig.py patch-mesonbuild_environment.py patch-mesonbuild_mesonlib.py patch-mesonbuild_scripts_depfixer.py Log Message: Add meson 0.51.2 The intention is to replace py-meson with meson to allow the possibility of a python 3 meson to build a python 2 package. No release notes, but $ git log --oneline 0.51.1..0.51.2 6857936c (tag: 0.51.2, origin/0.51) Bump versions to 0.51.2 for release 267a69b1 Fix packaging. 0a460903 Fix tests for 0.51.2. 550a03ee gnome: Handle overriden g-ir-scanner 173facd4 cmake: fix missing -lpthread (fixes #5821) ac2d69bd Pass optimization flags to rustc properly. Closes: #5788. f2bd0812 Revert "gnome: Use find_program() to get glib-compile-resources" acdcd736 Put native file before cross file in options list 524280db environment: simplify powerpc conditionals 51d1612d environment: simplify CPU logic via hw.machine_arch on BSDs 6b43e66e Canonicalize 'i86pc' return from platform.machine() for Solaris bb63fe8e gnome: Use find_program() to get glib-compile-resources c9524472 Made build. options alias basic ones when native building. 69a01dae Made set_option kwargs named-only. 5c7ff27e Do not print build and host settings when compiling natively. 949accb1 Do not print build compiler info when not cross compiling. It is confusing. 7aadc3aa vs backend: commandrunner.py takes source dir first 46c2a051 Update MSI creator script to newest VS on Win 7. [skip ci] 1a5c121f Fix cross compilation on OSX c5f99542 coredata: Ignore directories when searching for machine files 85270dce mintro: Fix crash related to the sources kwarg (fixes #5741) b48e1fcc docs: Add missing closing ` in reference manual 6f18ab18 interpreter: Fix permitted kwargs in dependency.get_variable 7f390e6a docs: correct key in dep.get_variable 58a6ab32 run_unitests: Skip the native_file_is_pipe test on cygwin 2640cd7e unit tests: Check whether pytest-xdist is available be16f4cf Use pytest parallelisation if available. 5b02f88b ci/cygwin: Install pytest-xdist for unit tests f7684ec5 ci/cygwin: Don't need a special step to install cmake 6e18169e tests/122 shared module: More verbose logging 87dee156 .travis.yml: Fix cross-mingw test failures e7990883 cmake: 0.51 backport of #5665 750a7dc0 unit tests: Don't keep builddirs inside source tree on Cygwin b591f3e7 Keep all build dirs inside the source tree. bac86f25 meson: handle nested disabler 46d43b29 cmake: added test case for environment variables e8421b24 meson: Use CMAKE_PREFIX_PATH environment variable fd3384ca ValaCompiler: only emit '--debug' in debug build. 1e305e60 mintro: Fix section key in buildoptions 81e81209 BUGFIX: Fortran module regex handle more edge cases d198d50c Fix missing return statements that are seen with -Werror=return-type. f9211b75 No need to reserve build_ because we use build. instead. 41e9ac35 run_unitests: Add a unit test for native files that are pipes 4e2adb82 coredata: Correctly handle receiving a pipe for native/cross files 0e25505f Do not fail on passing `-Werror=unused-parameter` from environment 3beb2737 Return zero in cross_sizeof 58441054 cmake: Handle disabling subprojects To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/devel/meson/DESCR pkgsrc/devel/meson/Makefile \ pkgsrc/devel/meson/PLIST pkgsrc/devel/meson/build.mk \ pkgsrc/devel/meson/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_compilers.py \ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py \ pkgsrc/devel/meson/patches/patch-mesonbuild_envconfig.py \ pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py \ pkgsrc/devel/meson/patches/patch-mesonbuild_mesonlib.py \ 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. --_----------=_1570197979130500 Content-Disposition: inline Content-Length: 30977 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/devel/meson/DESCR diff -u /dev/null pkgsrc/devel/meson/DESCR:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/DESCR Fri Oct 4 14:06:18 2019 @@ -0,0 +1,4 @@ +Meson is a cross-platform build system designed to be both as fast +and as user friendly as possible. It supports many languages and +compilers, including GCC, Clang and Visual Studio. Its build +definitions are written in a simple non-turing complete DSL. Index: pkgsrc/devel/meson/Makefile diff -u /dev/null pkgsrc/devel/meson/Makefile:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/Makefile Fri Oct 4 14:06:18 2019 @@ -0,0 +1,42 @@ +# $NetBSD: Makefile,v 1.1 2019/10/04 14:06:18 prlw1 Exp $ + +DISTNAME= meson-0.51.2 +CATEGORIES= devel python +MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://mesonbuild.com/ +COMMENT= Open source build system meant to be fast and user friendly +LICENSE= apache-2.0 + +DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build + +PYTHON_VERSIONS_INCOMPATIBLE= 27 + +USE_LANGUAGES= c c++ # c++ for tests + +SUBST_CLASSES+= man +SUBST_SED.man+= -e "s,share/man,${PKGMANDIR}," +SUBST_FILES.man+= setup.py +SUBST_STAGE.man= pre-configure +SUBST_MESSAGE.man= Fixing man page installation path. + +REPLACE_PYTHON+= ghwt.py +REPLACE_PYTHON+= meson.py +REPLACE_PYTHON+= mesonbuild/rewriter.py +REPLACE_PYTHON+= run_*.py +REPLACE_PYTHON+= test\ cases/*/*/*.py +REPLACE_PYTHON+= test\ cases/*/*/*/*.py +REPLACE_PYTHON+= test\ cases/*/*/*/*/*.py +REPLACE_PYTHON+= test\ cases/common/14\ configure\ file/test.py.in +REPLACE_PYTHON+= test\ cases/common/188\ find\ override/subdir/gencodegen.py.in +REPLACE_PYTHON+= test\ cases/common/55\ run\ target/configure.in +REPLACE_PYTHON+= test\ cases/windows/8\ find\ program/test-script +REPLACE_PYTHON+= tools/*.py + +do-test: + cd ${WRKSRC} && ${PYTHONBIN} run_tests.py + +.include "../../lang/python/application.mk" +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/meson/PLIST diff -u /dev/null pkgsrc/devel/meson/PLIST:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/PLIST Fri Oct 4 14:06:18 2019 @@ -0,0 +1,330 @@ +@comment $NetBSD: PLIST,v 1.1 2019/10/04 14:06:18 prlw1 Exp $ +bin/meson +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/entry_points.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/mesonbuild/__init__.py +${PYSITELIB}/mesonbuild/__init__.pyc +${PYSITELIB}/mesonbuild/__init__.pyo +${PYSITELIB}/mesonbuild/ast/__init__.py +${PYSITELIB}/mesonbuild/ast/__init__.pyc +${PYSITELIB}/mesonbuild/ast/__init__.pyo +${PYSITELIB}/mesonbuild/ast/interpreter.py +${PYSITELIB}/mesonbuild/ast/interpreter.pyc +${PYSITELIB}/mesonbuild/ast/interpreter.pyo +${PYSITELIB}/mesonbuild/ast/introspection.py +${PYSITELIB}/mesonbuild/ast/introspection.pyc +${PYSITELIB}/mesonbuild/ast/introspection.pyo +${PYSITELIB}/mesonbuild/ast/postprocess.py +${PYSITELIB}/mesonbuild/ast/postprocess.pyc +${PYSITELIB}/mesonbuild/ast/postprocess.pyo +${PYSITELIB}/mesonbuild/ast/printer.py +${PYSITELIB}/mesonbuild/ast/printer.pyc +${PYSITELIB}/mesonbuild/ast/printer.pyo +${PYSITELIB}/mesonbuild/ast/visitor.py +${PYSITELIB}/mesonbuild/ast/visitor.pyc +${PYSITELIB}/mesonbuild/ast/visitor.pyo +${PYSITELIB}/mesonbuild/backend/__init__.py +${PYSITELIB}/mesonbuild/backend/__init__.pyc +${PYSITELIB}/mesonbuild/backend/__init__.pyo +${PYSITELIB}/mesonbuild/backend/backends.py +${PYSITELIB}/mesonbuild/backend/backends.pyc +${PYSITELIB}/mesonbuild/backend/backends.pyo +${PYSITELIB}/mesonbuild/backend/ninjabackend.py +${PYSITELIB}/mesonbuild/backend/ninjabackend.pyc +${PYSITELIB}/mesonbuild/backend/ninjabackend.pyo +${PYSITELIB}/mesonbuild/backend/vs2010backend.py +${PYSITELIB}/mesonbuild/backend/vs2010backend.pyc +${PYSITELIB}/mesonbuild/backend/vs2010backend.pyo +${PYSITELIB}/mesonbuild/backend/vs2015backend.py +${PYSITELIB}/mesonbuild/backend/vs2015backend.pyc +${PYSITELIB}/mesonbuild/backend/vs2015backend.pyo +${PYSITELIB}/mesonbuild/backend/vs2017backend.py +${PYSITELIB}/mesonbuild/backend/vs2017backend.pyc +${PYSITELIB}/mesonbuild/backend/vs2017backend.pyo +${PYSITELIB}/mesonbuild/backend/vs2019backend.py +${PYSITELIB}/mesonbuild/backend/vs2019backend.pyc +${PYSITELIB}/mesonbuild/backend/vs2019backend.pyo +${PYSITELIB}/mesonbuild/backend/xcodebackend.py +${PYSITELIB}/mesonbuild/backend/xcodebackend.pyc +${PYSITELIB}/mesonbuild/backend/xcodebackend.pyo +${PYSITELIB}/mesonbuild/build.py +${PYSITELIB}/mesonbuild/build.pyc +${PYSITELIB}/mesonbuild/build.pyo +${PYSITELIB}/mesonbuild/cmake/__init__.py +${PYSITELIB}/mesonbuild/cmake/__init__.pyc +${PYSITELIB}/mesonbuild/cmake/__init__.pyo +${PYSITELIB}/mesonbuild/cmake/client.py +${PYSITELIB}/mesonbuild/cmake/client.pyc +${PYSITELIB}/mesonbuild/cmake/client.pyo +${PYSITELIB}/mesonbuild/cmake/common.py +${PYSITELIB}/mesonbuild/cmake/common.pyc +${PYSITELIB}/mesonbuild/cmake/common.pyo +${PYSITELIB}/mesonbuild/cmake/interpreter.py +${PYSITELIB}/mesonbuild/cmake/interpreter.pyc +${PYSITELIB}/mesonbuild/cmake/interpreter.pyo +${PYSITELIB}/mesonbuild/compilers/__init__.py +${PYSITELIB}/mesonbuild/compilers/__init__.pyc +${PYSITELIB}/mesonbuild/compilers/__init__.pyo +${PYSITELIB}/mesonbuild/compilers/c.py +${PYSITELIB}/mesonbuild/compilers/c.pyc +${PYSITELIB}/mesonbuild/compilers/c.pyo +${PYSITELIB}/mesonbuild/compilers/c_function_attributes.py +${PYSITELIB}/mesonbuild/compilers/c_function_attributes.pyc +${PYSITELIB}/mesonbuild/compilers/c_function_attributes.pyo +${PYSITELIB}/mesonbuild/compilers/clike.py +${PYSITELIB}/mesonbuild/compilers/clike.pyc +${PYSITELIB}/mesonbuild/compilers/clike.pyo +${PYSITELIB}/mesonbuild/compilers/compilers.py +${PYSITELIB}/mesonbuild/compilers/compilers.pyc +${PYSITELIB}/mesonbuild/compilers/compilers.pyo +${PYSITELIB}/mesonbuild/compilers/cpp.py +${PYSITELIB}/mesonbuild/compilers/cpp.pyc +${PYSITELIB}/mesonbuild/compilers/cpp.pyo +${PYSITELIB}/mesonbuild/compilers/cs.py +${PYSITELIB}/mesonbuild/compilers/cs.pyc +${PYSITELIB}/mesonbuild/compilers/cs.pyo +${PYSITELIB}/mesonbuild/compilers/cuda.py +${PYSITELIB}/mesonbuild/compilers/cuda.pyc +${PYSITELIB}/mesonbuild/compilers/cuda.pyo +${PYSITELIB}/mesonbuild/compilers/d.py +${PYSITELIB}/mesonbuild/compilers/d.pyc +${PYSITELIB}/mesonbuild/compilers/d.pyo +${PYSITELIB}/mesonbuild/compilers/fortran.py +${PYSITELIB}/mesonbuild/compilers/fortran.pyc +${PYSITELIB}/mesonbuild/compilers/fortran.pyo +${PYSITELIB}/mesonbuild/compilers/java.py +${PYSITELIB}/mesonbuild/compilers/java.pyc +${PYSITELIB}/mesonbuild/compilers/java.pyo +${PYSITELIB}/mesonbuild/compilers/objc.py +${PYSITELIB}/mesonbuild/compilers/objc.pyc +${PYSITELIB}/mesonbuild/compilers/objc.pyo +${PYSITELIB}/mesonbuild/compilers/objcpp.py +${PYSITELIB}/mesonbuild/compilers/objcpp.pyc +${PYSITELIB}/mesonbuild/compilers/objcpp.pyo +${PYSITELIB}/mesonbuild/compilers/rust.py +${PYSITELIB}/mesonbuild/compilers/rust.pyc +${PYSITELIB}/mesonbuild/compilers/rust.pyo +${PYSITELIB}/mesonbuild/compilers/swift.py +${PYSITELIB}/mesonbuild/compilers/swift.pyc +${PYSITELIB}/mesonbuild/compilers/swift.pyo +${PYSITELIB}/mesonbuild/compilers/vala.py +${PYSITELIB}/mesonbuild/compilers/vala.pyc +${PYSITELIB}/mesonbuild/compilers/vala.pyo +${PYSITELIB}/mesonbuild/coredata.py +${PYSITELIB}/mesonbuild/coredata.pyc +${PYSITELIB}/mesonbuild/coredata.pyo +${PYSITELIB}/mesonbuild/dependencies/__init__.py +${PYSITELIB}/mesonbuild/dependencies/__init__.pyc +${PYSITELIB}/mesonbuild/dependencies/__init__.pyo +${PYSITELIB}/mesonbuild/dependencies/base.py +${PYSITELIB}/mesonbuild/dependencies/base.pyc +${PYSITELIB}/mesonbuild/dependencies/base.pyo +${PYSITELIB}/mesonbuild/dependencies/boost.py +${PYSITELIB}/mesonbuild/dependencies/boost.pyc +${PYSITELIB}/mesonbuild/dependencies/boost.pyo +${PYSITELIB}/mesonbuild/dependencies/data/CMakeLists.txt +${PYSITELIB}/mesonbuild/dependencies/data/CMakeListsLLVM.txt +${PYSITELIB}/mesonbuild/dependencies/data/CMakePathInfo.txt +${PYSITELIB}/mesonbuild/dependencies/dev.py +${PYSITELIB}/mesonbuild/dependencies/dev.pyc +${PYSITELIB}/mesonbuild/dependencies/dev.pyo +${PYSITELIB}/mesonbuild/dependencies/misc.py +${PYSITELIB}/mesonbuild/dependencies/misc.pyc +${PYSITELIB}/mesonbuild/dependencies/misc.pyo +${PYSITELIB}/mesonbuild/dependencies/platform.py +${PYSITELIB}/mesonbuild/dependencies/platform.pyc +${PYSITELIB}/mesonbuild/dependencies/platform.pyo +${PYSITELIB}/mesonbuild/dependencies/ui.py +${PYSITELIB}/mesonbuild/dependencies/ui.pyc +${PYSITELIB}/mesonbuild/dependencies/ui.pyo +${PYSITELIB}/mesonbuild/envconfig.py +${PYSITELIB}/mesonbuild/envconfig.pyc +${PYSITELIB}/mesonbuild/envconfig.pyo +${PYSITELIB}/mesonbuild/environment.py +${PYSITELIB}/mesonbuild/environment.pyc +${PYSITELIB}/mesonbuild/environment.pyo +${PYSITELIB}/mesonbuild/interpreter.py +${PYSITELIB}/mesonbuild/interpreter.pyc +${PYSITELIB}/mesonbuild/interpreter.pyo +${PYSITELIB}/mesonbuild/interpreterbase.py +${PYSITELIB}/mesonbuild/interpreterbase.pyc +${PYSITELIB}/mesonbuild/interpreterbase.pyo +${PYSITELIB}/mesonbuild/linkers.py +${PYSITELIB}/mesonbuild/linkers.pyc +${PYSITELIB}/mesonbuild/linkers.pyo +${PYSITELIB}/mesonbuild/mconf.py +${PYSITELIB}/mesonbuild/mconf.pyc +${PYSITELIB}/mesonbuild/mconf.pyo +${PYSITELIB}/mesonbuild/mesonlib.py +${PYSITELIB}/mesonbuild/mesonlib.pyc +${PYSITELIB}/mesonbuild/mesonlib.pyo +${PYSITELIB}/mesonbuild/mesonmain.py +${PYSITELIB}/mesonbuild/mesonmain.pyc +${PYSITELIB}/mesonbuild/mesonmain.pyo +${PYSITELIB}/mesonbuild/minit.py +${PYSITELIB}/mesonbuild/minit.pyc +${PYSITELIB}/mesonbuild/minit.pyo +${PYSITELIB}/mesonbuild/minstall.py +${PYSITELIB}/mesonbuild/minstall.pyc +${PYSITELIB}/mesonbuild/minstall.pyo +${PYSITELIB}/mesonbuild/mintro.py +${PYSITELIB}/mesonbuild/mintro.pyc +${PYSITELIB}/mesonbuild/mintro.pyo +${PYSITELIB}/mesonbuild/mlog.py +${PYSITELIB}/mesonbuild/mlog.pyc +${PYSITELIB}/mesonbuild/mlog.pyo +${PYSITELIB}/mesonbuild/modules/__init__.py +${PYSITELIB}/mesonbuild/modules/__init__.pyc +${PYSITELIB}/mesonbuild/modules/__init__.pyo +${PYSITELIB}/mesonbuild/modules/cmake.py +${PYSITELIB}/mesonbuild/modules/cmake.pyc +${PYSITELIB}/mesonbuild/modules/cmake.pyo +${PYSITELIB}/mesonbuild/modules/dlang.py +${PYSITELIB}/mesonbuild/modules/dlang.pyc +${PYSITELIB}/mesonbuild/modules/dlang.pyo +${PYSITELIB}/mesonbuild/modules/gnome.py +${PYSITELIB}/mesonbuild/modules/gnome.pyc +${PYSITELIB}/mesonbuild/modules/gnome.pyo +${PYSITELIB}/mesonbuild/modules/hotdoc.py +${PYSITELIB}/mesonbuild/modules/hotdoc.pyc +${PYSITELIB}/mesonbuild/modules/hotdoc.pyo +${PYSITELIB}/mesonbuild/modules/i18n.py +${PYSITELIB}/mesonbuild/modules/i18n.pyc +${PYSITELIB}/mesonbuild/modules/i18n.pyo +${PYSITELIB}/mesonbuild/modules/modtest.py +${PYSITELIB}/mesonbuild/modules/modtest.pyc +${PYSITELIB}/mesonbuild/modules/modtest.pyo +${PYSITELIB}/mesonbuild/modules/pkgconfig.py +${PYSITELIB}/mesonbuild/modules/pkgconfig.pyc +${PYSITELIB}/mesonbuild/modules/pkgconfig.pyo +${PYSITELIB}/mesonbuild/modules/python.py +${PYSITELIB}/mesonbuild/modules/python.pyc +${PYSITELIB}/mesonbuild/modules/python.pyo +${PYSITELIB}/mesonbuild/modules/python3.py +${PYSITELIB}/mesonbuild/modules/python3.pyc +${PYSITELIB}/mesonbuild/modules/python3.pyo +${PYSITELIB}/mesonbuild/modules/qt.py +${PYSITELIB}/mesonbuild/modules/qt.pyc +${PYSITELIB}/mesonbuild/modules/qt.pyo +${PYSITELIB}/mesonbuild/modules/qt4.py +${PYSITELIB}/mesonbuild/modules/qt4.pyc +${PYSITELIB}/mesonbuild/modules/qt4.pyo +${PYSITELIB}/mesonbuild/modules/qt5.py +${PYSITELIB}/mesonbuild/modules/qt5.pyc +${PYSITELIB}/mesonbuild/modules/qt5.pyo +${PYSITELIB}/mesonbuild/modules/rpm.py +${PYSITELIB}/mesonbuild/modules/rpm.pyc +${PYSITELIB}/mesonbuild/modules/rpm.pyo +${PYSITELIB}/mesonbuild/modules/sourceset.py +${PYSITELIB}/mesonbuild/modules/sourceset.pyc +${PYSITELIB}/mesonbuild/modules/sourceset.pyo +${PYSITELIB}/mesonbuild/modules/unstable_cuda.py +${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyc +${PYSITELIB}/mesonbuild/modules/unstable_cuda.pyo +${PYSITELIB}/mesonbuild/modules/unstable_icestorm.py +${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyc +${PYSITELIB}/mesonbuild/modules/unstable_icestorm.pyo +${PYSITELIB}/mesonbuild/modules/unstable_kconfig.py +${PYSITELIB}/mesonbuild/modules/unstable_kconfig.pyc +${PYSITELIB}/mesonbuild/modules/unstable_kconfig.pyo +${PYSITELIB}/mesonbuild/modules/unstable_simd.py +${PYSITELIB}/mesonbuild/modules/unstable_simd.pyc +${PYSITELIB}/mesonbuild/modules/unstable_simd.pyo +${PYSITELIB}/mesonbuild/modules/windows.py +${PYSITELIB}/mesonbuild/modules/windows.pyc +${PYSITELIB}/mesonbuild/modules/windows.pyo +${PYSITELIB}/mesonbuild/mparser.py +${PYSITELIB}/mesonbuild/mparser.pyc +${PYSITELIB}/mesonbuild/mparser.pyo +${PYSITELIB}/mesonbuild/msetup.py +${PYSITELIB}/mesonbuild/msetup.pyc +${PYSITELIB}/mesonbuild/msetup.pyo +${PYSITELIB}/mesonbuild/msubprojects.py +${PYSITELIB}/mesonbuild/msubprojects.pyc +${PYSITELIB}/mesonbuild/msubprojects.pyo +${PYSITELIB}/mesonbuild/mtest.py +${PYSITELIB}/mesonbuild/mtest.pyc +${PYSITELIB}/mesonbuild/mtest.pyo +${PYSITELIB}/mesonbuild/munstable_coredata.py +${PYSITELIB}/mesonbuild/munstable_coredata.pyc +${PYSITELIB}/mesonbuild/munstable_coredata.pyo +${PYSITELIB}/mesonbuild/optinterpreter.py +${PYSITELIB}/mesonbuild/optinterpreter.pyc +${PYSITELIB}/mesonbuild/optinterpreter.pyo +${PYSITELIB}/mesonbuild/rewriter.py +${PYSITELIB}/mesonbuild/rewriter.pyc +${PYSITELIB}/mesonbuild/rewriter.pyo +${PYSITELIB}/mesonbuild/scripts/__init__.py +${PYSITELIB}/mesonbuild/scripts/__init__.pyc +${PYSITELIB}/mesonbuild/scripts/__init__.pyo +${PYSITELIB}/mesonbuild/scripts/clangformat.py +${PYSITELIB}/mesonbuild/scripts/clangformat.pyc +${PYSITELIB}/mesonbuild/scripts/clangformat.pyo +${PYSITELIB}/mesonbuild/scripts/cleantrees.py +${PYSITELIB}/mesonbuild/scripts/cleantrees.pyc +${PYSITELIB}/mesonbuild/scripts/cleantrees.pyo +${PYSITELIB}/mesonbuild/scripts/commandrunner.py +${PYSITELIB}/mesonbuild/scripts/commandrunner.pyc +${PYSITELIB}/mesonbuild/scripts/commandrunner.pyo +${PYSITELIB}/mesonbuild/scripts/coverage.py +${PYSITELIB}/mesonbuild/scripts/coverage.pyc +${PYSITELIB}/mesonbuild/scripts/coverage.pyo +${PYSITELIB}/mesonbuild/scripts/delwithsuffix.py +${PYSITELIB}/mesonbuild/scripts/delwithsuffix.pyc +${PYSITELIB}/mesonbuild/scripts/delwithsuffix.pyo +${PYSITELIB}/mesonbuild/scripts/depfixer.py +${PYSITELIB}/mesonbuild/scripts/depfixer.pyc +${PYSITELIB}/mesonbuild/scripts/depfixer.pyo +${PYSITELIB}/mesonbuild/scripts/dirchanger.py +${PYSITELIB}/mesonbuild/scripts/dirchanger.pyc +${PYSITELIB}/mesonbuild/scripts/dirchanger.pyo +${PYSITELIB}/mesonbuild/scripts/dist.py +${PYSITELIB}/mesonbuild/scripts/dist.pyc +${PYSITELIB}/mesonbuild/scripts/dist.pyo +${PYSITELIB}/mesonbuild/scripts/gettext.py +${PYSITELIB}/mesonbuild/scripts/gettext.pyc +${PYSITELIB}/mesonbuild/scripts/gettext.pyo +${PYSITELIB}/mesonbuild/scripts/gtkdochelper.py +${PYSITELIB}/mesonbuild/scripts/gtkdochelper.pyc +${PYSITELIB}/mesonbuild/scripts/gtkdochelper.pyo +${PYSITELIB}/mesonbuild/scripts/hotdochelper.py +${PYSITELIB}/mesonbuild/scripts/hotdochelper.pyc +${PYSITELIB}/mesonbuild/scripts/hotdochelper.pyo +${PYSITELIB}/mesonbuild/scripts/meson_exe.py +${PYSITELIB}/mesonbuild/scripts/meson_exe.pyc +${PYSITELIB}/mesonbuild/scripts/meson_exe.pyo +${PYSITELIB}/mesonbuild/scripts/msgfmthelper.py +${PYSITELIB}/mesonbuild/scripts/msgfmthelper.pyc +${PYSITELIB}/mesonbuild/scripts/msgfmthelper.pyo +${PYSITELIB}/mesonbuild/scripts/regen_checker.py +${PYSITELIB}/mesonbuild/scripts/regen_checker.pyc +${PYSITELIB}/mesonbuild/scripts/regen_checker.pyo +${PYSITELIB}/mesonbuild/scripts/scanbuild.py +${PYSITELIB}/mesonbuild/scripts/scanbuild.pyc +${PYSITELIB}/mesonbuild/scripts/scanbuild.pyo +${PYSITELIB}/mesonbuild/scripts/symbolextractor.py +${PYSITELIB}/mesonbuild/scripts/symbolextractor.pyc +${PYSITELIB}/mesonbuild/scripts/symbolextractor.pyo +${PYSITELIB}/mesonbuild/scripts/uninstall.py +${PYSITELIB}/mesonbuild/scripts/uninstall.pyc +${PYSITELIB}/mesonbuild/scripts/uninstall.pyo +${PYSITELIB}/mesonbuild/scripts/vcstagger.py +${PYSITELIB}/mesonbuild/scripts/vcstagger.pyc +${PYSITELIB}/mesonbuild/scripts/vcstagger.pyo +${PYSITELIB}/mesonbuild/scripts/yelphelper.py +${PYSITELIB}/mesonbuild/scripts/yelphelper.pyc +${PYSITELIB}/mesonbuild/scripts/yelphelper.pyo +${PYSITELIB}/mesonbuild/wrap/__init__.py +${PYSITELIB}/mesonbuild/wrap/__init__.pyc +${PYSITELIB}/mesonbuild/wrap/__init__.pyo +${PYSITELIB}/mesonbuild/wrap/wrap.py +${PYSITELIB}/mesonbuild/wrap/wrap.pyc +${PYSITELIB}/mesonbuild/wrap/wrap.pyo +${PYSITELIB}/mesonbuild/wrap/wraptool.py +${PYSITELIB}/mesonbuild/wrap/wraptool.pyc +${PYSITELIB}/mesonbuild/wrap/wraptool.pyo +man/man1/meson.1 +share/polkit-1/actions/com.mesonbuild.install.policy Index: pkgsrc/devel/meson/build.mk diff -u /dev/null pkgsrc/devel/meson/build.mk:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/build.mk Fri Oct 4 14:06:18 2019 @@ -0,0 +1,27 @@ +# $NetBSD: build.mk,v 1.1 2019/10/04 14:06:18 prlw1 Exp $ + +BUILD_DEPENDS+= meson-[0-9]*:../../devel/meson + +.PHONY: meson-configure meson-build meson-install + +# pkgsrc contains multiple llvm-config executables at multiple locations. +.if !empty(LLVM_CONFIG_PATH) +MAKE_ENV+= LLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q} +.endif + +do-configure: meson-configure +meson-configure: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --libdir lib --mandir ${PKGMANDIR} --sysconfdir ${PKG_SYSCONFDIR} --buildtype=plain ${MESON_ARGS} . output + +do-build: meson-build +meson-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ninja -j ${MAKE_JOBS:U1} -C output + +do-install: meson-install +meson-install: + if [ -f ${WRKSRC}/meson_post_install.py ]; then \ + ${CHMOD} +x ${WRKSRC}/meson_post_install.py; \ + fi + cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} ninja -C output install + +.include "../../lang/python/application.mk" Index: pkgsrc/devel/meson/distinfo diff -u /dev/null pkgsrc/devel/meson/distinfo:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/distinfo Fri Oct 4 14:06:18 2019 @@ -0,0 +1,12 @@ +$NetBSD: distinfo,v 1.1 2019/10/04 14:06:18 prlw1 Exp $ + +SHA1 (meson-0.51.2.tar.gz) = 9ffba7c9a60fb66209c6a293ac9bb4f1d284a79b +RMD160 (meson-0.51.2.tar.gz) = 94e087af86c452e5fd97761357d343df5d3b1807 +SHA512 (meson-0.51.2.tar.gz) = 332fa0801accd91dc8f3cc1e4e701b1139fdb17c4ae8371fab419e83305ef41534e5f367fbd9323936afb6912d5c3e7cffa9cef658550fad0861ccca9812d5b0 +Size (meson-0.51.2.tar.gz) = 1453328 bytes +SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd +SHA1 (patch-mesonbuild_dependencies_dev.py) = 068b7e6a105eec694c469f0bf50324385900f91f +SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a +SHA1 (patch-mesonbuild_environment.py) = 815633800684e7a2a4e033a41a4ba4681801e43d +SHA1 (patch-mesonbuild_mesonlib.py) = 34e8b0277ebcce22b0935da589f5cabf8a197039 +SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b Index: pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_compilers.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_compilers.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_compilers_compilers.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,77 @@ +$NetBSD: patch-mesonbuild_compilers_compilers.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +Support SunOS-specific GCC behaviour. +Limit GNU ld options correctly. + +--- mesonbuild/compilers/compilers.py.orig 2019-06-16 18:54:18.000000000 +0000 ++++ mesonbuild/compilers/compilers.py +@@ -198,6 +198,14 @@ apple_buildtype_linker_args = {'plain': + 'custom': [], + } + ++sunos_buildtype_linker_args = {'plain': [], ++ 'debug': [], ++ 'debugoptimized': [], ++ 'release': [], ++ 'minsize': [], ++ 'custom': [], ++ } ++ + gnulike_buildtype_linker_args = {'plain': [], + 'debug': [], + 'debugoptimized': [], +@@ -1304,7 +1312,7 @@ class Compiler: + if mesonlib.is_sunos(): + return args + +- if get_compiler_is_linuxlike(self): ++ if get_compiler_uses_gnuld(self): + # Rpaths to use while linking must be absolute. These are not + # written to the binary. Needed only with GNU ld: + # https://sourceware.org/bugzilla/show_bug.cgi?id=16936 +@@ -1395,6 +1403,7 @@ class CompilerType(enum.Enum): + GCC_OSX = 1 + GCC_MINGW = 2 + GCC_CYGWIN = 3 ++ GCC_SUNOS = 4 + + CLANG_STANDARD = 10 + CLANG_OSX = 11 +@@ -1422,6 +1431,10 @@ class CompilerType(enum.Enum): + return self.name in ('GCC_OSX', 'CLANG_OSX', 'ICC_OSX', 'PGI_OSX') + + @property ++ def is_sunos_compiler(self): ++ return self.name in ('GCC_SUNOS') ++ ++ @property + def is_windows_compiler(self): + return self.name in ('GCC_MINGW', 'GCC_CYGWIN', 'CLANG_MINGW', 'ICC_WIN', 'ARM_WIN', 'CCRX_WIN', 'PGI_WIN') + +@@ -1434,7 +1447,7 @@ def get_macos_dylib_install_name(prefix, + return '@rpath/' + install_name + + def get_gcc_soname_args(compiler_type, prefix, shlib_name, suffix, soversion, darwin_versions, is_shared_module): +- if compiler_type.is_standard_compiler: ++ if compiler_type.is_standard_compiler or compiler_type.is_sunos_compiler: + sostr = '' if soversion is None else '.' + soversion + return ['-Wl,-soname,%s%s.%s%s' % (prefix, shlib_name, suffix, sostr)] + elif compiler_type.is_windows_compiler: +@@ -1912,6 +1925,8 @@ class GnuLikeCompiler(abc.ABC): + def get_buildtype_linker_args(self, buildtype): + if self.compiler_type.is_osx_compiler: + return apple_buildtype_linker_args[buildtype] ++ elif self.compiler_type.is_sunos_compiler: ++ return sunos_buildtype_linker_args[buildtype] + return gnulike_buildtype_linker_args[buildtype] + + @abc.abstractmethod +@@ -1976,6 +1991,8 @@ class GnuLikeCompiler(abc.ABC): + if self.compiler_type.is_osx_compiler: + # Apple ld + return ['-Wl,-undefined,dynamic_lookup'] ++ elif self.compiler_type.is_sunos_compiler: ++ return [] + elif self.compiler_type.is_windows_compiler: + # For PE/COFF this is impossible + return [] Index: pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_dependencies_dev.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,46 @@ +$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH. + +--- mesonbuild/dependencies/dev.py.orig 2019-07-09 16:34:42.000000000 +0000 ++++ mesonbuild/dependencies/dev.py +@@ -212,21 +212,24 @@ class LLVMDependencyConfigTool(ConfigToo + # newest back to oldest (3.5 is arbitrary), and finally the devel version. + # Please note that llvm-config-6.0 is a development snapshot and it should + # not be moved to the beginning of the list. +- self.tools = [ +- 'llvm-config', # base +- 'llvm-config-8', 'llvm-config80', +- 'llvm-config-7', 'llvm-config70', +- 'llvm-config-6.0', 'llvm-config60', +- 'llvm-config-5.0', 'llvm-config50', +- 'llvm-config-4.0', 'llvm-config40', +- 'llvm-config-3.9', 'llvm-config39', +- 'llvm-config-3.8', 'llvm-config38', +- 'llvm-config-3.7', 'llvm-config37', +- 'llvm-config-3.6', 'llvm-config36', +- 'llvm-config-3.5', 'llvm-config35', +- 'llvm-config-9', # Debian development snapshot +- 'llvm-config-devel', # FreeBSD development snapshot +- ] ++ if 'LLVM_CONFIG_PATH' in os.environ: ++ self.tools = [ os.environ['LLVM_CONFIG_PATH'] ] ++ else: ++ self.tools = [ ++ 'llvm-config', # base ++ 'llvm-config-8', 'llvm-config80', ++ 'llvm-config-7', 'llvm-config70', ++ 'llvm-config-6.0', 'llvm-config60', ++ 'llvm-config-5.0', 'llvm-config50', ++ 'llvm-config-4.0', 'llvm-config40', ++ 'llvm-config-3.9', 'llvm-config39', ++ 'llvm-config-3.8', 'llvm-config38', ++ 'llvm-config-3.7', 'llvm-config37', ++ 'llvm-config-3.6', 'llvm-config36', ++ 'llvm-config-3.5', 'llvm-config35', ++ 'llvm-config-9', # Debian development snapshot ++ 'llvm-config-devel', # FreeBSD development snapshot ++ ] + + # Fedora starting with Fedora 30 adds a suffix of the number + # of bits in the isa that llvm targets, for example, on x86_64 Index: pkgsrc/devel/meson/patches/patch-mesonbuild_envconfig.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_envconfig.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_envconfig.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,18 @@ +$NetBSD: patch-mesonbuild_envconfig.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +https://github.com/mesonbuild/meson/issues/5451 + +--- mesonbuild/envconfig.py.orig 2019-07-09 16:34:42.000000000 +0000 ++++ mesonbuild/envconfig.py +@@ -340,6 +340,11 @@ This is probably wrong, it should always + command = os.environ.get(evar) + if command is not None: + command = shlex.split(command) ++ ++ # Do not return empty or blank string entries ++ if command is not None and (len(command) == 0 or len(command[0].strip()) == 0): ++ return None ++ + return command + + class Directories: Index: pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_environment.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,63 @@ +$NetBSD: patch-mesonbuild_environment.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +Support NetBSD aarch64 and earm. +commit 246b49fe75e8f882f26a0551f89c42ca20ee50c2 + +Support SunOS ar and SunOS-specific GCC behaviour. + +--- mesonbuild/environment.py.orig 2019-08-25 19:17:02.000000000 +0000 ++++ mesonbuild/environment.py +@@ -215,7 +215,7 @@ def detect_cpu_family(compilers: Compile + """ + if mesonlib.is_windows(): + trial = detect_windows_arch(compilers) +- elif mesonlib.is_freebsd() or mesonlib.is_openbsd(): ++ elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd(): + trial = platform.processor().lower() + else: + trial = platform.machine().lower() +@@ -223,7 +223,7 @@ def detect_cpu_family(compilers: Compile + trial = 'x86' + elif trial == 'bepc': + trial = 'x86' +- elif trial.startswith('arm'): ++ elif trial.startswith('arm') or trial.startswith('earm'): + trial = 'arm' + elif trial.startswith(('powerpc64', 'ppc64')): + trial = 'ppc64' +@@ -260,7 +260,7 @@ def detect_cpu_family(compilers: Compile + def detect_cpu(compilers: CompilersDict): + if mesonlib.is_windows(): + trial = detect_windows_arch(compilers) +- elif mesonlib.is_freebsd() or mesonlib.is_openbsd(): ++ elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd(): + trial = platform.processor().lower() + else: + trial = platform.machine().lower() +@@ -274,6 +274,8 @@ def detect_cpu(compilers: CompilersDict) + # Same check as above for cpu_family + if any_compiler_has_define(compilers, '__arm__'): + trial = 'arm' ++ elif trial.startswith('earm'): ++ trial = 'arm' + elif trial == 'e2k': + # Make more precise CPU detection for Elbrus platform. + trial = platform.processor().lower() +@@ -605,6 +607,8 @@ class Environment: + return CompilerType.GCC_MINGW + elif '__CYGWIN__' in defines: + return CompilerType.GCC_CYGWIN ++ elif '__sun' in defines: ++ return CompilerType.GCC_SUNOS + return CompilerType.GCC_STANDARD + + def _get_compilers(self, lang, for_machine): +@@ -1212,6 +1216,8 @@ class Environment: + return ArLinker(linker) + if p.returncode == 1 and err.startswith('usage'): # OSX + return ArLinker(linker) ++ if p.returncode == 1 and err.startswith('ar: bad option'): # SUNOS ++ return ArLinker(linker) + if p.returncode == 1 and err.startswith('Usage'): # AIX + return ArLinker(linker) + if p.returncode == 1 and err.startswith('ar: bad option: --'): # Solaris Index: pkgsrc/devel/meson/patches/patch-mesonbuild_mesonlib.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_mesonlib.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_mesonlib.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,17 @@ +$NetBSD: patch-mesonbuild_mesonlib.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +Support NetBSD +commit 246b49fe75e8f882f26a0551f89c42ca20ee50c2 + +--- mesonbuild/mesonlib.py.orig 2019-10-03 21:53:23.886104768 +0000 ++++ mesonbuild/mesonlib.py +@@ -460,6 +460,9 @@ def is_debianlike() -> bool: + def is_dragonflybsd() -> bool: + return platform.system().lower() == 'dragonfly' + ++def is_netbsd() -> bool: ++ return platform.system().lower() == 'netbsd' ++ + def is_freebsd() -> bool: + return platform.system().lower() == 'freebsd' + Index: pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py:1.1 --- /dev/null Fri Oct 4 14:06:19 2019 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_scripts_depfixer.py Fri Oct 4 14:06:19 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-mesonbuild_scripts_depfixer.py,v 1.1 2019/10/04 14:06:19 prlw1 Exp $ + +Do not touch rpath for ELF. + +--- mesonbuild/scripts/depfixer.py.orig 2019-06-06 05:17:20.000000000 +0000 ++++ mesonbuild/scripts/depfixer.py +@@ -439,8 +439,6 @@ def fix_rpath(fname, new_rpath, final_pa + if fname.endswith('.jar'): + fix_jar(fname) + return +- fix_elf(fname, new_rpath, verbose) +- return + except SystemExit as e: + if isinstance(e.code, int) and e.code == 0: + pass --_----------=_1570197979130500--