diff --git a/mold/all/conandata.yml b/mold/all/conandata.yml index 0292492..4f34dcd 100644 --- a/mold/all/conandata.yml +++ b/mold/all/conandata.yml @@ -33,6 +33,10 @@ sources: url: "https://github.com/rui314/mold/archive/refs/tags/v1.11.0.tar.gz" sha256: "99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f" patches: + "2.41.0": + - patch_file: "patches/2.41.0/0001-fix-libexecdir-ld-symlink-collision.patch" + patch_description: "Drop the libexecdir/mold/ld symlink install rule, which collides with bin/mold since Conan forces LIBEXECDIR to equal BINDIR" + patch_type: "conan" "2.40.1": - patch_file: "patches/2.40.1/0001-patch-enforce-c-11-for-tbb.patch" patch_description: "Fix bundled oneTBB build by enforcing C++11 standard" diff --git a/mold/all/patches/2.41.0/0001-fix-libexecdir-ld-symlink-collision.patch b/mold/all/patches/2.41.0/0001-fix-libexecdir-ld-symlink-collision.patch new file mode 100644 index 0000000..c380702 --- /dev/null +++ b/mold/all/patches/2.41.0/0001-fix-libexecdir-ld-symlink-collision.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -484,10 +484,8 @@ + + if(NOT WIN32) +- mold_install_relative_symlink(${CMAKE_INSTALL_BINDIR}/mold${CMAKE_EXECUTABLE_SUFFIX} +- ${CMAKE_INSTALL_LIBEXECDIR}/mold/ld${CMAKE_EXECUTABLE_SUFFIX}) + mold_install_relative_symlink(${CMAKE_INSTALL_BINDIR}/mold${CMAKE_EXECUTABLE_SUFFIX} + ${CMAKE_INSTALL_BINDIR}/ld.mold${CMAKE_EXECUTABLE_SUFFIX}) + mold_install_relative_symlink(${CMAKE_INSTALL_MANDIR}/man1/mold.1 + ${CMAKE_INSTALL_MANDIR}/man1/ld.mold.1) + endif() + endif()