diff --git a/config/software/keydb.rb b/config/software/keydb.rb index 2b568e63b..48d8e8ae2 100644 --- a/config/software/keydb.rb +++ b/config/software/keydb.rb @@ -25,7 +25,7 @@ dependency "libuuid" dependency "curl" -default_version "6.3.4" +default_version "6.3.1" source url: "https://github.com/Snapchat/KeyDB/archive/refs/tags/v#{version}.tar.gz" internal_source url: "#{ENV["ARTIFACTORY_REPO_URL"]}/#{name}/#{name}-#{version}.tar.gz", @@ -34,18 +34,17 @@ # version_list: url=https://github.com/Snapchat/KeyDB/archive/refs/tags/ filter=*.tar.gz version("6.3.4") { source sha256: "229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3" } +version("6.3.1") { source sha256: "851b91e14dc3e9c973a1870acdc5f2938ad51a12877e64e7716d9e9ae91ce389" } build do - env = with_standard_compiler_flags(with_embedded_path) + env = with_standard_compiler_flags(with_embedded_path).merge( + "PREFIX" => "#{install_dir}/embedded" + ) env["CFLAGS"] << " -I#{install_dir}/embedded/include" env["LDFLAGS"] << " -L#{install_dir}/embedded/lib" - env["CFLAGS"] << "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector -I#{install_dir}/embedded/include" - env["CPPFLAGS"] << "-I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector -I#{install_dir}/embedded/include" - env["CXXFLAGS"] << "-std=c++17 -I#{install_dir}/embedded/include -O3 -D_FORTIFY_SOURCE=2 -fstack-protector -I#{install_dir}/embedded/include" - env["LDFLAGS"] << "-Wl,-rpath,#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib -L#{install_dir}/embedded/lib" update_config_guess - command "make" , env: env - command "make install", env: env + make "-j #{workers}", env: env + make "install", env: env end