From e06c3beae331e70eb038a859b0ab6945fef041fb Mon Sep 17 00:00:00 2001 From: "piman@google.com" Date: Fri, 19 Nov 2010 00:43:49 +0000 Subject: Improve pkg-config-wrapper to support ChromiumOS sysroots http://codereview.chromium.org/4516002/show had to be reverted because it conflicts with "old style" sysroots that are still used on the arm builders. This is a cleaner approach that should work there. The previous approach assumed that all variables in .pc files were relative to |prefix|. It would be a desirable thing to have but in practice a few packages don't follow this and have already dereferenced |prefix| in other variables (e.g. |libdir|). So instead of forcing |prefix|, this version keeps the original one but strips the path before '/usr' (in |prefix|) from all returned paths before prepending the sysroot path. For example if you have foo.pc: prefix=/build/board/usr libdir=/build/board/usr/lib # instead of libdir=${prefix}/lib Libs: -L${libdir}/foo -lfoo Then instead of forcing prefix=/usr (which doesn't fix |libdir|), we find the path before '/usr' in prefix ('/build/board'), that we strip from the returned -L flag ('/build/board/usr/lib/foo' -> '/usr/lib/foo') before prepending the sysroot path (-> '/path/to/sysroot/usr/lib/foo'). BUG=None TEST=build with sysroot=/path/to/chromiumos/chroot/build/x86-generic Review URL: http://codereview.chromium.org/5105005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66712 0039d316-1c4b-4281-b951-d872f2087c98 --- build/linux/rewrite_dirs.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'build/linux/rewrite_dirs.py') diff --git a/build/linux/rewrite_dirs.py b/build/linux/rewrite_dirs.py index 5c41cf9..9e166d0 100755 --- a/build/linux/rewrite_dirs.py +++ b/build/linux/rewrite_dirs.py @@ -7,6 +7,7 @@ import sys import os +import optparse REWRITE_PREFIX = ['-I', '-idirafter', @@ -18,15 +19,19 @@ REWRITE_PREFIX = ['-I', '-isystem', '-L'] -def RewritePath(path, sysroot): - """Rewrites a path by prefixing it with the sysroot if it is absolute.""" +def RewritePath(path, opts): + """Rewrites a path by stripping the prefix and prepending the sysroot.""" + sysroot = opts.sysroot + prefix = opts.strip_prefix if os.path.isabs(path) and not path.startswith(sysroot): + if path.startswith(prefix): + path = path[len(prefix):] path = path.lstrip('/') return os.path.join(sysroot, path) else: return path -def RewriteLine(line, sysroot): +def RewriteLine(line, opts): """Rewrites all the paths in recognized options.""" args = line.split() count = len(args) @@ -38,25 +43,24 @@ def RewriteLine(line, sysroot): if args[i] == prefix: i += 1 try: - args[i] = RewritePath(args[i], sysroot) + args[i] = RewritePath(args[i], opts) except IndexError: sys.stderr.write('Missing argument following %s\n' % prefix) break elif args[i].startswith(prefix): - args[i] = prefix + RewritePath(args[i][len(prefix):], sysroot) + args[i] = prefix + RewritePath(args[i][len(prefix):], opts) i += 1 return ' '.join(args) def main(argv): - try: - sysroot = argv[1] - except IndexError: - sys.stderr.write('usage: %s /path/to/sysroot\n' % argv[0]) - return 1 + parser = optparse.OptionParser() + parser.add_option('-s', '--sysroot', default='/', help='sysroot to prepend') + parser.add_option('-p', '--strip-prefix', default='', help='prefix to strip') + opts, args = parser.parse_args(argv[1:]) for line in sys.stdin.readlines(): - line = RewriteLine(line.strip(), sysroot) + line = RewriteLine(line.strip(), opts) print line return 0 -- cgit v1.1