From cff71cf607ae7d0b42f61fbc0159e2bccd559ee8 Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Tue, 24 May 2016 07:26:15 +0200 Subject: [PATCH] adapt working with gems to rhel 7 --- pcsd/Gemfile | 7 +------ pcsd/Gemfile.lock | 3 --- pcsd/Makefile | 5 +---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pcsd/Gemfile b/pcsd/Gemfile index e01b31c..02134fd 100644 --- a/pcsd/Gemfile +++ b/pcsd/Gemfile @@ -1,9 +1,5 @@ source 'https://rubygems.org' -source 'https://tojeline.fedorapeople.org/rubygems/' do - gem 'rpam-ruby19-feist', :platform => :ruby_18 -end - gem 'sinatra' gem 'sinatra-contrib' gem 'rack' @@ -11,8 +7,7 @@ gem 'rack-protection' gem 'tilt' gem 'rack-test' gem 'backports' -gem 'rpam-ruby19', :platform => [:ruby_19, :ruby_20, :ruby_21, :ruby_22] -gem 'json' +gem 'rpam-ruby19' gem 'multi_json' gem 'open4' gem 'orderedhash' diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock index a3fab96..36853bd 100644 --- a/pcsd/Gemfile.lock +++ b/pcsd/Gemfile.lock @@ -1,11 +1,9 @@ GEM remote: https://rubygems.org/ - remote: https://tojeline.fedorapeople.org/rubygems/ specs: backports (3.6.8) ethon (0.10.1) ffi (1.9.17) - json (2.0.3) multi_json (1.12.1) open4 (1.3.4) orderedhash (0.0.6) @@ -35,7 +33,6 @@ DEPENDENCIES backports ethon ffi - json multi_json open4 orderedhash diff --git a/pcsd/Makefile b/pcsd/Makefile index 2ecd4de..10719e1 100644 --- a/pcsd/Makefile +++ b/pcsd/Makefile @@ -1,7 +1,7 @@ FFI_VERSION="1.9.17" FFI_C_DIR=vendor/bundle/ruby/gems/ffi-${FFI_VERSION}/ext/ffi_c -build_gems: get_gems +build_gems: bundle install --local --deployment #ffi makes symlink with absolute path. Let's change it to relative path. for fname in `ls ${FFI_C_DIR}/libffi-*/include/ffitarget.h`; do \ @@ -33,8 +33,5 @@ build_gems_rhel6: vendor/cache/tilt-2.0.6.gem \ -- '--with-ldflags="-Wl,-z,now -Wl,-z,relro"' -get_gems: - bundle package - clean: rm -rfv vendor/ -- 1.8.3.1