PR#2: Switch to ld.bfd so that package notes work without workarounds - rpms/cvc4

rpms / cvc4

#2 Switch to ld.bfd so that package notes work without workarounds

Merged 2 years ago by jjames. Opened 2 years ago by zbyszek.

rpms/ zbyszek/cvc4 do-not-use-gold into rawhide

Switch to ld.bfd so that package notes work without workarounds

Zbigniew Jędrzejewski-Szmek • 2 years ago

e3c3a6f

cvc4-do-not-use-gold.diff

file added

+22

		`@@ -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`

cvc4.spec

file modified

		`@@ -26,6 +26,12 @@`
		`# 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 @@`
		`%changelog`
		`* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-8`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild`
		`+ - Use the default linker`

		`* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-7`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild`

zbyszek commented 2 years ago

This should fix the linker issue. The build still fails with:
/usr/include/c++/12/bits/unordered_map.h:113:49: error: no type named ‘mapped_type’ in ‘class std::_Hashtable<const CVC4::prop::SatLiteral, std::pair<const CVC4::prop::SatLiteral, const CVC4::NodeTemplate<false> >, std::allocator<std::pair<const CVC4::prop::SatLiteral, const CVC4::NodeTemplate<false> > >, std::__detail::_Select1st, std::equal_to<const CVC4::prop::SatLiteral>, CVC4::prop::SatLiteralHashFunction, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__detail::_Hashtable_traits<true, false, true> >’