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)
This commit is contained in:
parent
359386bcf1
commit
55b91243b8
@ -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
|
||||
|
||||
|
16
multimedia/mkvtoolnix/patches/patch-Rakefile
Normal file
16
multimedia/mkvtoolnix/patches/patch-Rakefile
Normal file
@ -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)}"
|
Loading…
Reference in New Issue
Block a user