* [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@
@ 2018-02-22 22:49 Gaël PORTAY
2018-02-22 22:49 ` [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf Gaël PORTAY
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Gaël PORTAY @ 2018-02-22 22:49 UTC (permalink / raw)
To: buildroot
The shell expands "$@" as "$1" "$2" "$3"... while it expands $@ as $1 $2
$3. With the second form, we loses spaces in positional parameters.
As example, the following call
pkg-config --cflags "one two" three
is wrapped as
pkgconf --cflags one two three
while we are expecting
pkgconf --cflags "one two" three
"$@" is really useful when writing wrappers. It passes the positional
arguments *as* they are given.
Double quote $@ to prevent from splitting elements.
Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>
---
Changes since v1:
- improve commit message.
package/pkgconf/pkg-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
index b9ce0935cc..9387931ff2 100644
--- a/package/pkgconf/pkg-config.in
+++ b/package/pkgconf/pkg-config.in
@@ -2,4 +2,4 @@
PKGCONFDIR=$(dirname $0)
DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig
DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@
-PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ $@
+PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ "$@"
--
2.16.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf
2018-02-22 22:49 [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Gaël PORTAY
@ 2018-02-22 22:49 ` Gaël PORTAY
2018-03-30 19:25 ` Peter Korsgaard
2018-02-25 21:01 ` [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Thomas Petazzoni
2018-03-30 19:25 ` Peter Korsgaard
2 siblings, 1 reply; 5+ messages in thread
From: Gaël PORTAY @ 2018-02-22 22:49 UTC (permalink / raw)
To: buildroot
Replace the shell script with pkgconf without creating a new process.
Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>
---
No changes since v1
package/pkgconf/pkg-config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/pkgconf/pkg-config.in b/package/pkgconf/pkg-config.in
index 9387931ff2..99c0add8fb 100644
--- a/package/pkgconf/pkg-config.in
+++ b/package/pkgconf/pkg-config.in
@@ -2,4 +2,4 @@
PKGCONFDIR=$(dirname $0)
DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig
DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@
-PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} ${PKGCONFDIR}/pkgconf @STATIC@ "$@"
+PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@"
--
2.16.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@
2018-02-22 22:49 [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Gaël PORTAY
2018-02-22 22:49 ` [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf Gaël PORTAY
@ 2018-02-25 21:01 ` Thomas Petazzoni
2018-03-30 19:25 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2018-02-25 21:01 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 22 Feb 2018 17:49:04 -0500, Ga?l PORTAY wrote:
> The shell expands "$@" as "$1" "$2" "$3"... while it expands $@ as $1 $2
> $3. With the second form, we loses spaces in positional parameters.
>
> As example, the following call
>
> pkg-config --cflags "one two" three
>
> is wrapped as
>
> pkgconf --cflags one two three
>
> while we are expecting
>
> pkgconf --cflags "one two" three
>
> "$@" is really useful when writing wrappers. It passes the positional
> arguments *as* they are given.
>
> Double quote $@ to prevent from splitting elements.
>
> Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>
> ---
Both patches applied to next. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@
2018-02-22 22:49 [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Gaël PORTAY
2018-02-22 22:49 ` [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf Gaël PORTAY
2018-02-25 21:01 ` [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Thomas Petazzoni
@ 2018-03-30 19:25 ` Peter Korsgaard
2 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-03-30 19:25 UTC (permalink / raw)
To: buildroot
>>>>> "Ga?l" == Ga?l PORTAY <gael.portay@savoirfairelinux.com> writes:
> The shell expands "$@" as "$1" "$2" "$3"... while it expands $@ as $1 $2
> $3. With the second form, we loses spaces in positional parameters.
> As example, the following call
> pkg-config --cflags "one two" three
> is wrapped as
> pkgconf --cflags one two three
> while we are expecting
> pkgconf --cflags "one two" three
> "$@" is really useful when writing wrappers. It passes the positional
> arguments *as* they are given.
> Double quote $@ to prevent from splitting elements.
> Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>
Committed to 2018.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf
2018-02-22 22:49 ` [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf Gaël PORTAY
@ 2018-03-30 19:25 ` Peter Korsgaard
0 siblings, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-03-30 19:25 UTC (permalink / raw)
To: buildroot
>>>>> "Ga?l" == Ga?l PORTAY <gael.portay@savoirfairelinux.com> writes:
> Replace the shell script with pkgconf without creating a new process.
> Signed-off-by: Ga?l PORTAY <gael.portay@savoirfairelinux.com>
> ---
> No changes since v1
Committed to 2018.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-30 19:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-22 22:49 [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Gaël PORTAY
2018-02-22 22:49 ` [Buildroot] [PATCH v2 2/2] pkgconf: pkg-config.in: exec pkgconf Gaël PORTAY
2018-03-30 19:25 ` Peter Korsgaard
2018-02-25 21:01 ` [Buildroot] [PATCH v2 1/2] pkgconf: pkg-config.in: double quote $@ Thomas Petazzoni
2018-03-30 19:25 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.