summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2016-01-06 15:25:59 -0800
committertyler-ball <tyleraball@gmail.com>2016-01-07 13:11:16 -0800
commitee687d05affda82e000e4767cc9b791f694f0506 (patch)
tree78d16443200dfc5c9e76e1a8ea1f9561b5013301
parent11042288dac26ca2c632b44c6ce02a9cb99e4451 (diff)
downloadchef-ee687d05affda82e000e4767cc9b791f694f0506.tar.gz
Reverting https://github.com/chef/omnibus/pull/583 to fix ChefDK build
errors. This fixes the builds because (we think) the makefile for libgecode isn't appropriatly leveraging the ARFLAGS environment variable. This causes the ar command to lose its operation (add, replace, etc.).
-rw-r--r--Gemfile.lock7
1 files changed, 5 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c9596a8d6b..4b959a6bd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: f1231f74ebda76530e73fd6416e1ee7eb7be3656
+ revision: b6422a3f9678a6f5cc145c9b0a488409ac0af73c
specs:
omnibus (5.0.0)
aws-sdk (~> 2)
@@ -74,7 +74,7 @@ GEM
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x86-mingw32)
- ffi-yajl (2.2.2)
+ ffi-yajl (2.2.3)
libyajl2 (~> 1.2)
gssapi (1.2.0)
ffi (>= 1.0.1)
@@ -198,3 +198,6 @@ DEPENDENCIES
omnibus-software!
test-kitchen (~> 1.4.0)
winrm-transport (~> 1.0)
+
+BUNDLED WITH
+ 1.11.2