From ece1a854f97658933a759ac2bebd9d902af4dd33 Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Sat, 12 Oct 2024 10:39:04 -0700 Subject: [PATCH] edgedb_ext: Pull exts.mk from EdgeDB --- edgedbpkg/edgedb_ext/base.py | 15 +++++++++++++++ edgedbpkg/openssl/__init__.py | 1 + 2 files changed, 16 insertions(+) diff --git a/edgedbpkg/edgedb_ext/base.py b/edgedbpkg/edgedb_ext/base.py index d5ccddf..a4298c7 100644 --- a/edgedbpkg/edgedb_ext/base.py +++ b/edgedbpkg/edgedb_ext/base.py @@ -19,6 +19,11 @@ if TYPE_CHECKING: from cleo.io import io as cleo_io +EXTS_MK = ( + "https://raw.githubusercontent.com/edgedb/edgedb/refs/heads/master" + + "/tests/extension-testing/exts.mk" +) + class EdgeDBExtension(packages.BuildSystemMakePackage): # Populated in resolve() when this is built as top-level package. @@ -107,6 +112,14 @@ def resolve( return ext + @classmethod + def _get_sources(cls, version: str | None) -> list[packages.BaseSource]: + srcs = super()._get_sources(version) + srcs.append( + packages.HttpsSource(EXTS_MK, name="exts.mk", archive=None) + ) + return srcs + @classmethod def get_pgext_ver(cls) -> str | None: return None @@ -146,12 +159,14 @@ def get_dep_install_subdir( def get_make_args(self, build: targets.Build) -> packages.Args: return super().get_make_args(build) | { + "MKS": "exts.mk", "WITH_SQL": "no", "WITH_EDGEQL": "yes", } def get_make_install_args(self, build: targets.Build) -> packages.Args: return super().get_make_args(build) | { + "MKS": "exts.mk", "WITH_SQL": "no", "WITH_EDGEQL": "yes", } diff --git a/edgedbpkg/openssl/__init__.py b/edgedbpkg/openssl/__init__.py index 46fdea1..03019ee 100644 --- a/edgedbpkg/openssl/__init__.py +++ b/edgedbpkg/openssl/__init__.py @@ -101,6 +101,7 @@ def from_upstream_version(cls, version: str) -> OpenSSL: def get_shlibs(self, build: targets.Build) -> list[str]: return ["ssl", "crypto"] + @property def provides_build_tools(self) -> bool: return True