Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-09-01 15:22:07 +02:00
67 changed files with 370 additions and 308 deletions

View File

@@ -0,0 +1,19 @@
#!/bin/sh
#
# Minimal pg_config implementation as replacement for the native pg_config application
# Only implements --includedir and --libdir
#
prefix=/usr
case "$1" in
--includedir)
echo "$prefix/include"
;;
--libdir)
echo "$prefix/lib"
;;
*)
echo "Usage: $0 {--includedir|--libdir}"
esac

View File

@@ -4,13 +4,14 @@
#
################################################################################
POSTGRESQL_VERSION = 9.3.4
POSTGRESQL_VERSION = 9.3.5
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
POSTGRESQL_LICENSE = PostgreSQL
POSTGRESQL_LICENSE_FILES = COPYRIGHT
POSTGRESQL_INSTALL_STAGING = YES
POSTGRESQL_CONFIG_SCRIPTS = pg_config
ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
POSTGRESQL_CONF_OPT += --disable-thread-safety
@@ -56,6 +57,13 @@ endef
POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP
define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
$(INSTALL) -m 0755 -D package/postgresql/pg_config \
$(STAGING_DIR)/usr/bin/pg_config
endef
POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG
define POSTGRESQL_INSTALL_INIT_SYSV
$(INSTALL) -m 0755 -D package/postgresql/S50postgresql \
$(TARGET_DIR)/etc/init.d/S50postgresql