Skip to content

Commit c2b03fe

Browse files
intelliotthejohnfreeman
intelliot
and
thejohnfreeman
authored
Remove recipe for RocksDB and add recipe for Snappy (XRPLF#4431)
- Copies the recipe for Snappy from Conan Center, but removes three lines that explicitly link the standard library, which prevents builders from statically linking it. - Removes the recipe for RocksDB now that an official recipe for version 6.27.3 is in Conan Center. Developers will likely need to remove cached versions of both RocksDB and Snappy: ``` conan remove -f rocksdb conan remove -f snappy ``` --------- Co-authored-by: John Freeman <[email protected]>
1 parent 60c276d commit c2b03fe

11 files changed

Lines changed: 172 additions & 264 deletions

‎.github/workflows/nix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969
with:
7070
path: ${{ steps.conan-cache.outputs.dir }}
7171
key: ${{ hashFiles('~/.conan/profiles/default', 'conanfile.py', 'external/rocksdb/*', '.github/workflows/nix.yml') }}
72-
- name: export RocksDB
73-
run: conan export external/rocksdb
72+
- name: export Snappy
73+
run: conan export external/snappy snappy/1.1.9@
7474
- name: install dependencies
7575
run: |
7676
mkdir ${build_dir}

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969
with:
7070
path: ${{ steps.conan-cache.outputs.dir }}
7171
key: ${{ hashFiles('~/.conan/profiles/default', 'conanfile.py', 'external/rocksdb/*', '.github/workflows/windows.yml') }}
72-
- name: export RocksDB
73-
run: conan export external/rocksdb
72+
- name: export Snappy
73+
run: conan export external/snappy snappy/1.1.9@
7474
- name: install dependencies
7575
run: |
7676
mkdir $env:build_dir

‎BUILD.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ The first is for a single-configuration generator (e.g. Unix Makefiles) on
243243
Linux or MacOS:
244244

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

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

271271
Now to explain the individual steps in each example:
272272

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

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

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

‎external/rocksdb/conanfile.py‎

Lines changed: 0 additions & 193 deletions
This file was deleted.

‎external/rocksdb/thirdparty.inc‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎external/snappy/conandata.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
sources:
2+
"1.1.9":
3+
url: "https://github.com/google/snappy/archive/1.1.9.tar.gz"
4+
sha256: "75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7"
5+
"1.1.8":
6+
url: "https://github.com/google/snappy/archive/1.1.8.tar.gz"
7+
sha256: "16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f"
8+
"1.1.7":
9+
url: "https://github.com/google/snappy/archive/1.1.7.tar.gz"
10+
sha256: "3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4"
11+
patches:
12+
"1.1.9":
13+
- patch_file: "patches/1.1.9-0001-fix-inlining-failure.patch"
14+
- patch_file: "patches/1.1.9-0002-no-Werror.patch"
15+
- patch_file: "patches/1.1.9-0003-fix-clobber-list-older-llvm.patch"
16+
- patch_file: "patches/1.1.9-0004-rtti-by-default.patch"

0 commit comments

Comments
 (0)