| Message ID | 20210903162027.1935040-4-aduskett@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Qemu and gobject-introspection fixes | expand |
On 03/09/2021 18:20, Adam Duskett wrote: > Signed-off-by: Adam Duskett <aduskett@gmail.com> Applied to master, thanks. ... And now I notice that I forgot to add the package/gobject-introspection/ prefix to the previous patch. I added it here and will hopefully remember to do it for the following ones. Regards, Arnout > --- > package/gobject-introspection/g-ir-scanner.in | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in > index 22df7be309..013eb15700 100644 > --- a/package/gobject-introspection/g-ir-scanner.in > +++ b/package/gobject-introspection/g-ir-scanner.in > @@ -1,4 +1,4 @@ > -#!/usr/bin/env bash > +#!/usr/bin/env sh > > # These environment variables are empty by default, and as such ccompiler.py > # defaults to either using the system tools (CC, CXX, and CPP) or leaving > @@ -15,8 +15,8 @@ export LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}" > > export GI_SCANNER_DISABLE_CACHE=1 > > -${HOST_DIR}/bin/g-ir-scanner \ > ---lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ > ---use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \ > ---use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \ > ---add-include-path=$(dirname $0)/../share/gir-1.0 "$@" > +"${HOST_DIR}"/bin/g-ir-scanner \ > + --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ > + --use-binary-wrapper="$(dirname "$0")"/g-ir-scanner-qemuwrapper \ > + --use-ldd-wrapper="$(dirname "$0")"/g-ir-scanner-lddwrapper \ > + --add-include-path="$(dirname "$0")"/../share/gir-1.0 "$@" >
diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in index 22df7be309..013eb15700 100644 --- a/package/gobject-introspection/g-ir-scanner.in +++ b/package/gobject-introspection/g-ir-scanner.in @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # These environment variables are empty by default, and as such ccompiler.py # defaults to either using the system tools (CC, CXX, and CPP) or leaving @@ -15,8 +15,8 @@ export LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}" export GI_SCANNER_DISABLE_CACHE=1 -${HOST_DIR}/bin/g-ir-scanner \ ---lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ ---use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \ ---use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \ ---add-include-path=$(dirname $0)/../share/gir-1.0 "$@" +"${HOST_DIR}"/bin/g-ir-scanner \ + --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \ + --use-binary-wrapper="$(dirname "$0")"/g-ir-scanner-qemuwrapper \ + --use-ldd-wrapper="$(dirname "$0")"/g-ir-scanner-lddwrapper \ + --add-include-path="$(dirname "$0")"/../share/gir-1.0 "$@"
Signed-off-by: Adam Duskett <aduskett@gmail.com> --- package/gobject-introspection/g-ir-scanner.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)