diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-03 14:37:00 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-07-03 14:37:00 -0700 |
| commit | 0b8cc0d54d7cfe3d13eb0e39336079653e27bdaa (patch) | |
| tree | 29410ae5e885d367331db70444a248fae8f1c58e | |
| parent | 63bcddf146e84b2f93b32faeac19c9c8045d8250 (diff) | |
| download | ffi-yajl-lcg/chefstyle5.tar.gz | |
fixes for latest chefstyle ruleslcg/chefstyle5
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | ext/ffi_yajl/ext/encoder/extconf.rb | 4 | ||||
| -rw-r--r-- | ext/ffi_yajl/ext/parser/extconf.rb | 4 | ||||
| -rw-r--r-- | lib/ffi_yajl/version.rb | 2 |
4 files changed, 6 insertions, 6 deletions
@@ -13,7 +13,7 @@ group :development do end group :development_extras do - gem "chefstyle" + gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master" end instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] diff --git a/ext/ffi_yajl/ext/encoder/extconf.rb b/ext/ffi_yajl/ext/encoder/extconf.rb index e13c0a1..8f7d14b 100644 --- a/ext/ffi_yajl/ext/encoder/extconf.rb +++ b/ext/ffi_yajl/ext/encoder/extconf.rb @@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h") "/usr/local/include", # /usr/local RbConfig::CONFIG["includedir"], # Ruby "/usr/include", # (default) - ] + ].freeze LIB_DIRS = [ "/opt/local/lib", # MacPorts "/usr/local/lib", # /usr/local + Homebrew RbConfig::CONFIG["libdir"], # Ruby "/usr/lib", # (default) - ] + ].freeze # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib dir_config("yajl", HEADER_DIRS, LIB_DIRS) diff --git a/ext/ffi_yajl/ext/parser/extconf.rb b/ext/ffi_yajl/ext/parser/extconf.rb index 86ee50f..5611934 100644 --- a/ext/ffi_yajl/ext/parser/extconf.rb +++ b/ext/ffi_yajl/ext/parser/extconf.rb @@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h") "/usr/local/include", # /usr/local RbConfig::CONFIG["includedir"], # Ruby "/usr/include", # (default) - ] + ].freeze LIB_DIRS = [ "/opt/local/lib", # MacPorts "/usr/local/lib", # /usr/local + Homebrew RbConfig::CONFIG["libdir"], # Ruby "/usr/lib", # (default) - ] + ].freeze # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib dir_config("yajl", HEADER_DIRS, LIB_DIRS) diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb index e5d669f..6be178d 100644 --- a/lib/ffi_yajl/version.rb +++ b/lib/ffi_yajl/version.rb @@ -21,5 +21,5 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. module FFI_Yajl - VERSION = "2.3.1" + VERSION = "2.3.1".freeze end |