From 650cee7b8555c0939b1fb71a63b50d954265f74e Mon Sep 17 00:00:00 2001 From: Savely Krendelhoff Date: Tue, 26 Nov 2024 11:50:23 +0700 Subject: [PATCH] [Chore] Update formulae deps --- Formula/tezos-accuser-PsParisC.rb | 8 +++++--- Formula/tezos-accuser-PsQuebec.rb | 8 +++++--- Formula/tezos-admin-client.rb | 8 +++++--- Formula/tezos-baker-PsParisC.rb | 8 +++++--- Formula/tezos-baker-PsQuebec.rb | 8 +++++--- Formula/tezos-client.rb | 8 +++++--- Formula/tezos-codec.rb | 8 +++++--- Formula/tezos-dac-client.rb | 8 +++++--- Formula/tezos-dac-node.rb | 8 +++++--- Formula/tezos-dal-node.rb | 8 +++++--- Formula/tezos-node.rb | 8 +++++--- Formula/tezos-signer.rb | 8 +++++--- Formula/tezos-smart-rollup-node.rb | 8 +++++--- Formula/tezos-smart-rollup-wasm-debugger.rb | 8 +++++--- 14 files changed, 70 insertions(+), 42 deletions(-) diff --git a/Formula/tezos-accuser-PsParisC.rb b/Formula/tezos-accuser-PsParisC.rb index cf63df984..c77481764 100644 --- a/Formula/tezos-accuser-PsParisC.rb +++ b/Formula/tezos-accuser-PsParisC.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-accuser-PsQuebec.rb b/Formula/tezos-accuser-PsQuebec.rb index bb8f0b6a3..b7521deb3 100644 --- a/Formula/tezos-accuser-PsQuebec.rb +++ b/Formula/tezos-accuser-PsQuebec.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index 6b8ba29d0..60d9bc5f8 100644 --- a/Formula/tezos-admin-client.rb +++ b/Formula/tezos-admin-client.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-PsParisC.rb b/Formula/tezos-baker-PsParisC.rb index ff9b308a8..724e7372d 100644 --- a/Formula/tezos-baker-PsParisC.rb +++ b/Formula/tezos-baker-PsParisC.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-baker-PsQuebec.rb b/Formula/tezos-baker-PsQuebec.rb index df50f80d7..1028204e5 100644 --- a/Formula/tezos-baker-PsQuebec.rb +++ b/Formula/tezos-baker-PsQuebec.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index 7bf2b5d53..40c0b2044 100644 --- a/Formula/tezos-client.rb +++ b/Formula/tezos-client.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index d0aa3050e..1df5d23e2 100644 --- a/Formula/tezos-codec.rb +++ b/Formula/tezos-codec.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-dac-client.rb b/Formula/tezos-dac-client.rb index e40d30169..21f5b499c 100644 --- a/Formula/tezos-dac-client.rb +++ b/Formula/tezos-dac-client.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-dac-node.rb b/Formula/tezos-dac-node.rb index cdb77739d..75ba479bc 100644 --- a/Formula/tezos-dac-node.rb +++ b/Formula/tezos-dac-node.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-dal-node.rb b/Formula/tezos-dal-node.rb index b18c0d261..ac06a486a 100644 --- a/Formula/tezos-dal-node.rb +++ b/Formula/tezos-dal-node.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index 0f698f2a7..d465159fc 100644 --- a/Formula/tezos-node.rb +++ b/Formula/tezos-node.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index d47a7d8c2..02fdd9aae 100644 --- a/Formula/tezos-signer.rb +++ b/Formula/tezos-signer.rb @@ -13,12 +13,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq] dependencies.each do |dependency| depends_on dependency end @@ -37,9 +37,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-node.rb b/Formula/tezos-smart-rollup-node.rb index 791778faf..1f09f6530 100644 --- a/Formula/tezos-smart-rollup-node.rb +++ b/Formula/tezos-smart-rollup-node.rb @@ -15,12 +15,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite libffi tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq libffi tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -39,9 +39,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end diff --git a/Formula/tezos-smart-rollup-wasm-debugger.rb b/Formula/tezos-smart-rollup-wasm-debugger.rb index 571affb69..da597de90 100644 --- a/Formula/tezos-smart-rollup-wasm-debugger.rb +++ b/Formula/tezos-smart-rollup-wasm-debugger.rb @@ -14,12 +14,12 @@ class << self version "v21.0-1" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup cmake opam] build_dependencies.each do |dependency| depends_on dependency => :build end - dependencies = %w[gmp hidapi libev protobuf sqlite tezos-sapling-params] + dependencies = %w[gmp hidapi libev protobuf sqlite libpq tezos-sapling-params] dependencies.each do |dependency| depends_on dependency end @@ -38,9 +38,11 @@ def make_deps # Force linker to use libraries from the current brew installation. # Workaround for https://github.com/serokell/tezos-packaging/issues/700 ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib" + # Workaround to avoid linking problem on mac + ENV["RUSTFLAGS"]= "-C link-args=-Wl,-undefined,dynamic_lookup" # Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64" - system "rustup-init", "--default-toolchain", "1.71.1", "-y" + system "rustup", "install", "1.78.0" system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing" system ["source .cargo/env", "make build-deps"].join(" && ") end