Skip to content

Commit 7e72871

Browse files
Still passing tests on macos
1 parent 62923e1 commit 7e72871

3 files changed

Lines changed: 177 additions & 8 deletions

File tree

omnibus/Gemfile.lock

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
GIT
2+
remote: git://github.com/chef/omnibus-software.git
3+
revision: d042e24fa3053ab926bb6a7c066c80e76ad72c94
4+
branch: ksubrama/ruby23
5+
specs:
6+
omnibus-software (4.0.0)
7+
chef-sugar (>= 3.4.0)
8+
omnibus (>= 5.5.0)
9+
10+
GIT
11+
remote: git://github.com/chef/omnibus.git
12+
revision: 61b50f5a20f0930ee977e54cabaff8fe02d3b731
13+
branch: ksubrama/gcc_investigate
14+
specs:
15+
omnibus (5.5.0)
16+
aws-sdk (~> 2)
17+
chef-sugar (~> 3.3)
18+
cleanroom (~> 1.0)
19+
ffi-yajl (~> 2.2)
20+
license_scout
21+
mixlib-shellout (~> 2.0)
22+
mixlib-versioning
23+
ohai (~> 8.0)
24+
ruby-progressbar (~> 1.7)
25+
thor (~> 0.18)
26+
27+
GEM
28+
remote: http://rubygems.org/
29+
specs:
30+
addressable (2.4.0)
31+
aws-sdk (2.6.12)
32+
aws-sdk-resources (= 2.6.12)
33+
aws-sdk-core (2.6.12)
34+
jmespath (~> 1.0)
35+
aws-sdk-resources (2.6.12)
36+
aws-sdk-core (= 2.6.12)
37+
chef-config (12.15.19)
38+
addressable
39+
fuzzyurl
40+
mixlib-config (~> 2.0)
41+
mixlib-shellout (~> 2.0)
42+
chef-sugar (3.4.0)
43+
cleanroom (1.0.0)
44+
ffi (1.9.14)
45+
ffi-yajl (2.3.0)
46+
libyajl2 (~> 1.2)
47+
fuzzyurl (0.9.0)
48+
ipaddress (0.8.3)
49+
jmespath (1.3.1)
50+
libyajl2 (1.2.0)
51+
license_scout (0.1.3)
52+
ffi-yajl (~> 2.2)
53+
mixlib-shellout (~> 2.2)
54+
mixlib-cli (1.7.0)
55+
mixlib-config (2.2.4)
56+
mixlib-log (1.7.1)
57+
mixlib-shellout (2.2.7)
58+
mixlib-versioning (1.1.0)
59+
ohai (8.21.0)
60+
chef-config (>= 12.5.0.alpha.1, < 13)
61+
ffi (~> 1.9)
62+
ffi-yajl (~> 2.2)
63+
ipaddress
64+
mixlib-cli
65+
mixlib-config (~> 2.0)
66+
mixlib-log (>= 1.7.1, < 2.0)
67+
mixlib-shellout (~> 2.0)
68+
plist (~> 3.1)
69+
systemu (~> 2.6.4)
70+
wmi-lite (~> 1.0)
71+
plist (3.2.0)
72+
ruby-progressbar (1.8.1)
73+
systemu (2.6.5)
74+
thor (0.19.1)
75+
wmi-lite (1.0.0)
76+
77+
PLATFORMS
78+
ruby
79+
80+
DEPENDENCIES
81+
omnibus!
82+
omnibus-software!
83+
84+
BUNDLED WITH
85+
1.13.1

omnibus/config/software/workup.rb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,22 @@
3838
source git: 'git://github.com/cvent/workup.git' if version != 'local_source'
3939

4040
# For nokogiri
41-
dependency 'libxml2'
41+
#dependency 'libxml2'
4242
dependency 'libxslt'
43-
dependency 'libiconv'
44-
dependency 'liblzma'
45-
dependency 'zlib'
43+
#dependency 'libiconv'
44+
#dependency 'liblzma'
45+
#dependency 'zlib'
4646

4747
# ruby and bundler and friends
4848
dependency 'ruby'
4949
dependency 'ruby-windows-devkit' if windows?
5050
dependency 'rubygems'
5151
dependency 'bundler'
5252

53-
# dependency "chef"
54-
5553
# Version manifest file
5654
dependency 'version-manifest'
5755

5856
build do
59-
command 'cat C:\workup\embedded\bin\gem'
60-
6157
env = with_standard_compiler_flags(with_embedded_path)
6258

6359
gem 'install pkg/workup-0.1.1.gem', env: env

omnibus/config/software/zlib.rb

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
#
2+
# Copyright 2012-2015 Chef Software, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
name "zlib"
18+
default_version "1.2.8"
19+
20+
version "1.2.8" do
21+
source md5: "44d667c142d7cda120332623eab69f40"
22+
end
23+
version "1.2.6" do
24+
source md5: "618e944d7c7cd6521551e30b32322f4a"
25+
end
26+
27+
source url: "http://downloads.sourceforge.net/project/libpng/zlib/#{version}/zlib-#{version}.tar.gz"
28+
29+
license "Zlib"
30+
license_file "README"
31+
skip_transitive_dependency_licensing true
32+
33+
relative_path "zlib-#{version}"
34+
35+
build do
36+
if windows?
37+
env = with_standard_compiler_flags(with_embedded_path)
38+
39+
patch source: "zlib-windows-relocate.patch", env: env
40+
41+
# We can't use the top-level Makefile. Instead, the developers have made
42+
# an organic, artisanal, hand-crafted Makefile.gcc for us which takes a few
43+
# variables.
44+
env["BINARY_PATH"] = "/bin"
45+
env["LIBRARY_PATH"] = "/lib"
46+
env["INCLUDE_PATH"] = "/include"
47+
env["DESTDIR"] = "#{install_dir}/embedded"
48+
49+
make_args = [
50+
"-fwin32/Makefile.gcc",
51+
"SHARED_MODE=1",
52+
"CFLAGS=\"#{env['CFLAGS']} -Wall\"",
53+
"ASFLAGS=\"#{env['CFLAGS']} -Wall\"",
54+
"LDFLAGS=\"#{env['LDFLAGS']}\"",
55+
# The win32 makefile for zlib does not handle parallel make correctly.
56+
# In particular, see its rule for IMPLIB and SHAREDLIB. The ld step in
57+
# SHAREDLIB will generate both the dll and the dll.a files. The step to
58+
# strip the dll occurs next but since the dll.a file is already present,
59+
# make will attempt to link example_d.exe and minigzip_d.exe in parallel
60+
# with the strip step - causing gcc to freak out when a source file is
61+
# rewritten part way through the linking stage.
62+
#"-j #{workers}",
63+
]
64+
65+
make(*make_args, env: env)
66+
make("install", *make_args, env: env)
67+
else
68+
# We omit the omnibus path here because it breaks mac_os_x builds by picking
69+
# up the embedded libtool instead of the system libtool which the zlib
70+
# configure script cannot handle.
71+
# TODO: Do other OSes need this? Is this strictly a mac thing?
72+
env = with_standard_compiler_flags
73+
74+
# Ensure the PATH is still available
75+
env['PATH'] = ENV['PATH']
76+
77+
if freebsd?
78+
# FreeBSD 10+ gets cranky if zlib is not compiled in a
79+
# position-independent way.
80+
env["CFLAGS"] << " -fPIC"
81+
end
82+
83+
configure env: env
84+
85+
make "-j #{workers}", env: env
86+
make "-j #{workers} install", env: env
87+
end
88+
end

0 commit comments

Comments
 (0)