* [PR PATCH] postgresql: fix shell version of pg_config.sh
@ 2020-04-09 15:03 sgn
2020-04-09 15:06 ` xtraeme
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: sgn @ 2020-04-09 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages postgresql-fix-pg-config
https://github.com/void-linux/void-packages/pull/20794
postgresql: fix shell version of pg_config.sh
@xtraeme @pullmoll Please help to pull this.
Sorry, but I've another thing to do.
The old version should work because echo doesn't accept -W -f -L -l by now
A patch file from https://github.com/void-linux/void-packages/pull/20794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-postgresql-fix-pg-config-20794.patch --]
[-- Type: text/x-diff, Size: 3101 bytes --]
From cfd5b6d21bdf930b457c60c2c5acdc58d68d8395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Apr 2020 22:01:41 +0700
Subject: [PATCH] postgresql: fix shell version of pg_config.sh
---
srcpkgs/postgresql/files/pg_config.sh.in | 46 ++++++++++++------------
srcpkgs/postgresql/template | 2 +-
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/srcpkgs/postgresql/files/pg_config.sh.in b/srcpkgs/postgresql/files/pg_config.sh.in
index 5e6a0d37773..287954e2786 100644
--- a/srcpkgs/postgresql/files/pg_config.sh.in
+++ b/srcpkgs/postgresql/files/pg_config.sh.in
@@ -112,28 +112,28 @@ done
for arg
do
case "$arg" in
- --bindir) echo "$BINDIR" ;;
- --docdir) echo "$DOCDIR" ;;
- --htmldir) echo "$HTMLDIR" ;;
- --includedir) echo "$INCLUDEDIR" ;;
- --pkgincludedir) echo "$PKGINCLUDEDIR" ;;
- --includedir-server) echo "$INCLUDEDIR_SERVER" ;;
- --libdir) echo "$LIBDIR" ;;
- --pkglibdir) echo "$PKGLIBDIR" ;;
- --localedir) echo "$LOCALEDIR" ;;
- --mandir) echo "$MANDIR" ;;
- --sharedir) echo "$SHAREDIR" ;;
- --sysconfdir) echo "$SYSCONFDIR" ;;
- --pgxs) echo "$PGXS" ;;
- --configure) echo "$CONFIGURE" ;;
- --cc) echo "$CC" ;;
- --cppflags) echo "$CPPFLAGS" ;;
- --cflags) echo "$CFLAGS" ;;
- --cflags_sl) echo "$CFLAGS_SL" ;;
- --ldflags) echo "$LDFLAGS" ;;
- --ldflags_ex) echo "$LDFLAGS_EX" ;;
- --ldflags_sl) echo "$LDFLAGS_SL" ;;
- --libs) echo "$LIBS" ;;
- --version) echo "$VERSION" ;;
+ --bindir) printf '%s\n' "$BINDIR" ;;
+ --docdir) printf '%s\n' "$DOCDIR" ;;
+ --htmldir) printf '%s\n' "$HTMLDIR" ;;
+ --includedir) printf '%s\n' "$INCLUDEDIR" ;;
+ --pkgincludedir) printf '%s\n' "$PKGINCLUDEDIR" ;;
+ --includedir-server) printf '%s\n' "$INCLUDEDIR_SERVER" ;;
+ --libdir) printf '%s\n' "$LIBDIR" ;;
+ --pkglibdir) printf '%s\n' "$PKGLIBDIR" ;;
+ --localedir) printf '%s\n' "$LOCALEDIR" ;;
+ --mandir) printf '%s\n' "$MANDIR" ;;
+ --sharedir) printf '%s\n' "$SHAREDIR" ;;
+ --sysconfdir) printf '%s\n' "$SYSCONFDIR" ;;
+ --pgxs) printf '%s\n' "$PGXS" ;;
+ --configure) printf '%s\n' "$CONFIGURE" ;;
+ --cc) printf '%s\n' "$CC" ;;
+ --cppflags) printf '%s\n' "$CPPFLAGS" ;;
+ --cflags) printf '%s\n' "$CFLAGS" ;;
+ --cflags_sl) printf '%s\n' "$CFLAGS_SL" ;;
+ --ldflags) printf '%s\n' "$LDFLAGS" ;;
+ --ldflags_ex) printf '%s\n' "$LDFLAGS_EX" ;;
+ --ldflags_sl) printf '%s\n' "$LDFLAGS_SL" ;;
+ --libs) printf '%s\n' "$LIBS" ;;
+ --version) printf '%s\n' "$VERSION" ;;
esac
done
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 084ae5bb70f..29031650d56 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
version=9.6.17
-revision=2
+revision=3
build_style=gnu-configure
make_build_target=world
configure_args="--with-openssl --with-python
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
@ 2020-04-09 15:06 ` xtraeme
2020-04-09 15:25 ` Piraty
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: xtraeme @ 2020-04-09 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/20794#issuecomment-611579058
Comment:
@pullmoll please take care of it
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
2020-04-09 15:06 ` xtraeme
@ 2020-04-09 15:25 ` Piraty
2020-04-09 15:28 ` sgn
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Piraty @ 2020-04-09 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/20794#issuecomment-611589375
Comment:
why now make echo a function
```
echo() { printf '%s\n' "$@" ; }
```
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
2020-04-09 15:06 ` xtraeme
2020-04-09 15:25 ` Piraty
@ 2020-04-09 15:28 ` sgn
2020-04-09 15:29 ` [PR PATCH] [Updated] " sgn
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2020-04-09 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/20794#issuecomment-611591002
Comment:
> why now make echo a function
>
> ```
> echo() { printf '%s\n' "$@" ; }
> ```
That would work, too.
I'll change it that way.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
` (2 preceding siblings ...)
2020-04-09 15:28 ` sgn
@ 2020-04-09 15:29 ` sgn
2020-04-09 15:37 ` xtraeme
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2020-04-09 15:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages postgresql-fix-pg-config
https://github.com/void-linux/void-packages/pull/20794
postgresql: fix shell version of pg_config.sh
@xtraeme @pullmoll Please help to pull this.
Sorry, but I've another thing to do.
The old version (#20783) may work because echo doesn't accept -W -f -L -l by now
A patch file from https://github.com/void-linux/void-packages/pull/20794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-postgresql-fix-pg-config-20794.patch --]
[-- Type: text/x-diff, Size: 1234 bytes --]
From 4d02dc536e1fe74cc08f8e9de6d55e2c0ea2ed67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Apr 2020 22:01:41 +0700
Subject: [PATCH] postgresql: fix shell version of pg_config.sh
[skip ci]
---
srcpkgs/postgresql/files/pg_config.sh.in | 4 ++++
srcpkgs/postgresql/template | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/postgresql/files/pg_config.sh.in b/srcpkgs/postgresql/files/pg_config.sh.in
index 5e6a0d37773..a1ab3f62d55 100644
--- a/srcpkgs/postgresql/files/pg_config.sh.in
+++ b/srcpkgs/postgresql/files/pg_config.sh.in
@@ -1,6 +1,10 @@
#!/bin/sh
# Released to Public Domain by Doan Tran Cong Danh
+echo() {
+ printf '%s\n' "$@"
+}
+
sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
BINDIR="$sysroot/usr/bin"
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 084ae5bb70f..29031650d56 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
version=9.6.17
-revision=2
+revision=3
build_style=gnu-configure
make_build_target=world
configure_args="--with-openssl --with-python
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
` (3 preceding siblings ...)
2020-04-09 15:29 ` [PR PATCH] [Updated] " sgn
@ 2020-04-09 15:37 ` xtraeme
2020-04-09 15:41 ` [PR PATCH] [Updated] " sgn
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: xtraeme @ 2020-04-09 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by xtraeme on void-packages repository
https://github.com/void-linux/void-packages/pull/20794#issuecomment-611596326
Comment:
Hmm better use print. An echo func might conflict
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
` (4 preceding siblings ...)
2020-04-09 15:37 ` xtraeme
@ 2020-04-09 15:41 ` sgn
2020-04-09 15:53 ` [PR PATCH] [Merged]: " pullmoll
2020-04-09 15:53 ` pullmoll
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2020-04-09 15:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages postgresql-fix-pg-config
https://github.com/void-linux/void-packages/pull/20794
postgresql: fix shell version of pg_config.sh
@xtraeme @pullmoll Please help to pull this.
Sorry, but I've another thing to do.
The old version (#20783) may work because echo doesn't accept -W -f -L -l by now
A patch file from https://github.com/void-linux/void-packages/pull/20794.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-postgresql-fix-pg-config-20794.patch --]
[-- Type: text/x-diff, Size: 3503 bytes --]
From 8079f3d214b5a9ac56b57818a7013de836342975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Apr 2020 22:01:41 +0700
Subject: [PATCH] postgresql: fix shell version of pg_config.sh
[skip ci]
---
srcpkgs/postgresql/files/pg_config.sh.in | 56 +++++++++++++-----------
srcpkgs/postgresql/template | 2 +-
2 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/srcpkgs/postgresql/files/pg_config.sh.in b/srcpkgs/postgresql/files/pg_config.sh.in
index 5e6a0d37773..4598753f693 100644
--- a/srcpkgs/postgresql/files/pg_config.sh.in
+++ b/srcpkgs/postgresql/files/pg_config.sh.in
@@ -1,6 +1,10 @@
#!/bin/sh
# Released to Public Domain by Doan Tran Cong Danh
+print() {
+ printf '%s\n' "$@"
+}
+
sysroot="$(cd "${0%/*}" && cd ../.. && pwd)"
BINDIR="$sysroot/usr/bin"
@@ -29,9 +33,9 @@ LIBS="@LIBS@"
VERSION="PostgreSQL @VERSION@"
if [ "$sysroot" != "/" ]; then
- CPPFLAGS="$(echo "$CPPFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- CFLAGS="$(echo "$CFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
- LDFLAGS="$(echo "$LDFLAGS" | sed "s,-L *\\(/usr/lib\\),-L$sysroot\\1,g")"
+ CPPFLAGS="$(print "$CPPFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
+ CFLAGS="$(print "$CFLAGS" | sed "s,-I *\\(/usr/include\\),-I$sysroot\\1,g")"
+ LDFLAGS="$(print "$LDFLAGS" | sed "s,-L *\\(/usr/lib\\),-L$sysroot\\1,g")"
fi
usage() {
@@ -112,28 +116,28 @@ done
for arg
do
case "$arg" in
- --bindir) echo "$BINDIR" ;;
- --docdir) echo "$DOCDIR" ;;
- --htmldir) echo "$HTMLDIR" ;;
- --includedir) echo "$INCLUDEDIR" ;;
- --pkgincludedir) echo "$PKGINCLUDEDIR" ;;
- --includedir-server) echo "$INCLUDEDIR_SERVER" ;;
- --libdir) echo "$LIBDIR" ;;
- --pkglibdir) echo "$PKGLIBDIR" ;;
- --localedir) echo "$LOCALEDIR" ;;
- --mandir) echo "$MANDIR" ;;
- --sharedir) echo "$SHAREDIR" ;;
- --sysconfdir) echo "$SYSCONFDIR" ;;
- --pgxs) echo "$PGXS" ;;
- --configure) echo "$CONFIGURE" ;;
- --cc) echo "$CC" ;;
- --cppflags) echo "$CPPFLAGS" ;;
- --cflags) echo "$CFLAGS" ;;
- --cflags_sl) echo "$CFLAGS_SL" ;;
- --ldflags) echo "$LDFLAGS" ;;
- --ldflags_ex) echo "$LDFLAGS_EX" ;;
- --ldflags_sl) echo "$LDFLAGS_SL" ;;
- --libs) echo "$LIBS" ;;
- --version) echo "$VERSION" ;;
+ --bindir) print "$BINDIR" ;;
+ --docdir) print "$DOCDIR" ;;
+ --htmldir) print "$HTMLDIR" ;;
+ --includedir) print "$INCLUDEDIR" ;;
+ --pkgincludedir) print "$PKGINCLUDEDIR" ;;
+ --includedir-server) print "$INCLUDEDIR_SERVER" ;;
+ --libdir) print "$LIBDIR" ;;
+ --pkglibdir) print "$PKGLIBDIR" ;;
+ --localedir) print "$LOCALEDIR" ;;
+ --mandir) print "$MANDIR" ;;
+ --sharedir) print "$SHAREDIR" ;;
+ --sysconfdir) print "$SYSCONFDIR" ;;
+ --pgxs) print "$PGXS" ;;
+ --configure) print "$CONFIGURE" ;;
+ --cc) print "$CC" ;;
+ --cppflags) print "$CPPFLAGS" ;;
+ --cflags) print "$CFLAGS" ;;
+ --cflags_sl) print "$CFLAGS_SL" ;;
+ --ldflags) print "$LDFLAGS" ;;
+ --ldflags_ex) print "$LDFLAGS_EX" ;;
+ --ldflags_sl) print "$LDFLAGS_SL" ;;
+ --libs) print "$LIBS" ;;
+ --version) print "$VERSION" ;;
esac
done
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 084ae5bb70f..29031650d56 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -1,7 +1,7 @@
# Template file for 'postgresql'
pkgname=postgresql
version=9.6.17
-revision=2
+revision=3
build_style=gnu-configure
make_build_target=world
configure_args="--with-openssl --with-python
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
` (5 preceding siblings ...)
2020-04-09 15:41 ` [PR PATCH] [Updated] " sgn
@ 2020-04-09 15:53 ` pullmoll
2020-04-09 15:53 ` pullmoll
7 siblings, 0 replies; 9+ messages in thread
From: pullmoll @ 2020-04-09 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
There's a merged pull request on the void-packages repository
postgresql: fix shell version of pg_config.sh
https://github.com/void-linux/void-packages/pull/20794
Description:
@xtraeme @pullmoll Please help to pull this.
Sorry, but I've another thing to do.
The old version (#20783) may work because echo doesn't accept -W -f -L -l by now
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: postgresql: fix shell version of pg_config.sh
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
` (6 preceding siblings ...)
2020-04-09 15:53 ` [PR PATCH] [Merged]: " pullmoll
@ 2020-04-09 15:53 ` pullmoll
7 siblings, 0 replies; 9+ messages in thread
From: pullmoll @ 2020-04-09 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20794#issuecomment-611604665
Comment:
LGTM
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-09 15:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-09 15:03 [PR PATCH] postgresql: fix shell version of pg_config.sh sgn
2020-04-09 15:06 ` xtraeme
2020-04-09 15:25 ` Piraty
2020-04-09 15:28 ` sgn
2020-04-09 15:29 ` [PR PATCH] [Updated] " sgn
2020-04-09 15:37 ` xtraeme
2020-04-09 15:41 ` [PR PATCH] [Updated] " sgn
2020-04-09 15:53 ` [PR PATCH] [Merged]: " pullmoll
2020-04-09 15:53 ` pullmoll
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).