Date: Fri, 5 Jun 2020 18:44:22 +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: r538045 - in head/graphics/mesa-dri: . files Message-ID: <202006051844.055IiMkh003993@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Fri Jun 5 18:44:21 2020 New Revision: 538045 URL: https://svnweb.freebsd.org/changeset/ports/538045 Log: mesa*: Use lld from devel/binutils if /usr/bin/ld isn't lld GCC arches on 11 and 12 will uses ld.bfd and don't have ld.lld so we can't blindly use ld.lld. Suggested by: jbeich Reported by: pkubaj Approved by: zeising (x11@ implicit) Modified: head/graphics/mesa-dri/Makefile head/graphics/mesa-dri/Makefile.common head/graphics/mesa-dri/files/patch-meson.build Modified: head/graphics/mesa-dri/Makefile ============================================================================== --- head/graphics/mesa-dri/Makefile Fri Jun 5 18:25:05 2020 (r538044) +++ head/graphics/mesa-dri/Makefile Fri Jun 5 18:44:21 2020 (r538045) @@ -67,13 +67,6 @@ USE_XORG+= xcb xrandr .endif LDFLAGS_i386= -Wl,-znotext -.if ${DRI_DRIVERS} || ${VULKAN_DRIVERS:MINTEL} -. if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld -# --build-id isn't supported by old GNU ld.bfd in base -USE_BINUTILS= yes -LDFLAGS+= -B${LOCALBASE}/bin -. endif -.endif # enables VK_KHR_wayland_surface in Vulkan drivers .if ${PORT_OPTIONS:MWAYLAND} && !empty(VULKAN_DRIVERS) Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Fri Jun 5 18:25:05 2020 (r538044) +++ head/graphics/mesa-dri/Makefile.common Fri Jun 5 18:44:21 2020 (r538045) @@ -53,6 +53,13 @@ USES+= compiler:c++11-lib bison meson pathfix pkgconf USE_LDCONFIG= yes +.if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld +# --build-id isn't supported by old GNU ld.bfd in base +# Also ld.bfd have problems that seems related to --as-needed +USE_BINUTILS= yes +LDFLAGS+= -B${LOCALBASE}/bin +.endif + # only have one port to check with portscout. .if ${PORTNAME} != mesa-dri PORTSCOUT= ignore:1 @@ -83,8 +90,6 @@ LLVM_DEFAULT= 90 .elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif - -LDFLAGS+= -fuse-ld=lld BINARY_ALIAS+= python3=${PYTHON_VERSION} Modified: head/graphics/mesa-dri/files/patch-meson.build ============================================================================== --- head/graphics/mesa-dri/files/patch-meson.build Fri Jun 5 18:25:05 2020 (r538044) +++ head/graphics/mesa-dri/files/patch-meson.build Fri Jun 5 18:44:21 2020 (r538045) @@ -3,7 +3,7 @@ on some platform, but for now simply comment it here. See https://github.com/dumbbell/test-tls-initial-exec for more info - 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.orig 2020-06-05 18:23:59 UTC +++ meson.build @@ -25,7 +25,7 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] @@ -33,15 +33,3 @@ 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?202006051844.055IiMkh003993>