Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into ledgerinit
Browse files Browse the repository at this point in the history
* upstream/develop:
  Undo API changes introduced in XRPFees: (XRPLF#4429)
  Remove recipe for RocksDB and add recipe for Snappy (XRPLF#4431)
  • Loading branch information
ximinez committed Feb 28, 2023
2 parents 894303d + caf4827 commit e9b8620
Show file tree
Hide file tree
Showing 14 changed files with 177 additions and 288 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ jobs:
with:
path: ${{ steps.conan-cache.outputs.dir }}
key: ${{ hashFiles('~/.conan/profiles/default', 'conanfile.py', 'external/rocksdb/*', '.github/workflows/nix.yml') }}
- name: export RocksDB
run: conan export external/rocksdb
- name: export Snappy
run: conan export external/snappy snappy/1.1.9@
- name: install dependencies
run: |
mkdir ${build_dir}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ jobs:
with:
path: ${{ steps.conan-cache.outputs.dir }}
key: ${{ hashFiles('~/.conan/profiles/default', 'conanfile.py', 'external/rocksdb/*', '.github/workflows/windows.yml') }}
- name: export RocksDB
run: conan export external/rocksdb
- name: export Snappy
run: conan export external/snappy snappy/1.1.9@
- name: install dependencies
run: |
mkdir $env:build_dir
Expand Down
10 changes: 5 additions & 5 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ The first is for a single-configuration generator (e.g. Unix Makefiles) on
Linux or MacOS:

```
conan export external/rocksdb
conan export external/snappy snappy/1.1.9@
mkdir .build
cd .build
conan install .. --output-folder . --build missing --settings build_type=Release
Expand All @@ -256,7 +256,7 @@ The second is for a multi-configuration generator (e.g. Visual Studio) on
Windows:

```
conan export external/rocksdb
conan export external/snappy snappy/1.1.9@
mkdir .build
cd .build
conan install .. --output-folder . --build missing --settings build_type=Release --settings compiler.runtime=MT
Expand All @@ -270,10 +270,10 @@ cmake --build . --config Debug

Now to explain the individual steps in each example:

1. Export our [Conan recipe for RocksDB](./external/rocksdb).
1. Export our [Conan recipe for Snappy](./external/snappy).

It builds version 6.27.3, which, as of July 8, 2022,
is not available in [Conan Center](https://conan.io/center/rocksdb).
It does not explicitly link the C++ standard library,
which allows us to statically link it.

1. Create a build directory (and move into it).

Expand Down
193 changes: 0 additions & 193 deletions external/rocksdb/conanfile.py

This file was deleted.

62 changes: 0 additions & 62 deletions external/rocksdb/thirdparty.inc

This file was deleted.

16 changes: 16 additions & 0 deletions external/snappy/conandata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
sources:
"1.1.9":
url: "https://github.com/google/snappy/archive/1.1.9.tar.gz"
sha256: "75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7"
"1.1.8":
url: "https://github.com/google/snappy/archive/1.1.8.tar.gz"
sha256: "16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f"
"1.1.7":
url: "https://github.com/google/snappy/archive/1.1.7.tar.gz"
sha256: "3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4"
patches:
"1.1.9":
- patch_file: "patches/1.1.9-0001-fix-inlining-failure.patch"
- patch_file: "patches/1.1.9-0002-no-Werror.patch"
- patch_file: "patches/1.1.9-0003-fix-clobber-list-older-llvm.patch"
- patch_file: "patches/1.1.9-0004-rtti-by-default.patch"
Loading

0 comments on commit e9b8620

Please sign in to comment.