Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0

external/bockbuild/bockbuild/darwinprofile.py

@@ -43,6 +43,7 @@ class DarwinProfile (UnixProfile):
     # ccache uses a different CC since it's not installed yet
     # every thing after ccache needs a working ccache
     default_toolchain = [
+        'cmake',
         'autoconf',
         'automake',
         'ccache',

external/bockbuild/bockbuild/package.py

@@ -359,10 +359,17 @@ class Package:
 
         clean_func = None  # what to run if the workspace needs to be redone
 
-        if self.sources is None:
-            return None
-
         expand_macros(self.sources, self)
+
+        if not self.sources:
+            def clean_nop (dir):
+                pass
+            self.sources = []
+            self.desc = '%s %s' % (self.name, self.version)
+            self.buildstring.extend(
+                ['%s md5: %s' % (os.path.basename(self._path), md5(self._path))])
+            clean_func = clean_nop
+
         local_sources = []
 
         try:
@@ -441,8 +448,6 @@ class Package:
         if clean_func is None:
             error('workspace cleaning function (clean_func) must be set')
 
-        self.buildstring.extend(
-            ['%s md5: %s' % (os.path.basename(self._path), md5(self._path))])
         self.local_sources = local_sources
         self.clean = clean_func
 
@@ -542,14 +547,15 @@ class Package:
         files = list()
         size = 0
 
-        for path in iterate_dir(artifact_stage, summary=False):
+        for path in iterate_dir(artifact_stage, with_links = True, summary=False):
             relpath = os.path.relpath(path, artifact_stage)
             destpath = os.path.join(dest, relpath)
             if os.path.exists(destpath) and not identical_files(path, destpath):
                 warn(
                     'Different file exists in package already: ''%s''' % relpath )
             files.append(relpath)
-            size = size + os.path.getsize(path)
+            if not os.path.islink(path):
+                size = size + os.path.getsize(path)
 
         files.sort()
         is_changed(files, artifact + '.files')

external/bockbuild/packages/cmake.py

@@ -0,0 +1,23 @@
+from distutils.version import LooseVersion, StrictVersion
+
+
+class SystemCMake (Package):
+
+    def __init__(self):
+        Package.__init__(self, 'cmake', 'system', sources=None)
+        cmake_path = which('cmake')
+        if cmake_path is None:
+            error('cmake not found in PATH')
+        self.cmake_path = cmake_path
+        cmake_version_str = backtick('%s --version' % self.cmake_path)[0].split(' ')[2]
+        cmake_version = StrictVersion(cmake_version_str)
+        self.version = str(cmake_version)
+
+    def build(self):
+        pass
+
+    def install(self):
+        self.sh('mkdir -p "%{staged_prefix}/bin"')
+        self.sh('ln -s -F %{cmake_path} "%{staged_prefix}/bin/cmake"')
+
+SystemCMake()

external/bockbuild/packages/expat.py

@@ -1 +1,2 @@
-SourceForgePackage('expat', 'expat', '2.0.1')
+Package('expat', '2.2.5', sources=[
+    'https://github.com/libexpat/libexpat/releases/download/R_2_2_5/expat-2.2.5.tar.bz2'])

external/bockbuild/packages/gtk-sharp.py

@@ -4,7 +4,7 @@ class GtkSharp212ReleasePackage (Package):
         Package.__init__(self, 'gtk-sharp',
                          sources=['git://github.com/mono/gtk-sharp.git'],
                          git_branch='gtk-sharp-2-12-branch',
-                         revision='43d38a806de8efe62a09a3284178880f2ae36a56',
+                         revision='ae7bbb340c0e4baad27264727f6ca80ebbc882c0',
                          override_properties={
                              'configure': './bootstrap-2.12 --prefix=%{package_prefix}',
                          }