diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 10 | ||||
| -rw-r--r-- | classes/gtk-binver.bbclass | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 504707e37b..a08ba97fde 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,5 +1,15 @@ BB_DEFAULT_TASK = "build" +# like os.path.join but doesn't treat absolute RHS specially +def base_path_join(a, *p): + path = a + for b in p: + if path == '' or path.endswith('/'): + path += b + else: + path += '/' + b + return path + def base_dep_prepend(d): import bb; # diff --git a/classes/gtk-binver.bbclass b/classes/gtk-binver.bbclass index d59145e641..8398cc5424 100644 --- a/classes/gtk-binver.bbclass +++ b/classes/gtk-binver.bbclass @@ -1,7 +1,7 @@ def gtkbinver_find(d): import bb try: - for line in file( "%s/pkgconfig/gtk+-2.0.pc" % bb.data.getVar('STAGING_DATADIR', d, 1) ).readlines(): + for line in file( "%s/gtk+-2.0.pc" % bb.data.getVar('PKG_CONFIG_PATH', d, 1) ).readlines(): if line.startswith( "gtk_binary_version" ): # bb.note( "gtk_binary_version = '%s'" % line.split("=")[1].strip() ) return line.split("=")[1].strip() |