Fix %java_home detection
javapackages-tools is required to define %java_home, and the configure hack needs updating for the current syntax of that file.
This commit is contained in:
parent
fc03bdd065
commit
83ca194af0
@ -141,6 +141,7 @@ BuildRequires: libSM-devel
|
|||||||
BuildRequires: libXext-devel
|
BuildRequires: libXext-devel
|
||||||
%if %{JAVA}
|
%if %{JAVA}
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-devel
|
||||||
|
BuildRequires: javapackages-tools
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: cairo-devel >= 1.1.10
|
BuildRequires: cairo-devel >= 1.1.10
|
||||||
BuildRequires: pango-devel
|
BuildRequires: pango-devel
|
||||||
@ -421,8 +422,7 @@ autoreconf -fi
|
|||||||
|
|
||||||
%if %{JAVA}
|
%if %{JAVA}
|
||||||
# Hack in the java includes we need
|
# Hack in the java includes we need
|
||||||
sed -i '/JavaVM.framework/!s/JAVA_INCLUDES=/JAVA_INCLUDES=\"_MY_JAVA_INCLUDES_\"/g' configure
|
sed -i 's|for try_java_include in|& %{java_home}/include/ %{java_home}/include/linux/|' configure
|
||||||
sed -i 's|_MY_JAVA_INCLUDES_|-I%{java_home}/include/ -I%{java_home}/include/linux/|g' configure
|
|
||||||
%endif
|
%endif
|
||||||
# Rewrite config_ruby.rb to work with Ruby 2.2
|
# Rewrite config_ruby.rb to work with Ruby 2.2
|
||||||
sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb
|
sed -i 's|expand(|expand(RbConfig::|' config/config_ruby.rb
|
||||||
|
Loading…
Reference in New Issue
Block a user