Skip to content

Commit db07f33

Browse files
bcardiffbcardiff
authored
Merge pull request #110 from crystal-lang/bump-llvm-10.0.0_3
2 parents b6bf225 + 29850cf commit db07f33

File tree

24 files changed

+256
-313
lines changed

24 files changed

+256
-313
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
jobs:
44
omnibus_osx_llvm:
55
macos:
6-
xcode: "11.1.0"
6+
xcode: 12.4.0
77
environment:
88
LLVM_VERSION: 10.0.0
99
MACOSX_DEPLOYMENT_TARGET: 10.11
@@ -21,7 +21,7 @@ jobs:
2121
sudo chown $(whoami) /var/cache
2222
- checkout
2323
- run:
24-
no_output_timeout: 140m
24+
no_output_timeout: 280m
2525
name: Build LLVM
2626
command: |
2727
cd omnibus

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
21
omnibus/pkg/
3-
4-
omnibus/crystal-darwin-x86_64
2+
omnibus/.bundle
3+
omnibus/bin
4+
omnibus/crystal-darwin-*
5+
omnibus/shards-darwin-*
56

67
docs/build/
78

‎darwin/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ ?= ## url to crystal-{version}-{package}-d
1313
OUTPUT_DIR = build
1414

1515
# mimics the tgz_package.rb version mangling
16+
DARWIN_ARCH = $(shell uname -m)
1617
DARWIN_PREFIX = crystal-$(CRYSTAL_VERSION)-$(PACKAGE_ITERATION)
17-
DARWIN_NAME = $(DARWIN_PREFIX)-darwin-x86_64.tar.gz
18-
DARWIN_PKG_NAME = $(DARWIN_PREFIX).pkg
18+
DARWIN_NAME = $(DARWIN_PREFIX)-darwin-$(DARWIN_ARCH).tar.gz
19+
DARWIN_PKG_NAME = $(DARWIN_PREFIX).$(DARWIN_ARCH).pkg
1920

2021
.PHONY: all
2122
all: darwin-previous $(OUTPUT_DIR)/$(DARWIN_NAME) $(OUTPUT_DIR)/$(DARWIN_PKG_NAME) ## Build compressed omnibus and distribution packages [default]

‎darwin/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The whole process is automated using a `Makefile`.
55

66
# Dependencies
77

8-
* Ruby 2.5.6 and `bundle install --binstubs` in `./omnibus`
8+
* Ruby 2.7.3 and `bundle install --binstubs` in `./omnibus`
99
* `pkgconfig`, `libtool` (Can be installed by `$ brew install pkgconfig libtool`)
1010
* Own `/opt/crystal`, `/var/cache`.
1111

‎omnibus/.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.6
1+
2.7.3

‎omnibus/Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
gem 'omnibus', '~> 6.1.4'
9-
gem 'omnibus-software', github: 'chef/omnibus-software', ref: 'ae2a2f1cae3e8d80197a1cac5311b910300a53ff'
8+
gem 'omnibus', github: 'chef/omnibus', ref: '1d97cd9e79a062dfc12f0c047215f3a9e4d65b09'
9+
gem 'omnibus-software', github: 'chef/omnibus-software', ref: '76b31d11c1fbbc43a4ed1a1990a2662d05b28644'

‎omnibus/Gemfile.lock‎

Lines changed: 78 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,88 @@
11
GIT
22
remote: https://github.com/chef/omnibus-software.git
3-
revision: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
4-
ref: ae2a2f1cae3e8d80197a1cac5311b910300a53ff
3+
revision: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644
4+
ref: 76b31d11c1fbbc43a4ed1a1990a2662d05b28644
55
specs:
66
omnibus-software (4.0.0)
7-
chef-sugar-ng (>= 5.0.0)
8-
omnibus (>= 5.6.1)
7+
omnibus (>= 8.0.0)
8+
9+
GIT
10+
remote: https://github.com/chef/omnibus.git
11+
revision: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09
12+
ref: 1d97cd9e79a062dfc12f0c047215f3a9e4d65b09
13+
specs:
14+
omnibus (8.1.8)
15+
aws-sdk-s3 (~> 1)
16+
chef-cleanroom (~> 1.0)
17+
chef-utils (>= 15.4)
18+
ffi-yajl (~> 2.2)
19+
license_scout (~> 1.0)
20+
mixlib-shellout (>= 2.0, < 4.0)
21+
mixlib-versioning
22+
ohai (>= 15, < 17)
23+
pedump
24+
ruby-progressbar (~> 1.7)
25+
thor (>= 0.18, < 2.0)
926

1027
GEM
1128
remote: https://rubygems.org/
1229
specs:
1330
addressable (2.7.0)
1431
public_suffix (>= 2.0.2, < 5.0)
15-
awesome_print (1.8.0)
16-
aws-eventstream (1.0.3)
17-
aws-partitions (1.216.0)
18-
aws-sdk-core (3.68.0)
19-
aws-eventstream (~> 1.0, >= 1.0.2)
20-
aws-partitions (~> 1.0)
32+
awesome_print (1.9.2)
33+
aws-eventstream (1.1.1)
34+
aws-partitions (1.449.0)
35+
aws-sdk-core (3.114.0)
36+
aws-eventstream (~> 1, >= 1.0.2)
37+
aws-partitions (~> 1, >= 1.239.0)
2138
aws-sigv4 (~> 1.1)
2239
jmespath (~> 1.0)
23-
aws-sdk-kms (1.24.0)
24-
aws-sdk-core (~> 3, >= 3.61.1)
40+
aws-sdk-kms (1.43.0)
41+
aws-sdk-core (~> 3, >= 3.112.0)
2542
aws-sigv4 (~> 1.1)
26-
aws-sdk-s3 (1.48.0)
27-
aws-sdk-core (~> 3, >= 3.61.1)
43+
aws-sdk-s3 (1.94.0)
44+
aws-sdk-core (~> 3, >= 3.112.0)
2845
aws-sdk-kms (~> 1)
2946
aws-sigv4 (~> 1.1)
30-
aws-sigv4 (1.1.0)
31-
aws-eventstream (~> 1.0, >= 1.0.2)
47+
aws-sigv4 (1.2.3)
48+
aws-eventstream (~> 1, >= 1.0.2)
3249
chef-cleanroom (1.0.2)
33-
chef-config (15.3.14)
50+
chef-config (16.13.16)
3451
addressable
52+
chef-utils (= 16.13.16)
3553
fuzzyurl
3654
mixlib-config (>= 2.2.12, < 4.0)
3755
mixlib-shellout (>= 2.0, < 4.0)
3856
tomlrb (~> 1.2)
39-
chef-sugar-ng (5.0.4)
57+
chef-utils (16.13.16)
4058
citrus (3.0.2)
41-
ffi (1.11.1)
42-
ffi-yajl (2.3.1)
43-
libyajl2 (~> 1.2)
59+
ffi (1.15.0)
60+
ffi-yajl (2.4.0)
61+
libyajl2 (>= 1.2)
4462
fuzzyurl (0.9.0)
4563
iostruct (0.0.4)
4664
ipaddress (0.8.3)
4765
jmespath (1.4.0)
48-
libyajl2 (1.2.0)
49-
license_scout (1.0.24)
66+
json (2.5.1)
67+
libyajl2 (2.1.0)
68+
license_scout (1.2.10)
5069
ffi-yajl (~> 2.2)
51-
mixlib-shellout (~> 2.2)
52-
toml-rb (~> 1.0)
53-
mixlib-cli (2.1.1)
54-
mixlib-config (3.0.1)
70+
mixlib-shellout (>= 2.2, < 4.0)
71+
toml-rb (>= 1, < 3)
72+
mixlib-cli (2.1.8)
73+
mixlib-config (3.0.9)
5574
tomlrb
56-
mixlib-log (3.0.1)
57-
mixlib-shellout (2.4.4)
58-
mixlib-versioning (1.2.7)
59-
multipart-post (2.0.0)
60-
ohai (15.3.1)
61-
chef-config (>= 12.8, < 16)
75+
mixlib-log (3.0.9)
76+
mixlib-shellout (3.2.5)
77+
chef-utils
78+
mixlib-versioning (1.2.12)
79+
multipart-post (2.1.1)
80+
net-scp (3.0.0)
81+
net-ssh (>= 2.6.5, < 7.0.0)
82+
net-ssh (6.1.0)
83+
ohai (16.13.0)
84+
chef-config (>= 12.8, < 17)
85+
chef-utils (>= 16.0, < 17)
6286
ffi (~> 1.9)
6387
ffi-yajl (~> 2.2)
6488
ipaddress
@@ -67,44 +91,38 @@ GEM
6791
mixlib-log (>= 2.0.1, < 4.0)
6892
mixlib-shellout (>= 2.0, < 4.0)
6993
plist (~> 3.1)
70-
systemu (~> 2.6.4)
94+
train-core
7195
wmi-lite (~> 1.0)
72-
omnibus (6.1.4)
73-
aws-sdk-s3 (~> 1)
74-
chef-cleanroom (~> 1.0)
75-
chef-sugar-ng (>= 3.3)
76-
ffi-yajl (~> 2.2)
77-
license_scout (~> 1.0)
78-
mixlib-shellout (>= 2.0, < 4.0)
79-
mixlib-versioning
80-
ohai (>= 13, < 16)
81-
pedump
82-
ruby-progressbar (~> 1.7)
83-
thor (~> 0.18)
84-
pedump (0.5.2)
96+
pedump (0.6.2)
8597
awesome_print
8698
iostruct (>= 0.0.4)
87-
multipart-post (~> 2.0.0)
88-
progressbar
99+
multipart-post (>= 2.0.0)
100+
rainbow
89101
zhexdump (>= 0.0.2)
90-
plist (3.5.0)
91-
progressbar (1.10.1)
92-
public_suffix (4.0.1)
93-
ruby-progressbar (1.10.1)
94-
systemu (2.6.5)
95-
thor (0.20.3)
96-
toml-rb (1.1.2)
102+
plist (3.6.0)
103+
public_suffix (4.0.6)
104+
rainbow (3.0.0)
105+
ruby-progressbar (1.11.0)
106+
thor (1.1.0)
107+
toml-rb (2.0.1)
97108
citrus (~> 3.0, > 3.0)
98-
tomlrb (1.2.8)
99-
wmi-lite (1.0.2)
109+
tomlrb (1.3.0)
110+
train-core (3.7.0)
111+
addressable (~> 2.5)
112+
ffi (!= 1.13.0)
113+
json (>= 1.8, < 3.0)
114+
mixlib-shellout (>= 2.0, < 4.0)
115+
net-scp (>= 1.2, < 4.0)
116+
net-ssh (>= 2.9, < 7.0)
117+
wmi-lite (1.0.5)
100118
zhexdump (0.0.2)
101119

102120
PLATFORMS
103121
ruby
104122

105123
DEPENDENCIES
106-
omnibus (~> 6.1.4)
124+
omnibus!
107125
omnibus-software!
108126

109127
BUNDLED WITH
110-
1.17.3
128+
2.2.16

‎omnibus/config/patches/llvm/PR20800.patch‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎omnibus/config/projects/llvm.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
build_version do
77
source :version, from_dependency: 'llvm'
88
end
9-
build_iteration 1
9+
build_iteration 3
1010

1111
def valid_cmake_version?
1212
`cmake --version` =~ /cmake version (\d+\.)(\d+\.)(\d)/
@@ -18,7 +18,7 @@ def valid_cmake_version?
1818

1919
dependency 'cmake' unless valid_cmake_version?
2020
dependency 'llvm'
21-
dependency 'tgz_package' if mac_os_x? || centos?
21+
dependency 'tgz_package' if macos? || mac_os_x? || centos?
2222

2323
exclude '\.git*'
2424
exclude 'bundler\/git'

‎omnibus/config/software/bdw-gc.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name "bdw-gc"
22
default_version "8.0.4"
3+
skip_transitive_dependency_licensing true
34

45
source :url => "https://github.com/ivmai/bdwgc/releases/download/v#{version}/gc-#{version}.tar.gz"
56

0 commit comments

Comments
 (0)