From 2eecb49a7f77c57fc0c75319f54a9e0a02261042 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 6 Mar 2017 00:17:23 +0100 Subject: [PATCH] postgresql: Build man pages and minor tweaks --- disabled-packages/postgresql/build.sh | 21 ++++++++++++++------- .../postgresql/src-backend-Makefile.patch | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/disabled-packages/postgresql/build.sh b/disabled-packages/postgresql/build.sh index 7e1c1cce..8dc32299 100644 --- a/disabled-packages/postgresql/build.sh +++ b/disabled-packages/postgresql/build.sh @@ -5,20 +5,27 @@ TERMUX_PKG_VERSION=9.6.2 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. +# - USE_UNNAMED_POSIX_SEMAPHORES: Avoid using System V semaphores which are disabled on Android. +# - with-system-tzdata: Doesn't currently work as Android uses a single timezone file. But +# if not specified the build uses zic to build timezone files using hard links, which doesn't +# work on Android 6.0+. TODO: Either patch to work with the combined timezone file, or +# replace the hard links with symlinks. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +pgac_cv_prog_cc_ldflags__Wl___as_needed=yes USE_UNNAMED_POSIX_SEMAPHORES=1 --with-openssl ---without-gssapi ---with-readline +--with-system-tzdata=/system/usr/share/zoneinfo " TERMUX_PKG_EXTRA_MAKE_ARGS=" -s" - -termux_step_pre_configure () { - LDFLAGS+=" -llog" -} +TERMUX_PKG_RM_AFTER_INSTALL="lib/libecpg* bin/ecpg share/man/man1/ecpg.1" termux_step_post_make_install() { - # Sync with postgresql-contrib.subpackage.sh. + # Man pages are not installed by default: + make -C doc/src/sgml install-man + + # Sync with postgresql-contrib.subpackage.sh: for contrib in hstore pgcrypto pg_stat_statements; do (cd contrib/$contrib && make -s -j $TERMUX_MAKE_PROCESSES install) done diff --git a/disabled-packages/postgresql/src-backend-Makefile.patch b/disabled-packages/postgresql/src-backend-Makefile.patch index cb49a36c..af168a2d 100644 --- a/disabled-packages/postgresql/src-backend-Makefile.patch +++ b/disabled-packages/postgresql/src-backend-Makefile.patch @@ -5,7 +5,7 @@ diff -u -r ../postgresql-9.6.1/src/backend/Makefile ./src/backend/Makefile LIBS += -lsystemd endif -+LIBS += -landroid-shmem ++LIBS += -landroid-shmem -llog + ########################################################################## -- 2.11.0