Fix nimble install on Fedora Linux (#78)

* Copy build directory during nimble install. * Make VCPKG_CRT_LINKAGE dynamic.
status-im · Jan 3, 2025 · d146f4a · d146f4a
1 parent afc8339
commit d146f4a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 4 deletions.
diff --git a/rocksdb.nimble b/rocksdb.nimble
@@ -6,6 +6,7 @@ description =
 license = "Apache License 2.0 or GPLv2"
 skipDirs = @["examples", "tests"]
 mode = ScriptMode.Verbose
+installDirs = @["build"]
 
 ### Dependencies
 requires "nim >= 2.0", "results", "tempfile", "unittest2"

diff --git a/scripts/build_shared_deps_linux.sh b/scripts/build_shared_deps_linux.sh
@@ -16,7 +16,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")"/..
 REPO_DIR="${PWD}"
 BUILD_DEST="${REPO_DIR}/build/"
 
-
 git submodule update --init
 
 ${REPO_DIR}/vendor/vcpkg/bootstrap-vcpkg.sh -disableMetrics

diff --git a/scripts/build_shared_deps_osx.sh b/scripts/build_shared_deps_osx.sh
@@ -16,7 +16,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")"/..
 REPO_DIR="${PWD}"
 BUILD_DEST="${REPO_DIR}/build/"
 
-
 git submodule update --init
 
 ${REPO_DIR}/vendor/vcpkg/bootstrap-vcpkg.sh -disableMetrics

diff --git a/triplets/x64-linux-rocksdb.cmake b/triplets/x64-linux-rocksdb.cmake
@@ -4,7 +4,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Linux)
 set(VCPKG_FIXUP_ELF_RPATH ON)
 
 if(${PORT} MATCHES "snappy|zlib|lz4|zstd")
-  set(VCPKG_CRT_LINKAGE static)
+  set(VCPKG_CRT_LINKAGE dynamic)
   set(VCPKG_LIBRARY_LINKAGE static)
 else()
   set(VCPKG_CRT_LINKAGE dynamic)

diff --git a/triplets/x64-osx-rocksdb.cmake b/triplets/x64-osx-rocksdb.cmake
@@ -4,7 +4,7 @@ set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES x86_64)
 
 if(${PORT} MATCHES "snappy|zlib|lz4|zstd")
-  set(VCPKG_CRT_LINKAGE static)
+  set(VCPKG_CRT_LINKAGE dynamic)
   set(VCPKG_LIBRARY_LINKAGE static)
 else()
   set(VCPKG_CRT_LINKAGE dynamic)