diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-02-16 23:48:41 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-02-16 23:49:17 -0500 |
commit | 9f619652409f11c6e1f9d66e70fd60a3b99e2ea0 (patch) | |
tree | fcb79e635639647a31bf256e2d1111ca7c0819ac /meta-openstack/recipes-devtools/ruby | |
parent | 7ee6d9c99ab2a27ee700a53e47854e3c8eee7671 (diff) | |
download | meta-cloud-services-9f619652409f11c6e1f9d66e70fd60a3b99e2ea0.tar.gz |
ruby/json: fix incorrect patch specifications
The merges of the following two commits:
commit 7ee6d9c99ab2a27ee700a53e47854e3c8eee7671
Author: Qian Lei <qianl.fnst@cn.fujitsu.com>
Date: Wed Jan 28 10:03:36 2015 +0800
yajl-ruby: Don't compile extensions
Module mkmf is used to generate Makefile, but it uses native
libraries
instead of target libraries. To avoid arch problem, we don't compile
the extension.
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
commit 08f5108740cf64a696d2552e9922c6de72a9cee6
Author: Qian Lei <qianl.fnst@cn.fujitsu.com>
Date: Wed Jan 28 10:03:35 2015 +0800
json: Don't compile extensions
Module mkmf is used to generate Makefile, but it uses native
libraries
instead of target libraries. To avoid arch problem, we don't compile
the extension.
Signed-off-by: Qian Lei <qianl.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Were incorrected merged and contained invalid patch specifications. So
we move the patches up to the SRC_URI where they belong.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/ruby')
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/json_git.bb | 2 | ||||
-rw-r--r-- | meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-openstack/recipes-devtools/ruby/json_git.bb b/meta-openstack/recipes-devtools/ruby/json_git.bb index a852500..f738ece 100644 --- a/meta-openstack/recipes-devtools/ruby/json_git.bb +++ b/meta-openstack/recipes-devtools/ruby/json_git.bb | |||
@@ -17,9 +17,9 @@ 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 \ | ||
20 | " | 21 | " |
21 | 22 | ||
22 | inherit ruby | 23 | inherit ruby |
23 | 24 | ||
24 | BBCLASSEXTEND = "native" | 25 | BBCLASSEXTEND = "native" |
25 | file://0001-Dont-compile-extensions.patch \ | ||
diff --git a/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb b/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb index 9531142..ecc8d43 100644 --- a/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb +++ b/meta-openstack/recipes-devtools/ruby/yajl-ruby_git.bb | |||
@@ -18,9 +18,9 @@ S = "${WORKDIR}/git" | |||
18 | 18 | ||
19 | SRC_URI = " \ | 19 | SRC_URI = " \ |
20 | git://github.com/brianmario/yajl-ruby.git \ | 20 | git://github.com/brianmario/yajl-ruby.git \ |
21 | file://0001-Don-t-compile-extensions.patch \ | ||
21 | " | 22 | " |
22 | 23 | ||
23 | inherit ruby | 24 | inherit ruby |
24 | 25 | ||
25 | BBCLASSEXTEND = "native" | 26 | BBCLASSEXTEND = "native" |
26 | file://0001-Don-t-compile-extensions.patch \ | ||