From 9f619652409f11c6e1f9d66e70fd60a3b99e2ea0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 16 Feb 2015 23:48:41 -0500 Subject: ruby/json: fix incorrect patch specifications The merges of the following two commits: commit 7ee6d9c99ab2a27ee700a53e47854e3c8eee7671 Author: Qian Lei 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 Signed-off-by: Bruce Ashfield commit 08f5108740cf64a696d2552e9922c6de72a9cee6 Author: Qian Lei 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 Signed-off-by: Bruce Ashfield 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 --- meta-openstack/recipes-devtools/ruby/json_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-openstack/recipes-devtools/ruby/json_git.bb') 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" SRC_URI = " \ git://github.com/flori/json.git \ + file://0001-Dont-compile-extensions.patch \ " inherit ruby BBCLASSEXTEND = "native" - file://0001-Dont-compile-extensions.patch \ -- cgit v1.2.3-54-g00ecf