fix(fbthrift) (#6191)

* fix(fbthrift)

closes #6190

* link libfmt

* bump fmt.dev?

* ugh

* might be a fmt thing

* this should be the fix

* sigh

* so tedious

* skip fb303 until others are built
This commit is contained in:
Jacob Heider 2024-05-22 19:52:33 -04:00 committed by GitHub
parent 9652f5857a
commit 79ec1bce70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 18 additions and 6 deletions

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/facebook/fbthrift/archive/v{{version.raw}}.tar.gz url: https://github.com/facebook/fbthrift/archive/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
versions: versions:
github: facebook/fbthrift/tags github: facebook/fbthrift/tags
@ -9,7 +9,9 @@ dependencies:
github.com/facebookincubator/fizz: '*' github.com/facebookincubator/fizz: '*'
facebook.com/folly: '*' facebook.com/folly: '*'
facebook.com/wangle: '*' facebook.com/wangle: '*'
fmt.dev: ^9 # v9 has clang/gcc mangled export differences O_O
# https://github.com/llvm/llvm-project/issues/62765#issuecomment-2118040421
fmt.dev: ^10
gflags.github.io: ^2.2.2 gflags.github.io: ^2.2.2
google.com/glog: ^0.6 google.com/glog: ^0.6
openssl.org: ^1.1 openssl.org: ^1.1
@ -17,13 +19,20 @@ dependencies:
facebook.com/zstd: ^1.5.5 facebook.com/zstd: ^1.5.5
zlib.net: ^1.3 zlib.net: ^1.3
libsodium.org: ^1.0.19 libsodium.org: ^1.0.19
linux:
gnu.org/gcc: 13 # libstdc++
build: build:
dependencies: dependencies:
cmake.org: '*' cmake.org: '*'
facebook.com/mvfst: '*' facebook.com/mvfst: '*'
gnu.org/bison: '*' gnu.org/bison: '*'
github.com/westes/flex: '*' github.com/westes/flex: '*'
linux:
gnu.org/binutils: '*'
script: script:
# llvm's `as` likes to be first, wrongly
- run: export PATH={{deps.gnu.org/binutils.prefix}}/bin:$PATH
if: linux
- cmake -S . -B build/shared $CMAKE_ARGS - cmake -S . -B build/shared $CMAKE_ARGS
- cmake --build build/shared - cmake --build build/shared
- cmake --install build/shared - cmake --install build/shared
@ -39,6 +48,9 @@ build:
# breaks the build # breaks the build
- -DBUILD_SHARED_LIBS=OFF - -DBUILD_SHARED_LIBS=OFF
linux: linux:
CC: gcc
CXX: g++
LD: gcc
CMAKE_ARGS: CMAKE_ARGS:
- -DCMAKE_C_FLAGS=-fPIC - -DCMAKE_C_FLAGS=-fPIC
- -DCMAKE_CXX_FLAGS=-fPIC - -DCMAKE_CXX_FLAGS=-fPIC

View file

@ -18,7 +18,7 @@ dependencies:
google.github.io/snappy: '*' google.github.io/snappy: '*'
google.com/double-conversion: ^3 google.com/double-conversion: ^3
google.com/googletest: ^1 google.com/googletest: ^1
fmt.dev: ^9 fmt.dev: ^10
zlib.net: ^1 zlib.net: ^1
darwin: darwin:
sourceware.org/bzip2: '*' sourceware.org/bzip2: '*'

View file

@ -8,7 +8,7 @@ versions:
dependencies: dependencies:
boost.org: '*' boost.org: '*'
github.com/facebookincubator/fizz: '*' github.com/facebookincubator/fizz: '*'
fmt.dev: '*' fmt.dev: ^10
facebook.com/folly: '*' facebook.com/folly: '*'
gflags.github.io: '*' gflags.github.io: '*'
google.com/glog: '*' google.com/glog: '*'

View file

@ -10,7 +10,7 @@ dependencies:
boost.org: '*' boost.org: '*'
google.com/double-conversion: ^3 google.com/double-conversion: ^3
github.com/facebookincubator/fizz: '*' github.com/facebookincubator/fizz: '*'
fmt.dev: ^9 fmt.dev: ^10
facebook.com/folly: '*' facebook.com/folly: '*'
gflags.github.io: '*' gflags.github.io: '*'
google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included

View file

@ -9,7 +9,7 @@ versions:
dependencies: dependencies:
boost.org: '*' boost.org: '*'
google.com/double-conversion: ^3 google.com/double-conversion: ^3
fmt.dev: ^9 fmt.dev: ^10
facebook.com/folly: '*' facebook.com/folly: '*'
gflags.github.io: '*' gflags.github.io: '*'
google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included