From b336115b2a75e7a8a1824793390da64d20143a9e Mon Sep 17 00:00:00 2001 From: Elvis Pranskevichus Date: Thu, 10 Oct 2024 22:01:09 -0700 Subject: [PATCH] Remove most now-extraneous install/no_install/ignore lists --- edgedbpkg/edgedb/__init__.py | 8 ++++---- edgedbpkg/edgedb/install.list | 3 +++ edgedbpkg/edgedb_ls/__init__.py | 2 +- edgedbpkg/edgedbcli/__init__.py | 4 ++-- edgedbpkg/icu/install.list | 1 - edgedbpkg/icu/no_install.list | 4 ---- edgedbpkg/libabseil/install.list | 1 - edgedbpkg/libabseil/no_install.list | 14 -------------- edgedbpkg/libb2/ignore.list | 4 ---- edgedbpkg/libb2/install.list | 1 - edgedbpkg/libb2/no_install.list | 4 ---- edgedbpkg/libexpat/install.list | 1 - edgedbpkg/libexpat/no_install.list | 15 --------------- edgedbpkg/libffi/ignore.list | 2 -- edgedbpkg/libffi/install.list | 1 - edgedbpkg/libffi/no_install.list | 4 ---- edgedbpkg/libgdal/ignore.list | 2 +- edgedbpkg/libgdal/install.list | 5 +---- edgedbpkg/libgdal/no_install.list | 14 -------------- edgedbpkg/libgeos/install.list | 1 - edgedbpkg/libgeos/no_install.list | 14 -------------- edgedbpkg/libgeotiff/install.list | 1 - edgedbpkg/libgeotiff/no_install.list | 14 -------------- edgedbpkg/libjson_c/install.list | 3 +-- edgedbpkg/libjson_c/no_install.list | 12 ------------ edgedbpkg/libjsoncpp/install.list | 1 - edgedbpkg/libjsoncpp/no_install.list | 14 -------------- edgedbpkg/libpcre2/ignore.list | 1 - edgedbpkg/libpcre2/install.list | 1 - edgedbpkg/libpcre2/no_install.list | 12 ------------ edgedbpkg/libproj/install.list | 3 +-- edgedbpkg/libproj/no_install.list | 16 ---------------- edgedbpkg/libprotobuf_c/install.list | 1 - edgedbpkg/libprotobuf_c/no_install.list | 14 -------------- edgedbpkg/libsqlite3/install.list | 1 - edgedbpkg/libsqlite3/no_install.list | 7 ------- edgedbpkg/libtiff/install.list | 1 - edgedbpkg/libtiff/no_install.list | 14 -------------- edgedbpkg/libuuid/install.list | 1 - edgedbpkg/libuuid/no_install.list | 4 ---- edgedbpkg/libxml2/install.list | 1 - edgedbpkg/libxml2/no_install.list | 19 ------------------- edgedbpkg/openssl/__init__.py | 14 ++++++++++++++ edgedbpkg/openssl/ignore.list | 2 -- edgedbpkg/openssl/install.list | 2 +- edgedbpkg/openssl/no_install.list | 8 -------- edgedbpkg/pgext/pgvector/ignore.list | 1 - edgedbpkg/pgext/postgis/__init__.py | 4 ++-- edgedbpkg/pgext/postgis/ignore.list | 1 - edgedbpkg/pgext/postgis/no_install.list | 16 ---------------- edgedbpkg/postgresql/ignore.list | 6 ------ edgedbpkg/postgresql/no_install.list | 4 ---- edgedbpkg/protobuf/__init__.py | 9 ++------- edgedbpkg/protobuf/install.list | 1 - edgedbpkg/protobuf/no_install.list | 14 -------------- edgedbpkg/protoc_c/install.list | 2 -- edgedbpkg/protoc_c/no_install.list | 12 ------------ edgedbpkg/python/ignore.list | 6 ------ edgedbpkg/python/install.list | 2 +- edgedbpkg/python/no_install.list | 3 --- edgedbpkg/zlib/install.list | 1 - edgedbpkg/zlib/no_install.list | 4 ---- 62 files changed, 34 insertions(+), 324 deletions(-) delete mode 100644 edgedbpkg/icu/install.list delete mode 100644 edgedbpkg/libabseil/install.list delete mode 100644 edgedbpkg/libabseil/no_install.list delete mode 100644 edgedbpkg/libb2/ignore.list delete mode 100644 edgedbpkg/libb2/install.list delete mode 100644 edgedbpkg/libb2/no_install.list delete mode 100644 edgedbpkg/libexpat/install.list delete mode 100644 edgedbpkg/libexpat/no_install.list delete mode 100644 edgedbpkg/libffi/ignore.list delete mode 100644 edgedbpkg/libffi/install.list delete mode 100644 edgedbpkg/libffi/no_install.list delete mode 100644 edgedbpkg/libgdal/no_install.list delete mode 100644 edgedbpkg/libgeos/install.list delete mode 100644 edgedbpkg/libgeos/no_install.list delete mode 100644 edgedbpkg/libgeotiff/install.list delete mode 100644 edgedbpkg/libgeotiff/no_install.list delete mode 100644 edgedbpkg/libjson_c/no_install.list delete mode 100644 edgedbpkg/libjsoncpp/install.list delete mode 100644 edgedbpkg/libjsoncpp/no_install.list delete mode 100644 edgedbpkg/libpcre2/ignore.list delete mode 100644 edgedbpkg/libpcre2/install.list delete mode 100644 edgedbpkg/libpcre2/no_install.list delete mode 100644 edgedbpkg/libproj/no_install.list delete mode 100644 edgedbpkg/libprotobuf_c/install.list delete mode 100644 edgedbpkg/libprotobuf_c/no_install.list delete mode 100644 edgedbpkg/libsqlite3/install.list delete mode 100644 edgedbpkg/libsqlite3/no_install.list delete mode 100644 edgedbpkg/libtiff/install.list delete mode 100644 edgedbpkg/libtiff/no_install.list delete mode 100644 edgedbpkg/libuuid/install.list delete mode 100644 edgedbpkg/libuuid/no_install.list delete mode 100644 edgedbpkg/libxml2/install.list delete mode 100644 edgedbpkg/libxml2/no_install.list delete mode 100644 edgedbpkg/openssl/no_install.list delete mode 100644 edgedbpkg/pgext/pgvector/ignore.list delete mode 100644 edgedbpkg/pgext/postgis/ignore.list delete mode 100644 edgedbpkg/pgext/postgis/no_install.list delete mode 100644 edgedbpkg/postgresql/no_install.list delete mode 100644 edgedbpkg/protobuf/install.list delete mode 100644 edgedbpkg/protobuf/no_install.list delete mode 100644 edgedbpkg/protoc_c/install.list delete mode 100644 edgedbpkg/protoc_c/no_install.list delete mode 100644 edgedbpkg/python/ignore.list delete mode 100644 edgedbpkg/zlib/install.list delete mode 100644 edgedbpkg/zlib/no_install.list diff --git a/edgedbpkg/edgedb/__init__.py b/edgedbpkg/edgedb/__init__.py index 4c35ad6b..568ca4a4 100644 --- a/edgedbpkg/edgedb/__init__.py +++ b/edgedbpkg/edgedb/__init__.py @@ -323,7 +323,7 @@ def sh_get_build_wheel_env( "OPENSSL_LIB_DIR", build.sh_must_get_bundled_pkg_lib_path( openssl_pkg, - relative_to="pkgsource", + relative_to="pkgbuild", wd=wd, ), ) @@ -332,7 +332,7 @@ def sh_get_build_wheel_env( "OPENSSL_INCLUDE_DIR", build.sh_must_get_bundled_pkg_include_path( openssl_pkg, - relative_to="pkgsource", + relative_to="pkgbuild", wd=wd, ), ) @@ -604,7 +604,7 @@ def sh_get_build_wheel_env( "OPENSSL_LIB_DIR", build.sh_must_get_bundled_pkg_lib_path( openssl_pkg, - relative_to="pkgsource", + relative_to="pkgbuild", wd=wd, ), ) @@ -613,7 +613,7 @@ def sh_get_build_wheel_env( "OPENSSL_INCLUDE_DIR", build.sh_must_get_bundled_pkg_include_path( openssl_pkg, - relative_to="pkgsource", + relative_to="pkgbuild", wd=wd, ), ) diff --git a/edgedbpkg/edgedb/install.list b/edgedbpkg/edgedb/install.list index 6d6d7cf9..08ce5cb5 100644 --- a/edgedbpkg/edgedb/install.list +++ b/edgedbpkg/edgedb/install.list @@ -1,6 +1,9 @@ {libdir}/postgresql/*.so +{libdir}/python*/site-packages {datadir}/postgresql/extension/* {datadir}/data/** {datadir}/tests/** +{bindir}/edgedb-server +{bindir}/edgedb-load-ext {bindir}/edgedb-server.py {bindir}/edgedb-load-ext.py diff --git a/edgedbpkg/edgedb_ls/__init__.py b/edgedbpkg/edgedb_ls/__init__.py index 0f752778..466dc185 100644 --- a/edgedbpkg/edgedb_ls/__init__.py +++ b/edgedbpkg/edgedb_ls/__init__.py @@ -261,7 +261,7 @@ def sh_get_build_wheel_env( "OPENSSL_INCLUDE_DIR", build.sh_must_get_bundled_pkg_include_path( openssl_pkg, - relative_to="pkgsource", + relative_to="pkgbuild", wd=wd, ), ) diff --git a/edgedbpkg/edgedbcli/__init__.py b/edgedbpkg/edgedbcli/__init__.py index a5dc49c9..a2ef49c2 100644 --- a/edgedbpkg/edgedbcli/__init__.py +++ b/edgedbpkg/edgedbcli/__init__.py @@ -27,8 +27,8 @@ def get_package_layout( ) -> packages.PackageFileLayout: return packages.PackageFileLayout.SINGLE_BINARY - def get_license_files_pattern(self) -> str: - return "" + def get_license_files_patterns(self) -> list[str]: + return [] def get_artifact_metadata(self, build: targets.Build) -> dict[str, Any]: metadata = dict(super().get_artifact_metadata(build)) diff --git a/edgedbpkg/icu/install.list b/edgedbpkg/icu/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/icu/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/icu/no_install.list b/edgedbpkg/icu/no_install.list index 22026414..9b66a950 100644 --- a/edgedbpkg/icu/no_install.list +++ b/edgedbpkg/icu/no_install.list @@ -1,9 +1,5 @@ {libdir}/icu {libdir}/icu/** -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la {libdir}/libicuio* {libdir}/libicutest* {libdir}/libicutu* diff --git a/edgedbpkg/libabseil/install.list b/edgedbpkg/libabseil/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libabseil/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libabseil/no_install.list b/edgedbpkg/libabseil/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libabseil/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libb2/ignore.list b/edgedbpkg/libb2/ignore.list deleted file mode 100644 index fb1ed1ce..00000000 --- a/edgedbpkg/libb2/ignore.list +++ /dev/null @@ -1,4 +0,0 @@ -{datadir} -{datadir}/** -{includedir} -{includedir}/** diff --git a/edgedbpkg/libb2/install.list b/edgedbpkg/libb2/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libb2/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libb2/no_install.list b/edgedbpkg/libb2/no_install.list deleted file mode 100644 index d86ed7f9..00000000 --- a/edgedbpkg/libb2/no_install.list +++ /dev/null @@ -1,4 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la diff --git a/edgedbpkg/libexpat/install.list b/edgedbpkg/libexpat/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libexpat/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libexpat/no_install.list b/edgedbpkg/libexpat/no_install.list deleted file mode 100644 index 45e63944..00000000 --- a/edgedbpkg/libexpat/no_install.list +++ /dev/null @@ -1,15 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{prefix}/share -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libffi/ignore.list b/edgedbpkg/libffi/ignore.list deleted file mode 100644 index 527168a9..00000000 --- a/edgedbpkg/libffi/ignore.list +++ /dev/null @@ -1,2 +0,0 @@ -{prefix}/share/** -{prefix}/include/** diff --git a/edgedbpkg/libffi/install.list b/edgedbpkg/libffi/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libffi/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libffi/no_install.list b/edgedbpkg/libffi/no_install.list deleted file mode 100644 index d86ed7f9..00000000 --- a/edgedbpkg/libffi/no_install.list +++ /dev/null @@ -1,4 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la diff --git a/edgedbpkg/libgdal/ignore.list b/edgedbpkg/libgdal/ignore.list index f72d4be9..bfb0dd85 100644 --- a/edgedbpkg/libgdal/ignore.list +++ b/edgedbpkg/libgdal/ignore.list @@ -1 +1 @@ -{prefix}/share/** +{datadir}/** diff --git a/edgedbpkg/libgdal/install.list b/edgedbpkg/libgdal/install.list index e81d8460..841cda62 100644 --- a/edgedbpkg/libgdal/install.list +++ b/edgedbpkg/libgdal/install.list @@ -1,4 +1 @@ -{libdir}/** -{prefix}/share -{prefix}/share/gdal -{prefix}/share/gdal/** +{datadir}/gdal/** diff --git a/edgedbpkg/libgdal/no_install.list b/edgedbpkg/libgdal/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libgdal/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libgeos/install.list b/edgedbpkg/libgeos/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libgeos/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libgeos/no_install.list b/edgedbpkg/libgeos/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libgeos/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libgeotiff/install.list b/edgedbpkg/libgeotiff/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libgeotiff/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libgeotiff/no_install.list b/edgedbpkg/libgeotiff/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libgeotiff/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libjson_c/install.list b/edgedbpkg/libjson_c/install.list index c1f79bb5..b31e6da8 100644 --- a/edgedbpkg/libjson_c/install.list +++ b/edgedbpkg/libjson_c/install.list @@ -1,2 +1 @@ -{libdir}/** -{prefix}/share/proj/** +{datadir}/proj/** diff --git a/edgedbpkg/libjson_c/no_install.list b/edgedbpkg/libjson_c/no_install.list deleted file mode 100644 index 113f7372..00000000 --- a/edgedbpkg/libjson_c/no_install.list +++ /dev/null @@ -1,12 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir}/* -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libjsoncpp/install.list b/edgedbpkg/libjsoncpp/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libjsoncpp/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libjsoncpp/no_install.list b/edgedbpkg/libjsoncpp/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libjsoncpp/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libpcre2/ignore.list b/edgedbpkg/libpcre2/ignore.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libpcre2/ignore.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libpcre2/install.list b/edgedbpkg/libpcre2/install.list deleted file mode 100644 index 40dba8ee..00000000 --- a/edgedbpkg/libpcre2/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/libpcre2-8.* diff --git a/edgedbpkg/libpcre2/no_install.list b/edgedbpkg/libpcre2/no_install.list deleted file mode 100644 index 7d0fa3a6..00000000 --- a/edgedbpkg/libpcre2/no_install.list +++ /dev/null @@ -1,12 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libproj/install.list b/edgedbpkg/libproj/install.list index c1f79bb5..b31e6da8 100644 --- a/edgedbpkg/libproj/install.list +++ b/edgedbpkg/libproj/install.list @@ -1,2 +1 @@ -{libdir}/** -{prefix}/share/proj/** +{datadir}/proj/** diff --git a/edgedbpkg/libproj/no_install.list b/edgedbpkg/libproj/no_install.list deleted file mode 100644 index 80df33eb..00000000 --- a/edgedbpkg/libproj/no_install.list +++ /dev/null @@ -1,16 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir}/* -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libprotobuf_c/install.list b/edgedbpkg/libprotobuf_c/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libprotobuf_c/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libprotobuf_c/no_install.list b/edgedbpkg/libprotobuf_c/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libprotobuf_c/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libsqlite3/install.list b/edgedbpkg/libsqlite3/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libsqlite3/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libsqlite3/no_install.list b/edgedbpkg/libsqlite3/no_install.list deleted file mode 100644 index d3327635..00000000 --- a/edgedbpkg/libsqlite3/no_install.list +++ /dev/null @@ -1,7 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.la -{bindir} -{bindir}/* -{includedir} -{includedir}/** diff --git a/edgedbpkg/libtiff/install.list b/edgedbpkg/libtiff/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libtiff/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libtiff/no_install.list b/edgedbpkg/libtiff/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/libtiff/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/libuuid/install.list b/edgedbpkg/libuuid/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libuuid/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libuuid/no_install.list b/edgedbpkg/libuuid/no_install.list deleted file mode 100644 index d86ed7f9..00000000 --- a/edgedbpkg/libuuid/no_install.list +++ /dev/null @@ -1,4 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la diff --git a/edgedbpkg/libxml2/install.list b/edgedbpkg/libxml2/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/libxml2/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/libxml2/no_install.list b/edgedbpkg/libxml2/no_install.list deleted file mode 100644 index 41e7eb5b..00000000 --- a/edgedbpkg/libxml2/no_install.list +++ /dev/null @@ -1,19 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{prefix}/share -{prefix}/share/aclocal -{prefix}/share/aclocal/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** -{prefix}/share/gtk-doc -{prefix}/share/gtk-doc/** diff --git a/edgedbpkg/openssl/__init__.py b/edgedbpkg/openssl/__init__.py index acb7b1de..46fdea11 100644 --- a/edgedbpkg/openssl/__init__.py +++ b/edgedbpkg/openssl/__init__.py @@ -1,5 +1,6 @@ from __future__ import annotations +import pathlib import platform import re import shlex @@ -99,3 +100,16 @@ def from_upstream_version(cls, version: str) -> OpenSSL: def get_shlibs(self, build: targets.Build) -> list[str]: return ["ssl", "crypto"] + + def provides_build_tools(self) -> bool: + return True + + def get_install_path( + self, + build: targets.Build, + aspect: targets.InstallAspect, + ) -> pathlib.Path | None: + if aspect == "include": + return build.get_install_prefix(self) / "include" + else: + return super().get_install_path(build, aspect) diff --git a/edgedbpkg/openssl/ignore.list b/edgedbpkg/openssl/ignore.list index f1dda5f5..6f07576d 100644 --- a/edgedbpkg/openssl/ignore.list +++ b/edgedbpkg/openssl/ignore.list @@ -1,4 +1,2 @@ {bindir}/* -{prefix}/share/** {prefix}/etc/** -{prefix}/include/** diff --git a/edgedbpkg/openssl/install.list b/edgedbpkg/openssl/install.list index 5cf09c04..8958701d 100644 --- a/edgedbpkg/openssl/install.list +++ b/edgedbpkg/openssl/install.list @@ -1 +1 @@ -{libdir}/** +{libdir}/ossl-modules/* diff --git a/edgedbpkg/openssl/no_install.list b/edgedbpkg/openssl/no_install.list deleted file mode 100644 index 51877a7b..00000000 --- a/edgedbpkg/openssl/no_install.list +++ /dev/null @@ -1,8 +0,0 @@ -{libdir}/engines* -{libdir}/engines*/** -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** diff --git a/edgedbpkg/pgext/pgvector/ignore.list b/edgedbpkg/pgext/pgvector/ignore.list deleted file mode 100644 index 6e780acb..00000000 --- a/edgedbpkg/pgext/pgvector/ignore.list +++ /dev/null @@ -1 +0,0 @@ -{includedir}/**/*.h diff --git a/edgedbpkg/pgext/postgis/__init__.py b/edgedbpkg/pgext/postgis/__init__.py index af224951..ef799d34 100644 --- a/edgedbpkg/pgext/postgis/__init__.py +++ b/edgedbpkg/pgext/postgis/__init__.py @@ -31,7 +31,7 @@ class PostGIS(pgext.PostgresCExtension): ] artifact_requirements = [ - "libgdal (>=2.0.0)", + "libgdal (>=3.0.0)", "libgeos (>=3.9.0)", "libjson-c", "libpcre2-dev", @@ -42,7 +42,7 @@ class PostGIS(pgext.PostgresCExtension): artifact_build_requirements = [ "postgresql-edgedb (>=13)", - "libgdal-dev (>=2.0.0)", + "libgdal-dev (>=3.0.0)", "libgeos-dev (>=3.9.0)", "libjson-c-dev", "libpcre2-dev", diff --git a/edgedbpkg/pgext/postgis/ignore.list b/edgedbpkg/pgext/postgis/ignore.list deleted file mode 100644 index 6e780acb..00000000 --- a/edgedbpkg/pgext/postgis/ignore.list +++ /dev/null @@ -1 +0,0 @@ -{includedir}/**/*.h diff --git a/edgedbpkg/pgext/postgis/no_install.list b/edgedbpkg/pgext/postgis/no_install.list deleted file mode 100644 index 72bb74fb..00000000 --- a/edgedbpkg/pgext/postgis/no_install.list +++ /dev/null @@ -1,16 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** -{bundledocdir} -{bundledocdir}/** diff --git a/edgedbpkg/postgresql/ignore.list b/edgedbpkg/postgresql/ignore.list index b465f7b8..d14cf43e 100644 --- a/edgedbpkg/postgresql/ignore.list +++ b/edgedbpkg/postgresql/ignore.list @@ -1,9 +1,3 @@ -{bindir}/* {libdir}/lib* -{libdir}/pkgconfig -{libdir}/pkgconfig/* {libdir}/postgresql/pgxs {libdir}/postgresql/pgxs/** -{includedir}/**/*.h -{docdir}/postgresql -{docdir}/postgresql/** diff --git a/edgedbpkg/postgresql/no_install.list b/edgedbpkg/postgresql/no_install.list deleted file mode 100644 index d86ed7f9..00000000 --- a/edgedbpkg/postgresql/no_install.list +++ /dev/null @@ -1,4 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la diff --git a/edgedbpkg/protobuf/__init__.py b/edgedbpkg/protobuf/__init__.py index 7e3026f4..ad46dbc1 100644 --- a/edgedbpkg/protobuf/__init__.py +++ b/edgedbpkg/protobuf/__init__.py @@ -32,10 +32,8 @@ class ProtoBuf(packages.BundledCMakePackage): "zlib-dev", ] - _libabseil = libabseil.LibAbseil("20240722.0") - bundle_deps = [ - _libabseil, + libabseil.LibAbseil("20240722.0"), libjsoncpp.LibJsonCpp("1.9.6"), zlib.Zlib("1.3.1"), ] @@ -66,10 +64,7 @@ def get_configure_args( } def get_shlibs(self, build: targets.Build) -> list[str]: - # pkg-config files' LDFLAGS omit various -labsl deps, - # which makes dependencies of protobuf fail to link correctly. - # work around that by pretending that libabsl is bundled here. return [ "protobuf", "protoc", - ] + self._libabseil.get_shlibs(build) + ] diff --git a/edgedbpkg/protobuf/install.list b/edgedbpkg/protobuf/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/protobuf/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/protobuf/no_install.list b/edgedbpkg/protobuf/no_install.list deleted file mode 100644 index d1f081ea..00000000 --- a/edgedbpkg/protobuf/no_install.list +++ /dev/null @@ -1,14 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{bindir} -{bindir}/* -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/protoc_c/install.list b/edgedbpkg/protoc_c/install.list deleted file mode 100644 index 80b01f0b..00000000 --- a/edgedbpkg/protoc_c/install.list +++ /dev/null @@ -1,2 +0,0 @@ -{libdir}/** -{bindir}/** diff --git a/edgedbpkg/protoc_c/no_install.list b/edgedbpkg/protoc_c/no_install.list deleted file mode 100644 index 09ba5abe..00000000 --- a/edgedbpkg/protoc_c/no_install.list +++ /dev/null @@ -1,12 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la -{libdir}/cmake -{libdir}/cmake/** -{includedir} -{includedir}/** -{mandir} -{mandir}/** -{docdir} -{docdir}/** diff --git a/edgedbpkg/python/ignore.list b/edgedbpkg/python/ignore.list deleted file mode 100644 index cfc0eefa..00000000 --- a/edgedbpkg/python/ignore.list +++ /dev/null @@ -1,6 +0,0 @@ -{bindir}/* -{includedir}/python*/*.h -{includedir}/python*/cpython/*.h -{includedir}/python*/internal/*.h -{mandir} -{mandir}/** diff --git a/edgedbpkg/python/install.list b/edgedbpkg/python/install.list index 8b024227..58643e72 100644 --- a/edgedbpkg/python/install.list +++ b/edgedbpkg/python/install.list @@ -1,2 +1,2 @@ {bindir}/python* -{libdir}/** +{libdir}/python*/** diff --git a/edgedbpkg/python/no_install.list b/edgedbpkg/python/no_install.list index 096bcb61..4eb34132 100644 --- a/edgedbpkg/python/no_install.list +++ b/edgedbpkg/python/no_install.list @@ -1,6 +1,3 @@ -{libdir}/libpython*.a -{libdir}/pkgconfig -{libdir}/pkgconfig/** {libdir}/python*/config-*/libpython*.a {libdir}/python*/test {libdir}/python*/test/** diff --git a/edgedbpkg/zlib/install.list b/edgedbpkg/zlib/install.list deleted file mode 100644 index 5cf09c04..00000000 --- a/edgedbpkg/zlib/install.list +++ /dev/null @@ -1 +0,0 @@ -{libdir}/** diff --git a/edgedbpkg/zlib/no_install.list b/edgedbpkg/zlib/no_install.list deleted file mode 100644 index d86ed7f9..00000000 --- a/edgedbpkg/zlib/no_install.list +++ /dev/null @@ -1,4 +0,0 @@ -{libdir}/pkgconfig -{libdir}/pkgconfig/** -{libdir}/*.a -{libdir}/*.la