Merge pull request #1695 from plntyk/fix_postgresql_various

Fix various postgresql issues
This commit is contained in:
Jo-Philipp Wich
2015-08-21 10:20:26 +02:00
+18 -2
View File
@@ -42,7 +42,7 @@ endef
define Package/pgsql-cli define Package/pgsql-cli
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libpq DEPENDS:=+libpq @USE_UCLIBC:+librt
TITLE:=Command Line Interface (CLI) to PostgreSQL databases TITLE:=Command Line Interface (CLI) to PostgreSQL databases
URL:=http://www.postgresql.org/ URL:=http://www.postgresql.org/
SUBMENU:=database SUBMENU:=database
@@ -55,7 +55,7 @@ endef
define Package/pgsql-server define Package/pgsql-server
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libpq DEPENDS:=+libpq @USE_UCLIBC:+librt
TITLE:=PostgreSQL databases Server TITLE:=PostgreSQL databases Server
URL:=http://www.postgresql.org/ URL:=http://www.postgresql.org/
SUBMENU:=database SUBMENU:=database
@@ -66,9 +66,25 @@ define Package/pgsql-server/description
PostgreSQL databases Server. PostgreSQL databases Server.
endef endef
PGSQL_CONFIG_VARS:= \
pgac_cv_snprintf_long_long_int_format="%lld" \
pgac_cv_snprintf_size_t_support=yes
ifeq ($(CONFIG_USE_UCLIBC),y)
# PostgreSQL does not build against uClibc with locales
# enabled, due to an uClibc bug, see
# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html
# so overwrite automatic detection and disable locale support
PGSQL_CONFIG_VARS+= \
pgac_cv_type_locale_t=no
endif
TARGET_CONFIGURE_OPTS+=$(PGSQL_CONFIG_VARS)
# Need a native ecpg ,pg_config, and zic for build # Need a native ecpg ,pg_config, and zic for build
define Build/Configure define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \ (cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(PGSQL_CONFIG_VARS) \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--exec-prefix=/usr \ --exec-prefix=/usr \