From cd0dbdf6f13e83cb0f51a07fce2ceb6977431bc7 Mon Sep 17 00:00:00 2001 From: Poornima <94897054+poorndm@users.noreply.github.com> Date: Fri, 16 Aug 2024 16:49:58 +0530 Subject: [PATCH] Modify compiler flags - to fix KeyDb compilation issue (#1923) * modify compiler flags Signed-off-by: poorndm Fix syntax Signed-off-by: poorndm remove extra space Signed-off-by: poorndm update for keydb build Signed-off-by: poorndm modified LDFLAG to fix libatomic linking issue Signed-off-by: poorndm update ldflag Signed-off-by: poorndm modify keydb version - 6.3.4 Signed-off-by: poorndm set flags to suse Signed-off-by: poorndm * revert libuuid changes Signed-off-by: poorndm --------- Signed-off-by: poorndm --- config/software/keydb.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/config/software/keydb.rb b/config/software/keydb.rb index 368971e8b..5788c46c8 100644 --- a/config/software/keydb.rb +++ b/config/software/keydb.rb @@ -34,14 +34,21 @@ # 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" + if suse? + env["CFLAGS"] << " -fno-lto" + env["CXXFLAGS"] << " -fno-lto" + end update_config_guess - command "make" , env: env - command "make install", env: env + make "-j #{workers}", env: env + make "install", env: env end