postgresql: do not split postgresql-contrib (#2336)

[termux-packages] / packages / postgresql / build.sh

diff --git a/packages/postgresql/build.sh b/packages/postgresql/build.sh
index d171037..8717be4 100644 (file)
--- a/packages/postgresql/build.sh
+++ b/packages/postgresql/build.sh
@@ -1,9 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://www.postgresql.org
 TERMUX_PKG_DESCRIPTION="Object-relational SQL database"
 TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas'
-TERMUX_PKG_VERSION=9.6.2
+TERMUX_PKG_VERSION=10.3
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SHA256=6ea268780ee35e88c65cdb0af7955ad90b7d0ef34573867f223f14e43467931a
 TERMUX_PKG_SRCURL=https://ftp.postgresql.org/pub/source/v$TERMUX_PKG_VERSION/postgresql-$TERMUX_PKG_VERSION.tar.bz2
-TERMUX_PKG_SHA256=0187b5184be1c09034e74e44761505e52357248451b0c854dddec6c231fe50c9
 TERMUX_PKG_DEPENDS="openssl, libcrypt, readline, libandroid-shmem"
 # - pgac_cv_prog_cc_ldflags__Wl___as_needed: Inform that the linker supports as-needed. It's
 #   not stricly necessary but avoids unnecessary linking of binaries.
@@ -22,11 +23,13 @@ ZIC=$TERMUX_PKG_HOSTBUILD_DIR/src/timezone/zic
 TERMUX_PKG_EXTRA_MAKE_ARGS=" -s"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/libecpg* bin/ecpg share/man/man1/ecpg.1"
 TERMUX_PKG_HOSTBUILD=yes
+TERMUX_PKG_BREAKS="postgresql-contrib (<= 10.3-1)"
+TERMUX_PKG_REPLACES="postgresql-contrib (<= 10.3-1)"
 
 termux_step_host_build() {
        # Build a native zic binary which we have patched to
        # use symlinks instead of hard links.
-       $TERMUX_PKG_SRCDIR/configure
+       $TERMUX_PKG_SRCDIR/configure --without-readline
        make ./src/timezone/zic
 }
 
@@ -34,7 +37,6 @@ termux_step_post_make_install() {
        # Man pages are not installed by default:
        make -C doc/src/sgml install-man
 
-       # Sync with postgresql-contrib.subpackage.sh:
        for contrib in \
                hstore \
                pageinspect \
@@ -42,7 +44,14 @@ termux_step_post_make_install() {
                pgrowlocks \
                pg_freespacemap \
                pg_stat_statements\
+               fuzzystrmatch \
                ; do
                (cd contrib/$contrib && make -s -j $TERMUX_MAKE_PROCESSES install)
        done
 }
+
+termux_step_post_massage() {
+       # Remove bin/pg_config so e.g. php doesn't try to use it, which won't
+       # work as it's a cross-compiled binary:
+       rm $TERMUX_PREFIX/bin/pg_config
+}