Re: [Libguestfs] [PATCH 2/2] run script: Add support for gobject introspection
On 01/18/2012 01:17 PM, Richard W.M. Jones wrote:
On Tue, Jan 17, 2012 at 03:48:43PM +0000, Matthew Booth wrote:
> ---
> run.in | 12 +++++++++---
> 1 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/run.in b/run.in
> index 7cef715..afb2b97 100755
> --- a/run.in
> +++ b/run.in
> @@ -37,19 +37,25 @@ b=@abs_builddir@
> export TMPDIR="$b"
>
> # Set local environment relative to this script.
> +library_path="$b/src/.libs:$b/gobject/.libs"
> if [ -z "$LD_LIBRARY_PATH" ]; then
> - LD_LIBRARY_PATH="$b/src/.libs"
> + LD_LIBRARY_PATH=$library_path
Quoting?
Quoting is optional here as it's a straight assignment to another
environment variable...
> else
> - LD_LIBRARY_PATH="$b/src/.libs:$LD_LIBRARY_PATH"
> + LD_LIBRARY_PATH="$library_path:$LD_LIBRARY_PATH"
... unlike here, where we're also concatenating.
> fi
> if [ -z "$PERL5LIB" ]; then
> PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch"
> else
> PERL5LIB="$b/perl/blib/lib:$b/perl/blib/arch:$PERL5LIB"
> fi
> +if [ -z "$GI_TYPELIB_PATH" ]; then
> + GI_TYPELIB_PATH="$b/gobject"
> +else
> + GI_TYPELIB_PATH="$b/gobject:$GI_TYPELIB_PATH"
> +fi
> LIBGUESTFS_PATH="$b/appliance"
>
> -export LD_LIBRARY_PATH PERL5LIB LIBGUESTFS_PATH
> +export LD_LIBRARY_PATH PERL5LIB GI_TYPELIB_PATH LIBGUESTFS_PATH
This seems like it is two unrelated patches. If it is made atomic,
and the quoting issue above fixed, then ACK (to both).
It's intentionally a single patch. There are 2 changes: gobject/.libs is
added to LD_LIBRARY_PATH and GI_TYPELIB_PATH is added. Both changes are
required for gobject introspection support, and neither is useful on its
own.
Matt
--
Matthew Booth, RHCA, RHCSS
Red Hat Engineering, Virtualisation Team
GPG ID: D33C3490
GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490