On Thu, Oct 15, 2009 at 06:46:17PM -0700, Alan Coopersmith wrote:
> Dan Nicholson wrote:
> > May want some patches to build.sh, jhbuildrc and
> > build-from-tarballs.sh to add $datadir/share/pkgconfig to
> > PKG_CONFIG_PATH. They'll definitely break in their default
> > configurations. I don't have the time right now to make the patches,
> > but can a little later.
> 
> Good point - I just pushed updates to build.sh & build-from-tarballs.sh.
> Someday I'll have to learn jhbuild.

My python skills are approximately nil, but I think this does the trick.

>From 1b6ee07255c05c0145fe3054c76a3a8556666b35 Mon Sep 17 00:00:00 2001
From: Dan Nicholson <[email protected]>
Date: Fri, 16 Oct 2009 06:32:35 -0700
Subject: [PATCH] jhbuildrc: Append $prefix/share/pkgconfig to PKG_CONFIG_PATH

This is needed in the future of arch-independent .pc files.

Signed-off-by: Dan Nicholson <[email protected]>
---
 jhbuildrc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/jhbuildrc b/jhbuildrc
index d7b50be..de6a037 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -18,7 +18,8 @@ modules = [ 'xorg' ]
 checkoutroot = os.environ['HOME']
 prefix = os.path.join(os.environ['HOME'], 'xorg-build')
 os.environ['ACLOCAL'] = 'aclocal -I ' + os.path.join(prefix, 'share', 
'aclocal')
-os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig')
+os.environ['PKG_CONFIG_PATH'] = os.path.join(prefix, 'lib', 'pkgconfig') \
+    + ':' + os.path.join(prefix, 'share', 'pkgconfig')
 
 #autogenargs='--cache-file=/usr/src/jhmodular/configure-cache --disable-static'
 #os.environ['INSTALL'] = os.path.join(os.environ['HOME'], 'bin', 
'install-check')
-- 
1.6.2.5
_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to