Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2530 from dangowrt/update-postgresql-to-9-5-1

Browse source 
postgresql: update source to 9.5.1 and refresh patches
This commit is contained in:
Jo-Philipp Wich 2016-04-15 11:48:48 +02:00
commit ff0f689f97
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/postgresql/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql PKG_NAME:=postgresql
PKG_VERSION:=9.4.4 PKG_VERSION:=9.5.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org> PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
PKG_LICENSE:=PostgreSQL PKG_LICENSE:=PostgreSQL
@ -18,7 +18,7 @@ PKG_SOURCE_URL:=\
http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v$(PKG_VERSION) \ http://ftp9.us.postgresql.org/pub/mirrors/postgresql/source/v$(PKG_VERSION) \
http://ftp.be.postgresql.org/postgresql/source/v$(PKG_VERSION) \ http://ftp.be.postgresql.org/postgresql/source/v$(PKG_VERSION) \
ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION) ftp://ftp-archives.postgresql.org/pub/source/v$(PKG_VERSION)
PKG_MD5SUM:=1fe952c44ed26d7e6a335cf991a9c1c6 PKG_MD5SUM:=11e037afaa4bd0c90bb3c3d955e2b401
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/libpq define Package/libpq
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+zlib +libreadline +libpthread +libncurses +shadow-utils +shadow-su DEPENDS:=+zlib +libreadline +libpthread +libncurses
TITLE:=PostgreSQL client library TITLE:=PostgreSQL client library
URL:=http://www.postgresql.org/ URL:=http://www.postgresql.org/
SUBMENU:=database SUBMENU:=database
@ -42,7 +42,7 @@ endef
define Package/pgsql-cli define Package/pgsql-cli
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
DEPENDS:=+libpq +USE_UCLIBC:librt DEPENDS:=+libpq +USE_UCLIBC:librt +shadow-utils +shadow-su
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
@ -116,7 +116,7 @@ define Build/Configure
--enable-depend \ --enable-depend \
--with-system-timezone=/tmp \ --with-system-timezone=/tmp \
); );
$(MAKE) -C $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc CC="$(HOSTCC)" CFLAGS+="-I../../libpq" $(MAKE) -C $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc CC="$(HOSTCC)"
mv $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg \ mv $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg \
$(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host $(PKG_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg.host
$(MAKE) -C $(PKG_BUILD_DIR)/src/timezone CC="$(HOSTCC)" $(MAKE) -C $(PKG_BUILD_DIR)/src/timezone CC="$(HOSTCC)"

2
libs/postgresql/patches/001-configure_fixes.patch
View file

@ -2,7 +2,7 @@
+++ b/configure.in +++ b/configure.in
@@ -25,7 +25,7 @@ recommended. You can remove the check f @@ -25,7 +25,7 @@ recommended. You can remove the check f
your responsibility whether the result works or not.])]) your responsibility whether the result works or not.])])
AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group]) AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group])
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
-AC_CONFIG_AUX_DIR(config) -AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_AUX_DIR([config])

4
libs/postgresql/patches/200-ranlib.patch
View file

@ -1,8 +1,8 @@
--- a/src/port/Makefile --- a/src/port/Makefile
+++ b/src/port/Makefile +++ b/src/port/Makefile
@@ -52,6 +52,7 @@ uninstall: @@ -53,6 +53,7 @@ uninstall:
libpgport.a: $(OBJS) libpgport.a: $(OBJS)
rm -f $@
$(AR) $(AROPT) $@ $^ $(AR) $(AROPT) $@ $^
+ $(RANLIB) libpgport.a + $(RANLIB) libpgport.a

4
libs/postgresql/patches/800-busybox-default-pager.patch
View file

@ -1,8 +1,8 @@
--- a/src/bin/psql/print.h --- a/src/bin/psql/print.h
+++ b/src/bin/psql/print.h +++ b/src/bin/psql/print.h
@@ -179,10 +179,6 @@ extern void printQuery(const PGresult *r @@ -197,10 +197,6 @@ extern void setDecimalLocale(void);
extern void setDecimalLocale(void);
extern const printTextFormat *get_line_style(const printTableOpt *opt); extern const printTextFormat *get_line_style(const printTableOpt *opt);
extern void refresh_utf8format(const printTableOpt *opt);
-#ifndef __CYGWIN__ -#ifndef __CYGWIN__
-#define DEFAULT_PAGER "more" -#define DEFAULT_PAGER "more"