Commit 2ee845fe5ac71c30ff5298c287a49a1362e5dc71
1 parent
7e258cb0
Exists in
master
and in
17 other branches
Hack config.mak.autogen to avoid dependencies
Showing
1 changed file
with
13 additions
and
5 deletions
Show diff stats
config/software/git.rb
@@ -14,11 +14,6 @@ env = { | @@ -14,11 +14,6 @@ env = { | ||
14 | "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", | 14 | "LDFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", |
15 | "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", | 15 | "CFLAGS" => "-L#{install_dir}/embedded/lib -I#{install_dir}/embedded/include", |
16 | "LD_RUN_PATH" => "#{install_dir}/embedded/lib", | 16 | "LD_RUN_PATH" => "#{install_dir}/embedded/lib", |
17 | - "NO_PERL" => "YesPlease", | ||
18 | - "NO_EXPAT" => "YesPlease", | ||
19 | - "NO_TCLTK" => "YesPlease", | ||
20 | - "NO_GETTEXT" => "YesPlease", | ||
21 | - "NO_PYTHON" => "YesPlease" | ||
22 | } | 17 | } |
23 | 18 | ||
24 | build do | 19 | build do |
@@ -28,6 +23,19 @@ build do | @@ -28,6 +23,19 @@ build do | ||
28 | "--with-ssl=#{install_dir}/embedded", | 23 | "--with-ssl=#{install_dir}/embedded", |
29 | "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env | 24 | "--with-zlib=#{install_dir}/embedded"].join(" "), :env => env |
30 | 25 | ||
26 | + # Ugly hack because ./configure does not pick these up from the env | ||
27 | + block do | ||
28 | + open(File.join(project_dir, "config.mak.autogen"), "a") do |file| | ||
29 | + file.print <<-EOH | ||
30 | +NO_PERL=YesPlease | ||
31 | +NO_EXPAT=YesPlease | ||
32 | +NO_TCLTK=YesPlease | ||
33 | +NO_GETTEXT=YesPlease | ||
34 | +NO_PYTHON=YesPlease | ||
35 | + EOH | ||
36 | + end | ||
37 | + end | ||
38 | + | ||
31 | command "make -j #{max_build_jobs}", :env => env | 39 | command "make -j #{max_build_jobs}", :env => env |
32 | command "make install" | 40 | command "make install" |
33 | end | 41 | end |