From 55b91243b8a4b3798440e7f495d8f5de62f6a2ab Mon Sep 17 00:00:00 2001 From: cwen Date: Sat, 18 Apr 2020 14:17:57 +0000 Subject: [PATCH] mkvtoolnix: don't use ld.lld on clang+ld.bfd archs The build system assumes that using clang means ld.lld is usable. This is not the case on powerpc and mips64, remove that assumption. OK rsadowski@ (maintainer) --- multimedia/mkvtoolnix/Makefile | 4 ++-- multimedia/mkvtoolnix/patches/patch-Rakefile | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 multimedia/mkvtoolnix/patches/patch-Rakefile diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index c3dad5aa2fa..c7a264358b6 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.94 2020/03/27 05:13:58 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.95 2020/04/18 14:17:57 cwen Exp $ COMMENT= create, alter and inspect Matroska files # Update depends on a new boost version DISTNAME= mkvtoolnix-33.0.0 -REVISION= 1 +REVISION= 2 CATEGORIES= multimedia x11 diff --git a/multimedia/mkvtoolnix/patches/patch-Rakefile b/multimedia/mkvtoolnix/patches/patch-Rakefile new file mode 100644 index 00000000000..b14caec30a7 --- /dev/null +++ b/multimedia/mkvtoolnix/patches/patch-Rakefile @@ -0,0 +1,16 @@ +$OpenBSD: patch-Rakefile,v 1.3 2020/04/18 14:17:57 cwen Exp $ + +`configure' defines LLVM_LLD, that can only be overridden with another path. +Ensure that the default and working linker is used on all clang archs. + +Index: Rakefile +--- Rakefile.orig ++++ Rakefile +@@ -156,7 +156,6 @@ def setup_globals + cxxflags += " #{c(:QT_CFLAGS)} #{c(:BOOST_CPPFLAGS)} #{c(:USER_CXXFLAGS)}" + + ldflags = "" +- ldflags += " -fuse-ld=lld" if is_clang? && !c(:LLVM_LLD).empty? + ldflags += " -Llib/libebml/src -Llib/libmatroska/src" if c?(:EBML_MATROSKA_INTERNAL) + ldflags += " -Llib/fmt/src" if c?(:FMT_INTERNAL) + ldflags += " #{c(:EXTRA_LDFLAGS)} #{c(:PROFILING_LIBS)} #{c(:USER_LDFLAGS)} #{c(:LDFLAGS_RPATHS)} #{c(:BOOST_LDFLAGS)}"