diff --git a/projects/facebook.com/fbthrift/package.yml b/projects/facebook.com/fbthrift/package.yml index 0a2be50e..5880fa8d 100644 --- a/projects/facebook.com/fbthrift/package.yml +++ b/projects/facebook.com/fbthrift/package.yml @@ -1,5 +1,5 @@ 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 versions: github: facebook/fbthrift/tags @@ -9,7 +9,9 @@ dependencies: github.com/facebookincubator/fizz: '*' facebook.com/folly: '*' 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 google.com/glog: ^0.6 openssl.org: ^1.1 @@ -17,13 +19,20 @@ dependencies: facebook.com/zstd: ^1.5.5 zlib.net: ^1.3 libsodium.org: ^1.0.19 + linux: + gnu.org/gcc: 13 # libstdc++ build: dependencies: cmake.org: '*' facebook.com/mvfst: '*' gnu.org/bison: '*' github.com/westes/flex: '*' + linux: + gnu.org/binutils: '*' 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 --build build/shared - cmake --install build/shared @@ -39,6 +48,9 @@ build: # breaks the build - -DBUILD_SHARED_LIBS=OFF linux: + CC: gcc + CXX: g++ + LD: gcc CMAKE_ARGS: - -DCMAKE_C_FLAGS=-fPIC - -DCMAKE_CXX_FLAGS=-fPIC diff --git a/projects/facebook.com/folly/package.yml b/projects/facebook.com/folly/package.yml index d46c842e..af82cc55 100644 --- a/projects/facebook.com/folly/package.yml +++ b/projects/facebook.com/folly/package.yml @@ -18,7 +18,7 @@ dependencies: google.github.io/snappy: '*' google.com/double-conversion: ^3 google.com/googletest: ^1 - fmt.dev: ^9 + fmt.dev: ^10 zlib.net: ^1 darwin: sourceware.org/bzip2: '*' diff --git a/projects/facebook.com/mvfst/package.yml b/projects/facebook.com/mvfst/package.yml index 24cb97bf..8ccb8e46 100644 --- a/projects/facebook.com/mvfst/package.yml +++ b/projects/facebook.com/mvfst/package.yml @@ -8,7 +8,7 @@ versions: dependencies: boost.org: '*' github.com/facebookincubator/fizz: '*' - fmt.dev: '*' + fmt.dev: ^10 facebook.com/folly: '*' gflags.github.io: '*' google.com/glog: '*' diff --git a/projects/facebook.com/wangle/package.yml b/projects/facebook.com/wangle/package.yml index 2cbff877..5b7008c3 100644 --- a/projects/facebook.com/wangle/package.yml +++ b/projects/facebook.com/wangle/package.yml @@ -10,7 +10,7 @@ dependencies: boost.org: '*' google.com/double-conversion: ^3 github.com/facebookincubator/fizz: '*' - fmt.dev: ^9 + fmt.dev: ^10 facebook.com/folly: '*' gflags.github.io: '*' google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included diff --git a/projects/github.com/facebookincubator/fizz/package.yml b/projects/github.com/facebookincubator/fizz/package.yml index bc18798c..2c65f0f2 100644 --- a/projects/github.com/facebookincubator/fizz/package.yml +++ b/projects/github.com/facebookincubator/fizz/package.yml @@ -9,7 +9,7 @@ versions: dependencies: boost.org: '*' google.com/double-conversion: ^3 - fmt.dev: ^9 + fmt.dev: ^10 facebook.com/folly: '*' gflags.github.io: '*' google.com/glog: '<0.7' # glog 0.7.0 cannot be simply included