From 1ad92340106a8f20dd0a151d9d82fc35a1ebca75 Mon Sep 17 00:00:00 2001 From: Fantix King Date: Fri, 6 Sep 2024 16:57:47 -0400 Subject: [PATCH] Add OpenSSL as dependency of EdgeDB 6 (#108) This is newly required by the Rust extension --- edgedbpkg/edgedb/__init__.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/edgedbpkg/edgedb/__init__.py b/edgedbpkg/edgedb/__init__.py index 045ffcd..1cb2e04 100644 --- a/edgedbpkg/edgedb/__init__.py +++ b/edgedbpkg/edgedb/__init__.py @@ -286,6 +286,17 @@ def sh_get_build_wheel_env( build.get_build_dir(self, relative_to="pkgsource") / "share" ) + openssl_pkg = build.get_package("openssl") + if build.is_bundled(openssl_pkg): + openssl_path = build.get_install_dir( + openssl_pkg, relative_to="buildroot" + ) + openssl_path /= build.get_full_install_prefix().relative_to("/") + quoted = shlex.quote(str(openssl_path)) + pwd = "$(pwd -P)" + env["OPENSSL_LIB_DIR"] = f"!{pwd}/{quoted}/lib" + env["OPENSSL_INCLUDE_DIR"] = f"!{pwd}/{quoted}/include" + return env def get_build_script(self, build: targets.Build) -> str: