From 159d61f1615fc2d159359d5c2c00fa0a09182ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Sat, 16 Nov 2024 20:03:55 +0100 Subject: [PATCH] [dev-db/timescaledb] welcome to "fix multibuild once and for all" season 2 --- dev-db/timescaledb/timescaledb-2.17.2.ebuild | 47 +++++++++++++------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/dev-db/timescaledb/timescaledb-2.17.2.ebuild b/dev-db/timescaledb/timescaledb-2.17.2.ebuild index 314250e..20f1786 100644 --- a/dev-db/timescaledb/timescaledb-2.17.2.ebuild +++ b/dev-db/timescaledb/timescaledb-2.17.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -POSTGRES_COMPAT=( {14..16} ) +POSTGRES_COMPAT=( {14..17} ) POSTGRES_USEDEP="ssl" inherit cmake postgres-multi @@ -22,31 +22,48 @@ RESTRICT="test" DEPEND="${POSTGRES_DEP}" RDEPEND="${DEPEND}" +timescale_src_prepare() { + local CMAKE_USE_DIR=$BUILD_DIR + cmake_src_prepare +} + src_prepare() { postgres-multi_src_prepare - postgres-multi_foreach cmake_src_prepare + postgres-multi_foreach timescale_src_prepare +} + +timescale_src_configure() { + local CMAKE_USE_DIR=$BUILD_DIR + local mycmakeargs=( + -DAPACHE_ONLY=$(usex tsl OFF ON) + -DWARNINGS_AS_ERRORS=OFF + -DSEND_TELEMETRY_DEFAULT=OFF + -DREGRESS_CHECKS=OFF + -DPG_CONFIG=${PG_CONFIG} + ) + cmake_src_configure } src_configure() { - pg_src_configure () { - local mycmakeargs=( - -DAPACHE_ONLY=$(usex tsl OFF ON) - -DWARNINGS_AS_ERRORS=OFF - -DSEND_TELEMETRY_DEFAULT=OFF - -DREGRESS_CHECKS=OFF - -DPG_CONFIG=${PG_CONFIG} - ) - cmake_src_configure - } - postgres-multi_foreach pg_src_configure + postgres-multi_foreach timescale_src_configure +} + +timescale_src_compile() { + local CMAKE_USE_DIR=$BUILD_DIR + cmake_src_compile } src_compile() { - postgres-multi_foreach cmake_src_compile + postgres-multi_foreach timescale_src_compile +} + +timescale_src_install() { + local CMAKE_USE_DIR=$BUILD_DIR + cmake_src_install } src_install() { - postgres-multi_foreach cmake_src_install + postgres-multi_foreach timescale_src_install find "${ED}" -name '*.a' -delete }