mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
postgresql: fix build and improve packaging
* make sure contrib stuff gets built and installed * refresh patches and improve Makefile while at it Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
+++ b/configure.in
|
||||
@@ -25,7 +25,7 @@ recommended. You can remove the check f
|
||||
your responsibility whether the result works or not.])])
|
||||
AC_COPYRIGHT([Copyright (c) 1996-2015, PostgreSQL Global Development Group])
|
||||
AC_COPYRIGHT([Copyright (c) 1996-2014, PostgreSQL Global Development Group])
|
||||
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
|
||||
-AC_CONFIG_AUX_DIR(config)
|
||||
+AC_CONFIG_AUX_DIR([config])
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/GNUmakefile.in
|
||||
+++ b/GNUmakefile.in
|
||||
@@ -8,7 +8,7 @@ subdir =
|
||||
top_builddir = .
|
||||
include $(top_builddir)/src/Makefile.global
|
||||
|
||||
-$(call recurse,all install,src config)
|
||||
+$(call recurse,all install,src config contrib)
|
||||
|
||||
all:
|
||||
+@echo "All of PostgreSQL successfully made. Ready to install."
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/src/bin/psql/print.h
|
||||
+++ b/src/bin/psql/print.h
|
||||
@@ -197,10 +197,6 @@ extern void setDecimalLocale(void);
|
||||
@@ -179,10 +179,6 @@ extern void printQuery(const PGresult *r
|
||||
extern void setDecimalLocale(void);
|
||||
extern const printTextFormat *get_line_style(const printTableOpt *opt);
|
||||
extern void refresh_utf8format(const printTableOpt *opt);
|
||||
|
||||
-#ifndef __CYGWIN__
|
||||
-#define DEFAULT_PAGER "more"
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
===================================================================
|
||||
--- postgresql-9.5.4.orig/src/bin/pg_ctl/pg_ctl.c
|
||||
+++ postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
@@ -95,6 +95,7 @@ static char *event_source = NULL;
|
||||
--- a/src/bin/pg_ctl/pg_ctl.c
|
||||
+++ b/src/bin/pg_ctl/pg_ctl.c
|
||||
@@ -94,6 +94,7 @@ static char *exec_path = NULL;
|
||||
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
|
||||
static char *register_username = NULL;
|
||||
static char *register_password = NULL;
|
||||
@@ -10,8 +8,8 @@ Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
static char *argv0 = NULL;
|
||||
static bool allow_core_files = false;
|
||||
static time_t start_time;
|
||||
@@ -2114,6 +2115,9 @@ do_help(void)
|
||||
#endif
|
||||
@@ -2093,6 +2094,9 @@ do_help(void)
|
||||
printf(_(" -D, --pgdata=DATADIR location of the database storage area\n"));
|
||||
printf(_(" -s, --silent only print errors, no informational messages\n"));
|
||||
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
|
||||
+#if !defined(WIN32) && !defined(__CYGWIN__)
|
||||
@@ -20,7 +18,7 @@ Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
printf(_(" -V, --version output version information, then exit\n"));
|
||||
printf(_(" -w wait until operation completes\n"));
|
||||
printf(_(" -W do not wait until operation completes\n"));
|
||||
@@ -2310,6 +2314,7 @@ main(int argc, char **argv)
|
||||
@@ -2289,6 +2293,7 @@ main(int argc, char **argv)
|
||||
{"pgdata", required_argument, NULL, 'D'},
|
||||
{"silent", no_argument, NULL, 's'},
|
||||
{"timeout", required_argument, NULL, 't'},
|
||||
@@ -28,7 +26,7 @@ Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
{"core-files", no_argument, NULL, 'c'},
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
@@ -2350,20 +2355,6 @@ main(int argc, char **argv)
|
||||
@@ -2329,20 +2334,6 @@ main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -49,7 +47,7 @@ Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
|
||||
env_wait = getenv("PGCTLTIMEOUT");
|
||||
if (env_wait != NULL)
|
||||
@@ -2449,11 +2440,15 @@ main(int argc, char **argv)
|
||||
@@ -2416,11 +2407,15 @@ main(int argc, char **argv)
|
||||
wait_seconds_arg = true;
|
||||
break;
|
||||
case 'U':
|
||||
@@ -65,7 +63,7 @@ Index: postgresql-9.5.4/src/bin/pg_ctl/pg_ctl.c
|
||||
break;
|
||||
case 'w':
|
||||
do_wait = true;
|
||||
@@ -2535,6 +2530,41 @@ main(int argc, char **argv)
|
||||
@@ -2502,6 +2497,41 @@ main(int argc, char **argv)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user