Index: head/devel/meson/Makefile =================================================================== --- head/devel/meson/Makefile (revision 514186) +++ head/devel/meson/Makefile (revision 514187) @@ -1,24 +1,36 @@ # Created by: Ting-Wei Lan # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.51.2 +PORTVERSION= 0.52.0 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ -PATCH_SITES= https://github.com/mesonbuild/${PORTNAME}/commit/ -PATCHFILES+= efea48788ab2.patch:-p1 - MAINTAINER= gnome@FreeBSD.org COMMENT= High performance build system LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ninja:devel/ninja +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} -USES= python:3.5+ +USES= python:3.5+ shebangfix USE_PYTHON= autoplist distutils noflavors +SHEBANG_FILES= mesonbuild/cmake/data/run_ctgt.py NO_ARCH= yes + +# https://github.com/mesonbuild/meson/issues/6016 +TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} + +# Hide from regular build to avoid accidental dependency on symlinks +.if make(test) +# helper_create_binary_wrapper, test_python_module, test cases/*.py +BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T} +do-test: create-binary-alias # force if run late +.endif + +do-test: + @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) .include Index: head/devel/meson/distinfo =================================================================== --- head/devel/meson/distinfo (revision 514186) +++ head/devel/meson/distinfo (revision 514187) @@ -1,5 +1,3 @@ -TIMESTAMP = 1566836953 -SHA256 (meson-0.51.2.tar.gz) = 23688f0fc90be623d98e80e1defeea92bbb7103bf9336a5f5b9865d36e892d76 -SIZE (meson-0.51.2.tar.gz) = 1453251 -SHA256 (efea48788ab2.patch) = eee556fb0cd6cbba5756bbfb508412081743cd813dd10d1b9cbc419769281d39 -SIZE (efea48788ab2.patch) = 953 +TIMESTAMP = 1570381541 +SHA256 (meson-0.52.0.tar.gz) = d60f75f0dedcc4fd249dbc7519d6f3ce6df490033d276ef1cf27453ef4938d32 +SIZE (meson-0.52.0.tar.gz) = 1507110 Index: head/devel/meson/files/patch-mesonbuild_dependencies_base.py =================================================================== --- head/devel/meson/files/patch-mesonbuild_dependencies_base.py (revision 514186) +++ head/devel/meson/files/patch-mesonbuild_dependencies_base.py (revision 514187) @@ -1,101 +1,110 @@ https://github.com/mesonbuild/meson/pull/4325 From c4686de2612157a4040766738a700b710d866da4 Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Thu, 4 Oct 2018 23:30:28 +0800 Subject: [PATCH] PkgConfigDependency: Sort -L flags according to PKG_CONFIG_PATH When there is more than one path in PKG_CONFIG_PATH. It is almost always preferred to find things in the order specified by PKG_CONFIG_PATH instead of assuming pkg-config returns flags in a meaningful order. For example: /usr/local/lib/libgtk-3.so.0 /usr/local/lib/pkgconfig/gtk+-3.0.pc /usr/local/lib/libcanberra-gtk3.so /usr/local/lib/pkgconfig/libcanberra-gtk3.pc /home/mesonuser/.local/lib/libgtk-3.so.0 /home/mesonuser/.local/lib/pkgconfig/gtk+-3.0.pc PKG_CONFIG_PATH="/home/mesonuser/.local/lib/pkgconfig:/usr/local/lib/pkgconfig" libcanberra-gtk3 is a library which depends on gtk+-3.0. The dependency is mentioned in the .pc file with 'Requires', so flags from gtk+-3.0 are used in both dynamic and static linking. Assume the user wants to compile an application which needs both libcanberra-gtk3 and gtk+-3.0. The application depends on features added in the latest version of gtk+-3.0, which can be found in the home directory of the user but not in /usr/local. When meson asks pkg-config for linker flags of libcanberra-gtk3, pkg-config picks /usr/local/lib/pkgconfig/libcanberra-gtk3.pc and /home/mesonuser/.local/lib/pkgconfig/gtk+-3.0.pc. Since these two libraries come from different prefixes, there will be two -L arguments in the output of pkg-config. If -L/usr/local/lib is put before -L/home/mesonuser/.local/lib, meson will find both libraries in /usr/local/lib instead of picking libgtk-3.so.0 from the home directory. This can result in linking failure such as undefined references error when meson decides to put linker arguments of libcanberra-gtk3 before linker arguments of gtk+-3.0. When both /usr/local/lib/libgtk-3.so.0 and /home/mesonuser/.local/lib/libgtk-3.so.0 are present on the command line, the linker chooses the first one and ignores the second one. If the application needs new symbols that are only available in the second one, the linker will throw an error because of missing symbols. To resolve the issue, we should reorder -L flags according to PKG_CONFIG_PATH ourselves before using it to find the full path of library files. This makes sure that we always follow the preferences of users, without depending on the unreliable part of pkg-config output. Fixes https://github.com/mesonbuild/meson/issues/4271. ---- mesonbuild/dependencies/base.py.orig +--- mesonbuild/dependencies/base.py.orig 2019-10-06 17:01:35 UTC +++ mesonbuild/dependencies/base.py -@@ -706,6 +706,21 @@ def _set_cargs(self): - (self.name, out)) - self.compile_args = self._convert_mingw_paths(shlex.split(out)) - -+ def _sort_libpaths(self, libpaths, refpaths): -+ if len(refpaths) == 0: -+ return list(libpaths) -+ -+ def key_func(libpath): -+ common_lengths = [] -+ for refpath in refpaths: -+ common_path = os.path.commonpath([libpath, refpath]) -+ common_lengths.append(len(common_path)) -+ max_length = max(common_lengths) -+ max_index = common_lengths.index(max_length) -+ reversed_max_length = len(refpaths[max_index]) - max_length -+ return (max_index, reversed_max_length) -+ return sorted(libpaths, key=key_func) -+ - def _search_libs(self, out, out_raw): - ''' - @out: PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 pkg-config --libs -@@ -741,6 +756,22 @@ def _search_libs(self, out, out_raw): +@@ -784,6 +784,22 @@ class PkgConfigDependency(ExternalDependency): # Resolve the path as a compiler in the build directory would path = os.path.join(self.env.get_build_dir(), path) prefix_libpaths.add(path) + # Library paths are not always ordered in a meaningful way + # + # Instead of relying on pkg-config or pkgconf to provide -L flags in a + # specific order, we reorder library paths ourselves, according to th + # order specified in PKG_CONFIG_PATH. See: + # https://github.com/mesonbuild/meson/issues/4271 + # + # Only prefix_libpaths are reordered here because there should not be + # too many system_libpaths to cause library version issues. + pkg_config_path = os.environ.get('PKG_CONFIG_PATH') + if pkg_config_path: + pkg_config_path = pkg_config_path.split(os.pathsep) + else: + pkg_config_path = [] + pkg_config_path = self._convert_mingw_paths(pkg_config_path) -+ prefix_libpaths = self._sort_libpaths(prefix_libpaths, pkg_config_path) ++ prefix_libpaths = sort_libpaths(prefix_libpaths, pkg_config_path) system_libpaths = OrderedSet() - full_args = self._convert_mingw_paths(shlex.split(out)) + full_args = self._convert_mingw_paths(self._split_args(out)) for arg in full_args: +@@ -2284,6 +2300,30 @@ def _build_external_dependency_list(name, env: Environ + False, None, env, None, kwargs)) + + return candidates ++ ++ ++def sort_libpaths(libpaths: List[str], refpaths: List[str]) -> List[str]: ++ """Sort according to ++ ++ It is intended to be used to sort -L flags returned by pkg-config. ++ Pkg-config returns flags in random order which cannot be relied on. ++ """ ++ if len(refpaths) == 0: ++ return list(libpaths) ++ ++ def key_func(libpath): ++ common_lengths = [] ++ for refpath in refpaths: ++ try: ++ common_path = os.path.commonpath([libpath, refpath]) ++ except ValueError: ++ common_path = '' ++ common_lengths.append(len(common_path)) ++ max_length = max(common_lengths) ++ max_index = common_lengths.index(max_length) ++ reversed_max_length = len(refpaths[max_index]) - max_length ++ return (max_index, reversed_max_length) ++ return sorted(libpaths, key=key_func) + + + def strip_system_libdirs(environment, for_machine: MachineChoice, link_args): Index: head/devel/meson/files/patch-run__unittests.py =================================================================== --- head/devel/meson/files/patch-run__unittests.py (nonexistent) +++ head/devel/meson/files/patch-run__unittests.py (revision 514187) @@ -0,0 +1,66 @@ +https://github.com/mesonbuild/meson/pull/4324 +https://github.com/mesonbuild/meson/pull/4325 +https://github.com/mesonbuild/meson/pull/6007 + +--- run_unittests.py.orig 2019-10-06 17:01:35 UTC ++++ run_unittests.py +@@ -57,6 +57,7 @@ from mesonbuild.mesonlib import ( + from mesonbuild.environment import detect_ninja + from mesonbuild.mesonlib import MesonException, EnvironmentException + from mesonbuild.dependencies import PkgConfigDependency, ExternalProgram ++import mesonbuild.dependencies.base + from mesonbuild.build import Target + import mesonbuild.modules.pkgconfig + +@@ -1164,7 +1165,26 @@ class InternalTests(unittest.TestCase): + deps = d.get_all_dependencies(target) + self.assertEqual(deps, expdeps) + ++ def test_sort_libpaths(self): ++ sort_libpaths = mesonbuild.dependencies.base.sort_libpaths ++ self.assertEqual(sort_libpaths( ++ ['/home/mesonuser/.local/lib', '/usr/local/lib', '/usr/lib'], ++ ['/home/mesonuser/.local/lib/pkgconfig', '/usr/local/lib/pkgconfig']), ++ ['/home/mesonuser/.local/lib', '/usr/local/lib', '/usr/lib']) ++ self.assertEqual(sort_libpaths( ++ ['/usr/local/lib', '/home/mesonuser/.local/lib', '/usr/lib'], ++ ['/home/mesonuser/.local/lib/pkgconfig', '/usr/local/lib/pkgconfig']), ++ ['/home/mesonuser/.local/lib', '/usr/local/lib', '/usr/lib']) ++ self.assertEqual(sort_libpaths( ++ ['/usr/lib', '/usr/local/lib', '/home/mesonuser/.local/lib'], ++ ['/home/mesonuser/.local/lib/pkgconfig', '/usr/local/lib/pkgconfig']), ++ ['/home/mesonuser/.local/lib', '/usr/local/lib', '/usr/lib']) ++ self.assertEqual(sort_libpaths( ++ ['/usr/lib', '/usr/local/lib', '/home/mesonuser/.local/lib'], ++ ['/home/mesonuser/.local/lib/pkgconfig', '/usr/local/libdata/pkgconfig']), ++ ['/home/mesonuser/.local/lib', '/usr/local/lib', '/usr/lib']) + ++ + @unittest.skipIf(is_tarball(), 'Skipping because this is a tarball release') + class DataTests(unittest.TestCase): + +@@ -5643,6 +5664,7 @@ class LinuxlikeTests(BasePlatformTests): + # Assert that + self.assertEqual(len(line.split(lib)), 2, msg=(lib, line)) + ++ @skipIfNoPkgconfig + def test_noncross_options(self): + # C_std defined in project options must be in effect also when native compiling. + testdir = os.path.join(self.unit_test_dir, '51 noncross options') +@@ -5665,6 +5687,7 @@ c = ['{0}'] + # TODO should someday be explicit about build platform only here + self.init(testdir, override_envvars=env) + ++ @skipIfNoPkgconfig + def test_static_link(self): + if is_cygwin(): + raise unittest.SkipTest("Cygwin doesn't support LD_LIBRARY_PATH.") +@@ -5680,7 +5703,7 @@ c = ['{0}'] + # Test that installed libraries works + self.new_builddir() + self.prefix = oldprefix +- meson_args = ['-Dc_link_args=-L{}'.format(libdir), ++ meson_args = ['-Dc_link_args=-L{} -Wl,-rpath,{}'.format(libdir, libdir), + '--fatal-meson-warnings'] + testdir = os.path.join(self.unit_test_dir, '69 static link') + env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')} Property changes on: head/devel/meson/files/patch-run__unittests.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property