Răsfoiți Sursa

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.
Peter Korsgaard 17 ani în urmă
părinte
comite
90ee3a0561
1 a modificat fișierele cu 2 adăugiri și 1 ștergeri
  1. 2 1
      package/pkgconfig/pkgconfig-filter.sh

+ 2 - 1
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