[packages/fish] do not prefer lld
atler
atler at pld-linux.org
Mon Jul 19 19:42:41 CEST 2021
commit bd3a46d3c9e8205431ec1fb20cb404b620c1ed68
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Jul 19 19:41:22 2021 +0200
do not prefer lld
fish-no_lld.patch | 25 +++++++++++++++++++++++++
fish.spec | 2 ++
2 files changed, 27 insertions(+)
---
diff --git a/fish.spec b/fish.spec
index fc16db3..028ca2a 100644
--- a/fish.spec
+++ b/fish.spec
@@ -7,6 +7,7 @@ License: GPL v2
Group: Applications/Shells
Source0: https://github.com/fish-shell/fish-shell/releases/download/%{version}/%{name}-%{version}.tar.xz
# Source0-md5: 94be285255aadfcf0f910bdcc2f56073
+Patch0: %{name}-no_lld.patch
URL: http://fishshell.com/
BuildRequires: cmake >= 3.2
BuildRequires: gettext-tools
@@ -46,6 +47,7 @@ Pliki programistyczne dla fish.
%prep
%setup -q
+%patch0 -p1
%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' share/tools/{deroff.py,create_manpage_completions.py,web_config/webconfig.py}
diff --git a/fish-no_lld.patch b/fish-no_lld.patch
new file mode 100644
index 0000000..05863e9
--- /dev/null
+++ b/fish-no_lld.patch
@@ -0,0 +1,25 @@
+--- fish-3.3.1/CMakeLists.txt.orig 2021-07-06 16:45:37.000000000 +0200
++++ fish-3.3.1/CMakeLists.txt 2021-07-19 19:39:56.209238876 +0200
+@@ -56,22 +56,6 @@
+ # Disable exception handling.
+ add_compile_options(-fno-exceptions)
+
+-# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and
+-# _sys_errlist. They're also faster (significantly so in the case of lld).
+-if (UNIX)
+- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
+- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+- if ("${LD_VERSION}" MATCHES "LLD ")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+- elseif (NOT APPLE)
+- execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+- ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+- if ("${LD_VERSION}" MATCHES "GNU gold")
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
+- endif()
+- endif()
+-endif()
+-
+ # Hide the CMake Rules directories in Xcode projects.
+ source_group("CMake Rules" REGULAR_EXPRESSION "^$")
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fish.git/commitdiff/bd3a46d3c9e8205431ec1fb20cb404b620c1ed68
More information about the pld-cvs-commit
mailing list