Merge pull request #110 from crystal-lang/bump-llvm-10.0.0_3

Author: bcardiff

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2
 jobs:
   omnibus_osx_llvm:
     macos:
-      xcode: "11.1.0"
+      xcode: 12.4.0
     environment:
       LLVM_VERSION: 10.0.0
       MACOSX_DEPLOYMENT_TARGET: 10.11
@@ -21,7 +21,7 @@ jobs:
             sudo chown $(whoami) /var/cache
       - checkout
       - run:
-          no_output_timeout: 140m
+          no_output_timeout: 280m
           name: Build LLVM
           command: |
             cd omnibus

.gitignore

@@ -1,7 +1,8 @@
-
 omnibus/pkg/
-
-omnibus/crystal-darwin-x86_64
+omnibus/.bundle
+omnibus/bin
+omnibus/crystal-darwin-*
+omnibus/shards-darwin-*
 
 docs/build/
 

darwin/Makefile

@@ -13,9 +13,10 @@ PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ ?= ## url to crystal-{version}-{package}-d
 OUTPUT_DIR = build
 
 # mimics the tgz_package.rb version mangling
+DARWIN_ARCH = $(shell uname -m)
 DARWIN_PREFIX = crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)
-DARWIN_NAME = $(DARWIN_PREFIX)-darwin-x86_64.tar.gz
-DARWIN_PKG_NAME = $(DARWIN_PREFIX).pkg
+DARWIN_NAME = $(DARWIN_PREFIX)-darwin-$(DARWIN_ARCH).tar.gz
+DARWIN_PKG_NAME = $(DARWIN_PREFIX).$(DARWIN_ARCH).pkg
 
 .PHONY: all
 all: darwin-previous $(OUTPUT_DIR)/$(DARWIN_NAME) $(OUTPUT_DIR)/$(DARWIN_PKG_NAME) ## Build compressed omnibus and distribution packages [default]

darwin/README.md

@@ -5,7 +5,7 @@ The whole process is automated using a `Makefile`.
 
 # Dependencies
 
-* Ruby 2.5.6 and `bundle install --binstubs` in `./omnibus`
+* Ruby 2.7.3 and `bundle install --binstubs` in `./omnibus`
 * `pkgconfig`, `libtool` (Can be installed by `$ brew install pkgconfig libtool`)
 * Own `/opt/crystal`, `/var/cache`.
 

omnibus/.ruby-version

@@ -1 +1 @@
-2.5.6
+2.7.3

omnibus/Gemfile

@@ -5,5 +5,5 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 
-gem 'omnibus', '~> 6.1.4'
-gem 'omnibus-software', github: 'chef/omnibus-software', ref: 'ae2a2f1cae3e8d80197a1cac5311b910300a53ff'
+gem 'omnibus', github: 'chef/omnibus', ref: '1d97cd9e79a062dfc12f0c047215f3a9e4d65b09'
+gem 'omnibus-software', github: 'chef/omnibus-software', ref: '76b31d11c1fbbc43a4ed1a1990a2662d05b28644'

omnibus/Gemfile.lock

@@ -1,64 +1,88 @@
 GIT
   remote: https://github.com/chef/omnibus-software.git
-  revision: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
-  ref: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
+  revision: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644
+  ref: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644
   specs:
     omnibus-software (4.0.0)
-      chef-sugar-ng (>= 5.0.0)
-      omnibus (>= 5.6.1)
+      omnibus (>= 8.0.0)
+
+GIT
+  remote: https://github.com/chef/omnibus.git
+  revision: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09
+  ref: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09
+  specs:
+    omnibus (8.1.8)
+      aws-sdk-s3 (~> 1)
+      chef-cleanroom (~> 1.0)
+      chef-utils (>= 15.4)
+      ffi-yajl (~> 2.2)
+      license_scout (~> 1.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      mixlib-versioning
+      ohai (>= 15, < 17)
+      pedump
+      ruby-progressbar (~> 1.7)
+      thor (>= 0.18, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    awesome_print (1.8.0)
-    aws-eventstream (1.0.3)
-    aws-partitions (1.216.0)
-    aws-sdk-core (3.68.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
-      aws-partitions (~> 1.0)
+    awesome_print (1.9.2)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.449.0)
+    aws-sdk-core (3.114.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.24.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.48.0)
-      aws-sdk-core (~> 3, >= 3.61.1)
+    aws-sdk-s3 (1.94.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.0)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.3)
+      aws-eventstream (~> 1, >= 1.0.2)
     chef-cleanroom (1.0.2)
-    chef-config (15.3.14)
+    chef-config (16.13.16)
       addressable
+      chef-utils (= 16.13.16)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       tomlrb (~> 1.2)
-    chef-sugar-ng (5.0.4)
+    chef-utils (16.13.16)
     citrus (3.0.2)
-    ffi (1.11.1)
-    ffi-yajl (2.3.1)
-      libyajl2 (~> 1.2)
+    ffi (1.15.0)
+    ffi-yajl (2.4.0)
+      libyajl2 (>= 1.2)
     fuzzyurl (0.9.0)
     iostruct (0.0.4)
     ipaddress (0.8.3)
     jmespath (1.4.0)
-    libyajl2 (1.2.0)
-    license_scout (1.0.24)
+    json (2.5.1)
+    libyajl2 (2.1.0)
+    license_scout (1.2.10)
       ffi-yajl (~> 2.2)
-      mixlib-shellout (~> 2.2)
-      toml-rb (~> 1.0)
-    mixlib-cli (2.1.1)
-    mixlib-config (3.0.1)
+      mixlib-shellout (>= 2.2, < 4.0)
+      toml-rb (>= 1, < 3)
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.9)
       tomlrb
-    mixlib-log (3.0.1)
-    mixlib-shellout (2.4.4)
-    mixlib-versioning (1.2.7)
-    multipart-post (2.0.0)
-    ohai (15.3.1)
-      chef-config (>= 12.8, < 16)
+    mixlib-log (3.0.9)
+    mixlib-shellout (3.2.5)
+      chef-utils
+    mixlib-versioning (1.2.12)
+    multipart-post (2.1.1)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    ohai (16.13.0)
+      chef-config (>= 12.8, < 17)
+      chef-utils (>= 16.0, < 17)
       ffi (~> 1.9)
       ffi-yajl (~> 2.2)
       ipaddress
@@ -67,44 +91,38 @@ GEM
       mixlib-log (>= 2.0.1, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
       plist (~> 3.1)
-      systemu (~> 2.6.4)
+      train-core
       wmi-lite (~> 1.0)
-    omnibus (6.1.4)
-      aws-sdk-s3 (~> 1)
-      chef-cleanroom (~> 1.0)
-      chef-sugar-ng (>= 3.3)
-      ffi-yajl (~> 2.2)
-      license_scout (~> 1.0)
-      mixlib-shellout (>= 2.0, < 4.0)
-      mixlib-versioning
-      ohai (>= 13, < 16)
-      pedump
-      ruby-progressbar (~> 1.7)
-      thor (~> 0.18)
-    pedump (0.5.2)
+    pedump (0.6.2)
       awesome_print
       iostruct (>= 0.0.4)
-      multipart-post (~> 2.0.0)
-      progressbar
+      multipart-post (>= 2.0.0)
+      rainbow
       zhexdump (>= 0.0.2)
-    plist (3.5.0)
-    progressbar (1.10.1)
-    public_suffix (4.0.1)
-    ruby-progressbar (1.10.1)
-    systemu (2.6.5)
-    thor (0.20.3)
-    toml-rb (1.1.2)
+    plist (3.6.0)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
+    ruby-progressbar (1.11.0)
+    thor (1.1.0)
+    toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
-    tomlrb (1.2.8)
-    wmi-lite (1.0.2)
+    tomlrb (1.3.0)
+    train-core (3.7.0)
+      addressable (~> 2.5)
+      ffi (!= 1.13.0)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 4.0)
+      net-ssh (>= 2.9, < 7.0)
+    wmi-lite (1.0.5)
     zhexdump (0.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  omnibus (~> 6.1.4)
+  omnibus!
   omnibus-software!
 
 BUNDLED WITH
-   1.17.3
+   2.2.16

omnibus/config/patches/llvm/PR20800.patch

@@ -6,7 +6,7 @@
 build_version do
   source :version, from_dependency: 'llvm'
 end
-build_iteration 1
+build_iteration 3
 
 def valid_cmake_version?
   `cmake --version` =~ /cmake version (\d+\.)(\d+\.)(\d)/
@@ -18,7 +18,7 @@ def valid_cmake_version?
 
 dependency 'cmake' unless valid_cmake_version?
 dependency 'llvm'
-dependency 'tgz_package' if mac_os_x? || centos?
+dependency 'tgz_package' if macos? || mac_os_x? || centos?
 
 exclude '\.git*'
 exclude 'bundler\/git'

omnibus/config/projects/llvm.rb

@@ -1,5 +1,6 @@
 name "bdw-gc"
 default_version "8.0.4"
+skip_transitive_dependency_licensing true
 
 source :url => "https://github.com/ivmai/bdwgc/releases/download/v#{version}/gc-#{version}.tar.gz"