From e3c3a6fa543b6d9bda8b49a1d5280a71420b9b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 22 Jan 2022 12:13:46 +0100 Subject: [PATCH] Switch to ld.bfd so that package notes work without workarounds --- cvc4-do-not-use-gold.diff | 22 ++++++++++++++++++++++ cvc4.spec | 7 +++++++ 2 files changed, 29 insertions(+) create mode 100644 cvc4-do-not-use-gold.diff diff --git a/cvc4-do-not-use-gold.diff b/cvc4-do-not-use-gold.diff new file mode 100644 index 0000000..9d7e719 --- /dev/null +++ b/cvc4-do-not-use-gold.diff @@ -0,0 +1,22 @@ +--- CMakeLists.txt~ 2022-01-22 12:06:27.146275717 +0100 ++++ CMakeLists.txt 2022-01-22 12:09:04.109182403 +0100 +@@ -238,19 +238,6 @@ + endif () + + #-----------------------------------------------------------------------------# +-# Use ld.gold if available +- +-execute_process(COMMAND ${CMAKE_C_COMPILER} +- -fuse-ld=gold +- -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION) +-if ("${LD_VERSION}" MATCHES "GNU gold") +- string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=gold") +- string(APPEND CMAKE_SHARED_LINKER_FLAGS " -fuse-ld=gold") +- string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fuse-ld=gold") +- message(STATUS "Using GNU gold linker.") +-endif () +- +-#-----------------------------------------------------------------------------# + # Option defaults (three-valued options (cvc4_option(...))) + # + # These options are only set if their value is IGNORE. Otherwise, the user diff --git a/cvc4.spec b/cvc4.spec index f46faa1..87471c1 100644 --- a/cvc4.spec +++ b/cvc4.spec @@ -26,6 +26,12 @@ Patch1: %{name}-cryptominisat.patch # Remove duplicate declarations, leads to errors with recent LFSC versions Patch2: %{name}-dup-decl.patch +# Just use the default linker specied by the distro. ld.gold was the +# new kid on the block a while ago, primarily offering higher link +# speeds. But it has aged, and has less features than ld.bfd. Let's +# use ld.bfd so that package notes work without workarounds. +Patch3: %{name}-do-not-use-gold.diff + BuildRequires: abc-devel BuildRequires: antlr3-C-devel BuildRequires: antlr3-tool @@ -256,6 +262,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %changelog * Thu Jan 20 2022 Fedora Release Engineering - 1.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +- Use the default linker * Wed Jul 21 2021 Fedora Release Engineering - 1.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild