Also add a needed CMake define to disable regression checks, remove the upstreamed patch from v1.4.2 and minor Makefile cosmetics.
Signed-off-by: Björn Esser <[email protected]> --- ...CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch | 83 ------------------- patches/timescaledb-1.4.2/series | 4 - rules/timescaledb.make | 18 ++-- 3 files changed, 12 insertions(+), 93 deletions(-) delete mode 100644 patches/timescaledb-1.4.2/0001-CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch delete mode 100644 patches/timescaledb-1.4.2/series diff --git a/patches/timescaledb-1.4.2/0001-CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch b/patches/timescaledb-1.4.2/0001-CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch deleted file mode 100644 index 1d0783ad7..000000000 --- a/patches/timescaledb-1.4.2/0001-CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch +++ /dev/null @@ -1,83 +0,0 @@ -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <[email protected]> -Date: Tue, 8 Oct 2019 16:07:18 +0200 -Subject: [PATCH] CMake: Allow PG_DIRS to be set on CLI. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Björn Esser <[email protected]> ---- - CMakeLists.txt | 60 +++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 36 insertions(+), 24 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1cf987e25087..440ca400d27a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,30 +173,42 @@ if ((${PG_VERSION} VERSION_LESS "9.6") - endif () - - # Get PostgreSQL configuration from pg_config --execute_process( -- COMMAND ${PG_CONFIG} --includedir -- OUTPUT_VARIABLE PG_INCLUDEDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND ${PG_CONFIG} --includedir-server -- OUTPUT_VARIABLE PG_INCLUDEDIR_SERVER -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND ${PG_CONFIG} --libdir -- OUTPUT_VARIABLE PG_LIBDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND ${PG_CONFIG} --pkglibdir -- OUTPUT_VARIABLE PG_PKGLIBDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND ${PG_CONFIG} --sharedir -- OUTPUT_VARIABLE PG_SHAREDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process( -- COMMAND ${PG_CONFIG} --bindir -- OUTPUT_VARIABLE PG_BINDIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) -+if (NOT PG_INCLUDEDIR) -+ execute_process( -+ COMMAND ${PG_CONFIG} --includedir -+ OUTPUT_VARIABLE PG_INCLUDEDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () -+if (NOT PG_INCLUDEDIR_SERVER) -+ execute_process( -+ COMMAND ${PG_CONFIG} --includedir-server -+ OUTPUT_VARIABLE PG_INCLUDEDIR_SERVER -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () -+if (NOT PG_LIBDIR) -+ execute_process( -+ COMMAND ${PG_CONFIG} --libdir -+ OUTPUT_VARIABLE PG_LIBDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () -+if (NOT PG_PKGLIBDIR) -+ execute_process( -+ COMMAND ${PG_CONFIG} --pkglibdir -+ OUTPUT_VARIABLE PG_PKGLIBDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () -+if (NOT PG_SHAREDIR) -+ execute_process( -+ COMMAND ${PG_CONFIG} --sharedir -+ OUTPUT_VARIABLE PG_SHAREDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () -+if (NOT PG_BINDIR) -+ execute_process( -+ COMMAND ${PG_CONFIG} --bindir -+ OUTPUT_VARIABLE PG_BINDIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+endif () - execute_process( - COMMAND ${PG_CONFIG} --cppflags - OUTPUT_VARIABLE PG_CPPFLAGS diff --git a/patches/timescaledb-1.4.2/series b/patches/timescaledb-1.4.2/series deleted file mode 100644 index 21fdfcd49..000000000 --- a/patches/timescaledb-1.4.2/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-CMake-Allow-PG_DIRS-to-be-set-on-CLI.patch -# de329d03824139106c1f232b0f546edc - git-ptx-patches magic diff --git a/rules/timescaledb.make b/rules/timescaledb.make index a46c3ee3f..ab7f48f22 100644 --- a/rules/timescaledb.make +++ b/rules/timescaledb.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TIMESCALEDB) += timescaledb # # Paths and names # -TIMESCALEDB_VERSION := 1.4.2 -TIMESCALEDB_MD5 := d3c1282031bc2c5a314eb217f4a49796 +TIMESCALEDB_VERSION := 1.5.0 +TIMESCALEDB_MD5 := d48403460f6ee4e3a8f9ba51a5a95899 TIMESCALEDB := timescaledb-$(TIMESCALEDB_VERSION) TIMESCALEDB_SUFFIX := tar.gz TIMESCALEDB_URL := https://github.com/timescale/timescaledb/archive/$(TIMESCALEDB_VERSION).$(TIMESCALEDB_SUFFIX) @@ -34,18 +34,24 @@ TIMESCALEDB_CONF_TOOL := cmake TIMESCALEDB_CONF_OPT := \ $(CROSS_CMAKE_USR) \ -DCMAKE_PROGRAM_PATH="$(PTXDIST_SYSROOT_HOST)" \ + -DGIT_EXECUTABLE=false \ -DPG_BINDIR="/usr/bin" \ -DPG_INCLUDEDIR="$(PTXDIST_SYSROOT_TARGET)/usr/include" \ -DPG_INCLUDEDIR_SERVER="$(PTXDIST_SYSROOT_TARGET)/usr/include/postgresql/server" \ -DPG_LIBDIR="$(PTXDIST_SYSROOT_TARGET)/usr/lib" \ -DPG_PKGLIBDIR="/usr/lib/postgresql" \ -DPG_SHAREDIR="/usr/share/postgresql" \ - -DUSE_OPENSSL=0 \ - -DSEND_TELEMETRY_DEFAULT=0 \ -DAPACHE_ONLY=1 \ - -DGIT_EXECUTABLE=false + -DREGRESS_CHECKS=0 \ + -DSEND_TELEMETRY_DEFAULT=0 \ + -DUSE_OPENSSL=0 -# -DAPACHE_ONLY=1 is needed to build a free/libre version of TimescaleDB. +# -DAPACHE_ONLY=1 is needed to build a free/libre version +# of TimescaleDB. +# -DREGRESS_CHECKS=0 disables isolation regress checks, +# which need pg_regress. +# -DSEND_TELEMETRY_DEFAULT=0 disables calling home. +# -DUSE_OPENSSL=0 disables OpenSSL. # ---------------------------------------------------------------------------- # Target-Install -- 2.24.0.rc1 _______________________________________________ ptxdist mailing list [email protected]
