Skip to content

Commit

Permalink
edgedb_ext: Pull exts.mk from EdgeDB
Browse files Browse the repository at this point in the history
  • Loading branch information
elprans committed Oct 12, 2024
1 parent 65dd5cc commit ece1a85
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
15 changes: 15 additions & 0 deletions edgedbpkg/edgedb_ext/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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",
}
Expand Down
1 change: 1 addition & 0 deletions edgedbpkg/openssl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit ece1a85

Please sign in to comment.