Compare commits
5
Commits
main
...
9d9d146f1a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9d9d146f1a | ||
|
|
e4fd5e7ff6 | ||
|
|
4d1a5ca0b4 | ||
|
|
fd8fd14429 | ||
|
|
bf41537222 |
@@ -40,7 +40,7 @@ jobs:
|
|||||||
{ name: "glm", version: "1.0.3", location: "all" },
|
{ name: "glm", version: "1.0.3", location: "all" },
|
||||||
|
|
||||||
{ name: "unordered_dense", version: "4.8.1", location: "all" },
|
{ name: "unordered_dense", version: "4.8.1", location: "all" },
|
||||||
{ name: "mimalloc", version: "3.3.2", location: "all" },
|
{ name: "mimalloc", version: "3.5.1", location: "all" },
|
||||||
{ name: "meshoptimizer", version: "1.2", location: "all" },
|
{ name: "meshoptimizer", version: "1.2", location: "all" },
|
||||||
{ name: "sqlite3", version: "3.53.3", location: "all" },
|
{ name: "sqlite3", version: "3.53.3", location: "all" },
|
||||||
{ name: "rapidhash", version: "3.0", location: "all" },
|
{ name: "rapidhash", version: "3.0", location: "all" },
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
sources:
|
sources:
|
||||||
|
"3.5.1":
|
||||||
|
url: "https://github.com/microsoft/mimalloc/archive/v3.5.1.tar.gz"
|
||||||
|
sha256: "2602daad9b64b213a8835dee6fadda96d2081c0171bfcd3fb2db39bdc669d6b3"
|
||||||
"3.3.2":
|
"3.3.2":
|
||||||
url: "https://github.com/microsoft/mimalloc/archive/v3.3.2.tar.gz"
|
url: "https://github.com/microsoft/mimalloc/archive/v3.3.2.tar.gz"
|
||||||
sha256: "ca02384e007f46950598500dfaebde5ff9948c1d231f5a81b058799afa64bbbb"
|
sha256: "ca02384e007f46950598500dfaebde5ff9948c1d231f5a81b058799afa64bbbb"
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
versions:
|
versions:
|
||||||
|
"3.5.1":
|
||||||
|
folder: all
|
||||||
"3.3.2":
|
"3.3.2":
|
||||||
folder: all
|
folder: all
|
||||||
"3.3.1":
|
"3.3.1":
|
||||||
|
|||||||
@@ -33,6 +33,10 @@ sources:
|
|||||||
url: "https://github.com/rui314/mold/archive/refs/tags/v1.11.0.tar.gz"
|
url: "https://github.com/rui314/mold/archive/refs/tags/v1.11.0.tar.gz"
|
||||||
sha256: "99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f"
|
sha256: "99318eced81b09a77e4c657011076cc8ec3d4b6867bd324b8677974545bc4d6f"
|
||||||
patches:
|
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":
|
"2.40.1":
|
||||||
- patch_file: "patches/2.40.1/0001-patch-enforce-c-11-for-tbb.patch"
|
- 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"
|
patch_description: "Fix bundled oneTBB build by enforcing C++11 standard"
|
||||||
|
|||||||
@@ -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()
|
||||||
Reference in New Issue
Block a user