diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-28 17:18:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 17:18:30 -0700 |
| commit | 37a855808a3e0c8872b36eeba937bff27886a06e (patch) | |
| tree | 747d445fb4a2d43ed74dc7cdea9ceeccf050aa6d | |
| parent | 12f841e73726db70e27ed006e01e5098f6fa6343 (diff) | |
| parent | dca3280407ffe1e0617062d0e28bee37ef6672e9 (diff) | |
| download | chef-37a855808a3e0c8872b36eeba937bff27886a06e.tar.gz | |
Merge pull request #5957 from chef/lcg/solaris11-compiler-flags
bump _XOPEN_SOURCE to 600 for ruby 2.4 on Solaris
| -rw-r--r-- | omnibus/Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus/files/chef-gem/build-chef-gem.rb | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e2ed741e0c..1b80614fb2 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -25,7 +25,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 6a56be11bfbf871147b00d32d3b1368800e68107 + revision: a8acfaabcee5506482d5c56beb74afc573c2c1f9 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -38,13 +38,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.8.1) awesome_print (1.7.0) - aws-sdk (2.8.13) - aws-sdk-resources (= 2.8.13) - aws-sdk-core (2.8.13) + aws-sdk (2.8.14) + aws-sdk-resources (= 2.8.14) + aws-sdk-core (2.8.14) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.8.13) - aws-sdk-core (= 2.8.13) + aws-sdk-resources (2.8.14) + aws-sdk-core (= 2.8.14) aws-sigv4 (1.0.0) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) diff --git a/omnibus/files/chef-gem/build-chef-gem.rb b/omnibus/files/chef-gem/build-chef-gem.rb index 701461b01e..9e5bf9b996 100644 --- a/omnibus/files/chef-gem/build-chef-gem.rb +++ b/omnibus/files/chef-gem/build-chef-gem.rb @@ -72,6 +72,11 @@ module BuildChefGem env["CXX"] = "g++44" end + if solaris_11? + env["CFLAGS"] << " -std=c99" + env["CPPFLAGS"] << " -D_XOPEN_SOURCE=600 -D_XPG6" + end + # From dep-selector-libgecode # Ruby DevKit ships with BSD Tar env["PROG_TAR"] = "bsdtar" if windows? |