From 90ee3a0561f08ad977d7da9d968bcbd0c7efcd8f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 1 Apr 2008 15:29:03 +0000 Subject: [PATCH] pkgconfig: Return appropriate error code from pkgconfig script Patch by Will Newton. Currently the wrapper script for pkgconfig clobbers the return status of pkgconfig. This is a problem for example when someone tries to run "pkgconfig --exists". This patch should allow the correct return code to be passed through. Note it uses the "pipefail" option that was introduced with bash 3. --- package/pkgconfig/pkgconfig-filter.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/pkgconfig/pkgconfig-filter.sh b/package/pkgconfig/pkgconfig-filter.sh index 770e9317b5..f2bd75d8e0 100755 --- a/package/pkgconfig/pkgconfig-filter.sh +++ b/package/pkgconfig/pkgconfig-filter.sh @@ -2,6 +2,8 @@ # filter the output from pkg-config (renamed as pkg-config.real) # and ensures PKG_CONFIG_SYSROOT is prepended to all paths +set -o pipefail + CMD=$0 if [ ! "$PKG_CONFIG_SYSROOT" ]; then @@ -22,6 +24,5 @@ then #echo "OKAY" >&2; exit 0; else - echo "pkg-config failed!" >&2 exit $? fi -- 2.30.2