From: Arthur Skowronek <arthur.skowronek@tuta.io>
Date: Mon, 15 Oct 2018 12:55:57 +0000 (+0200)
Subject: tools/pkg-config: pass arguments at the end
X-Git-Tag: v18.06.3~52
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aaa34526c4a71a4f2a63142db1a207f493c4be8f;p=oweals%2Fopenwrt.git

tools/pkg-config: pass arguments at the end

Go for openwrt passes pkg-config arguments in the format of

        pkg-config --cflags -- pkg-name

which in turn will be passed down to the real pkg-config as something
like

        pkg-config.real --cflags -- pkg-name --define...

and causes the real pkg-config implementation to missinterpret the given
argument list.

This also helps to fix https://github.com/golang/go/issues/27940

Signed-off-by: Arthur Skowronek <arthur.skowronek@tuta.io>
(cherry picked from commit 5f2cb6d7dc9de24bec7b1139f8d785f0e7588eed)
---

diff --git a/tools/pkg-config/files/pkg-config b/tools/pkg-config/files/pkg-config
index e58b13216d..bf95380e7f 100755
--- a/tools/pkg-config/files/pkg-config
+++ b/tools/pkg-config/files/pkg-config
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-pkg-config.real $@ --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX}
+pkg-config.real --define-variable=prefix=${STAGING_PREFIX} --define-variable=exec_prefix=${STAGING_PREFIX} $@