Blame SOURCES/adapt-working-with-gems-to-rhel-7.patch
|
 |
be1b1f |
From 8d958e9f63698bd05b19213ddbf71b57cb228135 Mon Sep 17 00:00:00 2001
|
|
|
15f218 |
From: Ivan Devat <idevat@redhat.com>
|
|
|
15f218 |
Date: Tue, 24 May 2016 07:26:15 +0200
|
|
|
be1b1f |
Subject: [PATCH 3/5] adapt working with gems to rhel 7
|
|
|
15f218 |
|
|
|
15f218 |
---
|
|
|
be1b1f |
pcsd/Gemfile | 1 -
|
|
|
be1b1f |
pcsd/Gemfile.lock | 2 --
|
|
|
15f218 |
pcsd/Makefile | 5 +----
|
|
|
be1b1f |
3 files changed, 1 insertion(+), 7 deletions(-)
|
|
|
15f218 |
|
|
|
15f218 |
diff --git a/pcsd/Gemfile b/pcsd/Gemfile
|
|
|
be1b1f |
index 6418fd41..3598f533 100644
|
|
|
15f218 |
--- a/pcsd/Gemfile
|
|
|
15f218 |
+++ b/pcsd/Gemfile
|
|
|
be1b1f |
@@ -8,7 +8,6 @@ gem 'tilt'
|
|
|
15f218 |
gem 'rack-test'
|
|
|
15f218 |
gem 'backports'
|
|
|
be1b1f |
gem 'rpam-ruby19'
|
|
|
15f218 |
-gem 'json'
|
|
|
15f218 |
gem 'multi_json'
|
|
|
15f218 |
gem 'open4'
|
|
|
be1b1f |
gem 'ffi'
|
|
|
15f218 |
diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
|
|
|
be1b1f |
index 4b78bba6..137086ca 100644
|
|
|
15f218 |
--- a/pcsd/Gemfile.lock
|
|
|
15f218 |
+++ b/pcsd/Gemfile.lock
|
|
|
be1b1f |
@@ -4,7 +4,6 @@ GEM
|
|
|
be1b1f |
backports (3.11.3)
|
|
|
be1b1f |
ethon (0.11.0)
|
|
|
be1b1f |
ffi (1.9.25)
|
|
|
a3a2ad |
- json (2.1.0)
|
|
|
be1b1f |
multi_json (1.13.1)
|
|
|
15f218 |
open4 (1.3.4)
|
|
|
be1b1f |
rack (1.6.10)
|
|
|
be1b1f |
@@ -33,7 +32,6 @@ DEPENDENCIES
|
|
|
15f218 |
backports
|
|
|
f778fe |
ethon
|
|
|
f778fe |
ffi
|
|
|
15f218 |
- json
|
|
|
15f218 |
multi_json
|
|
|
15f218 |
open4
|
|
|
be1b1f |
rack
|
|
|
15f218 |
diff --git a/pcsd/Makefile b/pcsd/Makefile
|
|
|
be1b1f |
index 21550c5a..642d0c83 100644
|
|
|
15f218 |
--- a/pcsd/Makefile
|
|
|
15f218 |
+++ b/pcsd/Makefile
|
|
|
f778fe |
@@ -1,7 +1,7 @@
|
|
|
be1b1f |
FFI_VERSION="1.9.25"
|
|
|
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 \
|
|
|
be1b1f |
@@ -30,8 +30,5 @@ build_gems_without_bundler:
|
|
|
be1b1f |
vendor/cache/tilt-2.0.8.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 |
|