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