cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-29 15:08:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

postgresql: fix pkg-config file

Browse Source 
Currently the pc file has includedir hard coded to "/usr/include" and
libdir to "/usr/lib". This commit changes this so they can be controlled
via the "prefix" variable.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Sebastian Kemper
2020-03-04 21:52:06 +01:00
parent 5c4480451c
commit 00882ebb36
5 changed files with 49 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/postgresql/patches/900-pg_ctl-setuid.patch
+12 -12
View File
@@ -1,14 +1,14 @@
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -88,6 +88,7 @@ static char *event_source = NULL;
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
@@ -93,6 +93,7 @@ static char *event_source = NULL;
static char *register_servicename = "PostgreSQL"; /* FIXME: + version ID? */
static char *register_username = NULL;
static char *register_password = NULL;
+static char *username = "";
static char *argv0 = NULL;
static bool allow_core_files = false;
static time_t start_time;
@@ -1930,6 +1931,9 @@ do_help(void)
@@ -2047,6 +2048,9 @@ do_help(void)
#endif
printf(_(" -s, --silent only print errors, no informational messages\n"));
printf(_(" -t, --timeout=SECS seconds to wait when using -w option\n"));
@@ -16,17 +16,17 @@
+ printf(_(" -U, --username=NAME user name of account PostgreSQL server is running as\n"));
+#endif
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"));
@@ -2126,6 +2130,7 @@ main(int argc, char **argv)
{"pgdata", required_argument, NULL, 'D'},
printf(_(" -w, --wait wait until operation completes (default)\n"));
printf(_(" -W, --no-wait do not wait until operation completes\n"));
@@ -2259,6 +2263,7 @@ main(int argc, char **argv)
{"options", required_argument, NULL, 'o'},
{"silent", no_argument, NULL, 's'},
{"timeout", required_argument, NULL, 't'},
+ {"username", required_argument, NULL, 'U'},
{"core-files", no_argument, NULL, 'c'},
{NULL, 0, NULL, 0}
};
@@ -2166,20 +2171,6 @@ main(int argc, char **argv)
{"wait", no_argument, NULL, 'w'},
{"no-wait", no_argument, NULL, 'W'},
@@ -2299,20 +2304,6 @@ main(int argc, char **argv)
}
}
@@ -47,7 +47,7 @@
env_wait = getenv("PGCTLTIMEOUT");
if (env_wait != NULL)
@@ -2265,11 +2256,15 @@ main(int argc, char **argv)
@@ -2399,11 +2390,15 @@ main(int argc, char **argv)
wait_seconds_arg = true;
break;
case 'U':
@@ -63,7 +63,7 @@
break;
case 'w':
do_wait = true;
@@ -2351,6 +2346,41 @@ main(int argc, char **argv)
@@ -2485,6 +2480,41 @@ main(int argc, char **argv)
exit(1);
}