Date: Fri, 5 Jun 2020 11:31:35 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538008 - head/graphics/mesa-dri/files Message-ID: <202006051131.055BVZvM032085@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Fri Jun 5 11:31:35 2020 New Revision: 538008 URL: https://svnweb.freebsd.org/changeset/ports/538008 Log: mesa: Fix linking on 11 11 uses gnuld by default and it doesn't support --build-id Add a check in meson and raise the meson version to 0.46 as cc.get_supported_link_arguments was added in this version. Upstream already do this check. Reported by: kib Approved by: zeising (x11@, implicit) Modified: head/graphics/mesa-dri/files/patch-meson.build Modified: head/graphics/mesa-dri/files/patch-meson.build ============================================================================== --- head/graphics/mesa-dri/files/patch-meson.build Fri Jun 5 11:04:54 2020 (r538007) +++ head/graphics/mesa-dri/files/patch-meson.build Fri Jun 5 11:31:35 2020 (r538008) @@ -5,6 +5,15 @@ - Add dependency on libxv for xvmc, this is fixed in later mesa version. --- meson.build.orig 2019-06-26 20:14:08 UTC +++ meson.build +@@ -25,7 +25,7 @@ project( + [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] + ).stdout(), + license : 'MIT', +- meson_version : '>= 0.45', ++ meson_version : '>= 0.46', + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] + ) + @@ -336,7 +336,7 @@ if with_egl and not (with_platform_drm or with_platfor endif endif @@ -24,3 +33,15 @@ endif xvmc_drivers_path = get_option('xvmc-libs-path') +@@ -1053,10 +1054,7 @@ if cc.links('int main() { return 0; }', + name : 'dynamic-list') + with_ld_dynamic_list = true + endif +-ld_args_build_id = [] +-if build_machine.system() != 'darwin' +- ld_args_build_id += '-Wl,--build-id=sha1' +-endif ++ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1') + + # check for dl support + if cc.has_function('dlopen')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006051131.055BVZvM032085>