Revert 65580 - Fix pkg-config-wrapper to work with chromiumos chroots...

Revert 65580 - Fix pkg-config-wrapper to work with chromiumos chroots

Some pkg-config packages in chromium os (e.g. gtk) end up hard-coding libdir to be absolute (rather than relative to prefix), so it breaks builds from outside the chroot.
This works around it.

BUG=none
TEST=build with sysroot=/path/to/chromiumos/chroot/build/x86-generic

Review URL: http://codereview.chromium.org/4516002

TBR=piman@chromium.org

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=65585

[piman, 2010-11-09 22:57:24]

On Tue, Nov 9, 2010 at 2:54 PM, <skerner@chromium.org> wrote:

> Reviewers: piman,
>
> Description:
> Revert 65580 - Fix pkg-config-wrapper to work with chromiumos chroots
>
> Some pkg-config packages in chromium os (e.g. gtk) end up hard-coding
> libdir to
> be absolute (rather than relative to prefix), so it breaks builds from
> outside
> the chroot.
> This works around it.
>
> BUG=none
> TEST=build with sysroot=/path/to/chromiumos/chroot/build/x86-generic
>
> Review URL: http://codereview.chromium.org/4516002
>
> TBR=piman@chromium.org
>
> Please review this at http://codereview.chromium.org/4754002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     build/linux/pkg-config-wrapper
>
>
LGTM. Sorry about that, the arm builder uses an outdated chroot that's
incompatible with this change. We'll need to rev both at once.

Antoine


>
> Index: build/linux/pkg-config-wrapper
> ===================================================================
> --- build/linux/pkg-config-wrapper      (revision 65584)
> +++ build/linux/pkg-config-wrapper      (working copy)
> @@ -11,4 +11,4 @@
>
>  shift
>  config_path=$root/usr/lib/pkgconfig:$root/usr/share/pkgconfig
> -PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr
> --define-variable=libdir=/usr/lib "$@" | $rewrite $root
> +PKG_CONFIG_PATH=$config_path pkg-config --define-variable=prefix=/usr "$@"
> | $rewrite $root
>
>
>