up to 1.6.0

diff --git a/absolute-install-paths.patch b/absolute-install-paths.patch
deleted file mode 100644 (file)
index baa5a42..0000000
--- a/absolute-install-paths.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9464a129603e79d921651f2e76e7f80264d1ed33 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus@fastmail.com>
-Date: Tue, 27 Sep 2022 23:48:07 +0200
-Subject: [PATCH] cmake: use unambiguously absolute paths for install
- directories
-
-as per https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
-CMAKE_INSTALL_<dir> can be both relative and absolute. so far mold made
-assumption these are relative only, but handle both cases by using
-CMAKE_INSTALL_FULL_<dir> instead.
-
-Signed-off-by: Jan Palus <jpalus@fastmail.com>
----
- CMakeLists.txt | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dcbfc2d5..80c201a9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,7 +13,7 @@ endif()
- add_executable(mold)
- target_compile_features(mold PRIVATE cxx_std_20)
- target_compile_definitions(mold PRIVATE
--  "LIBDIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\"")
-+  "LIBDIR=\"${CMAKE_INSTALL_FULL_LIBDIR}\"")
- target_link_libraries(mold PRIVATE ${CMAKE_DL_LIBS})
- 
- if(NOT "${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
-@@ -291,17 +291,17 @@ if(NOT CMAKE_SKIP_INSTALL_RULES)
-   install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
-   install(FILES docs/mold.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
-   install(CODE "
--    set(DEST \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}\")
-+    set(DEST \"\$ENV{DESTDIR}\")
-     file(RELATIVE_PATH RELPATH
--       /${CMAKE_INSTALL_LIBEXECDIR}/mold /${CMAKE_INSTALL_BINDIR}/mold)
-+       /${CMAKE_INSTALL_FULL_LIBEXECDIR}/mold /${CMAKE_INSTALL_FULL_BINDIR}/mold)
-     execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
--      \${DEST}/${CMAKE_INSTALL_LIBEXECDIR}/mold)
-+      \${DEST}/${CMAKE_INSTALL_FULL_LIBEXECDIR}/mold)
-     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \${RELPATH}
--      \${DEST}/${CMAKE_INSTALL_LIBEXECDIR}/mold/ld)
-+      \${DEST}/${CMAKE_INSTALL_FULL_LIBEXECDIR}/mold/ld)
-     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink mold
--      \${DEST}/${CMAKE_INSTALL_BINDIR}/ld.mold)
-+      \${DEST}/${CMAKE_INSTALL_FULL_BINDIR}/ld.mold)
-     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink mold
--      \${DEST}/${CMAKE_INSTALL_BINDIR}/ld64.mold)
-+      \${DEST}/${CMAKE_INSTALL_FULL_BINDIR}/ld64.mold)
-     execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink mold.1
--      \${DEST}/${CMAKE_INSTALL_MANDIR}/man1/ld.mold.1)")
-+      \${DEST}/${CMAKE_INSTALL_FULL_MANDIR}/man1/ld.mold.1)")
- endif()
--- 
-2.37.3
-

diff --git a/mold.spec b/mold.spec
index 3c342d0dd020cc130e5b1fa2e43723dd87d95248..0ac1b75fa4b6961a89113150fcc5deebce2f4177 100644 (file)
--- a/mold.spec
+++ b/mold.spec
@@ -4,13 +4,12 @@
 
 Summary:       mold: A Modern Linker
 Name:          mold
-Version:       1.5.1
+Version:       1.6.0
 Release:       1
 License:       GPL v3+
 Group:         Development/Libraries
 Source0:       https://github.com/rui314/mold/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: a81cc2431ab795bc2afe7401d9c0483e
-Patch0:                absolute-install-paths.patch
+# Source0-md5: f6eb0adbc0ebd5dc75aed698bddd1a0e
 URL:           https://github.com/rui314/mold
 BuildRequires: cmake >= 3.13
 %{?with_tests:BuildRequires:   glibc-static}
@@ -39,7 +38,6 @@ especially in rapid debug-edit-rebuild cycles.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__rm} -r third-party/{mimalloc,tbb}