diff options
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch | 20 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/json_git.bb | 5 |
2 files changed, 2 insertions, 23 deletions
diff --git a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch b/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch deleted file mode 100644 index 0c2f513..0000000 --- a/meta-openstack/recipes-devtools/ruby/json/0001-Dont-compile-extensions.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | From 8c6e4b688cc7feade17caa832f9304262025fd17 Mon Sep 17 00:00:00 2001 | ||
2 | From: Qian Lei <qianl.fnst@cn.fujitsu.com> | ||
3 | Date: Tue, 27 Jan 2015 19:34:26 +0800 | ||
4 | Subject: [PATCH] Dont compile extensions | ||
5 | |||
6 | Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com> | ||
7 | --- | ||
8 | json.gemspec | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git a/json.gemspec b/json.gemspec | ||
12 | index 75926b1..af7e9ca 100644 | ||
13 | --- a/json.gemspec | ||
14 | +++ b/json.gemspec | ||
15 | @@ -13 +13 @@ Gem::Specification.new do |s| | ||
16 | - s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"] | ||
17 | +# s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"] | ||
18 | -- | ||
19 | 1.8.3.1 | ||
20 | |||
diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb index f738ece..a417798 100644 --- a/meta-openstack/recipes-devtools/ruby/json_git.bb +++ b/meta-openstack/recipes-devtools/ruby/json_git.bb | |||
@@ -9,15 +9,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=aef161fe3c86f1a8d6c71d3b8c5655c5" | |||
9 | 9 | ||
10 | PR = "r0" | 10 | PR = "r0" |
11 | 11 | ||
12 | BPV = "1.8.1" | 12 | BPV = "1.8.3" |
13 | PV = "${BPV}" | 13 | PV = "${BPV}" |
14 | SRCREV = "92a96dea2b24b9c68856004d69491f46aedd0925" | 14 | SRCREV = "db4c71a7701b95c30f945ee1536240920dcfdc17" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
18 | SRC_URI = " \ | 18 | SRC_URI = " \ |
19 | git://github.com/flori/json.git \ | 19 | git://github.com/flori/json.git \ |
20 | file://0001-Dont-compile-extensions.patch \ | ||
21 | " | 20 | " |
22 | 21 | ||
23 | inherit ruby | 22 | inherit ruby |