From 9afa9836d3da719a72590e7ec134516b2884ed5d Mon Sep 17 00:00:00 2001 From: davidl Date: Thu, 13 Mar 2014 10:39:52 -0500 Subject: [PATCH 1/4] Allow passing build options to python, -j for example --- recipes/source.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/source.rb b/recipes/source.rb index ac8ed86..0cc8006 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -22,6 +22,7 @@ configure_options = node['python']['configure_options'].join(" ") make_options = node['python']['make_options'].join(" ") +make_build_options = node['python']['make_build_options'].join(" ") packages = value_for_platform_family( "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"], @@ -47,7 +48,7 @@ code <<-EOF tar -zxvf Python-#{version}.tgz (cd Python-#{version} && ./configure #{configure_options}) - (cd Python-#{version} && make && make #{make_options}) + (cd Python-#{version} && make #{make_build_options} && make #{make_options}) EOF environment({ "LDFLAGS" => "-L#{node['python']['prefix_dir']} -L/usr/lib", From d377c7760f749a14d57d65599d49c4d9c7f66440 Mon Sep 17 00:00:00 2001 From: davidl Date: Thu, 13 Mar 2014 10:50:36 -0500 Subject: [PATCH 2/4] drop the join on build opts --- recipes/source.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/source.rb b/recipes/source.rb index 0cc8006..8bb5dd8 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -22,7 +22,6 @@ configure_options = node['python']['configure_options'].join(" ") make_options = node['python']['make_options'].join(" ") -make_build_options = node['python']['make_build_options'].join(" ") packages = value_for_platform_family( "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"], From 23523ed08b8b1b4eae957d1e1c7f62720d3131e0 Mon Sep 17 00:00:00 2001 From: davidl Date: Thu, 13 Mar 2014 10:58:30 -0500 Subject: [PATCH 3/4] Need join --- recipes/source.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/source.rb b/recipes/source.rb index 8bb5dd8..0cc8006 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -22,6 +22,7 @@ configure_options = node['python']['configure_options'].join(" ") make_options = node['python']['make_options'].join(" ") +make_build_options = node['python']['make_build_options'].join(" ") packages = value_for_platform_family( "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"], From a14fdf7a7f179ad3fa1dc8327637598da4bf4f45 Mon Sep 17 00:00:00 2001 From: davidl Date: Thu, 13 Mar 2014 11:07:27 -0500 Subject: [PATCH 4/4] lets try this --- recipes/source.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/source.rb b/recipes/source.rb index 0cc8006..12903b8 100644 --- a/recipes/source.rb +++ b/recipes/source.rb @@ -22,7 +22,6 @@ configure_options = node['python']['configure_options'].join(" ") make_options = node['python']['make_options'].join(" ") -make_build_options = node['python']['make_build_options'].join(" ") packages = value_for_platform_family( "rhel" => ["openssl-devel","bzip2-devel","zlib-devel","expat-devel","db4-devel","sqlite-devel","ncurses-devel","readline-devel"], @@ -48,7 +47,7 @@ code <<-EOF tar -zxvf Python-#{version}.tgz (cd Python-#{version} && ./configure #{configure_options}) - (cd Python-#{version} && make #{make_build_options} && make #{make_options}) + (cd Python-#{version} && make #{node['python']['make_build_options']} && make #{make_options}) EOF environment({ "LDFLAGS" => "-L#{node['python']['prefix_dir']} -L/usr/lib",