Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nimble install on Fedora Linux #78

Merged
merged 8 commits into from
Jan 3, 2025
Merged

Fix nimble install on Fedora Linux #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7af2e17
Try debugging build script.
bhartnett Dec 10, 2024
073b5d9
Copy build directory during nimble install.
bhartnett Dec 10, 2024
fea0a2d
Build windows and macos shared libraries.
bhartnett Dec 12, 2024
f0b5f86
Revert "Build windows and macos shared libraries."
bhartnett Dec 13, 2024
4502f9b
Revert remaining changes.
bhartnett Dec 16, 2024
012bac6
Make VCPKG_CRT_LINKAGE dynamic.
bhartnett Dec 16, 2024
9a57e93
Use static VCPKG_CRT_LINKAGE on windows.
bhartnett Dec 16, 2024
4e3684c
Force rebuild CI.
bhartnett Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rocksdb.nimble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion scripts/build_shared_deps_linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion scripts/build_shared_deps_osx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-linux-rocksdb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion triplets/x64-osx-rocksdb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading