Fix flatpak build
OpenJDK is built into /app for flatpaks which need it, so provide some additional hints so that it is found during the build.
This commit is contained in:
parent
6e5de7889d
commit
e1b8d18b96
5
vtk.spec
5
vtk.spec
@ -564,6 +564,9 @@ find vtk-examples -type f | xargs chmod -R a-x
|
|||||||
-DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
|
-DJAVA_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
|
||||||
-DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\
|
-DJAVA_INCLUDE_PATH2:PATH=$JAVA_HOME/include/linux \\\
|
||||||
-DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
|
-DJAVA_AWT_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
|
||||||
|
-DJAVA_AWT_LIBRARY:PATH=$JAVA_HOME/lib/libjawt.so \\\
|
||||||
|
-DJAVA_JNI_INCLUDE_PATH:PATH=$JAVA_HOME/include \\\
|
||||||
|
-DJAVA_JVM_LIBRARY:PATH=$JAVA_HOME/lib/libjava.so \\\
|
||||||
%else \
|
%else \
|
||||||
-DVTK_WRAP_JAVA:BOOL=OFF \\\
|
-DVTK_WRAP_JAVA:BOOL=OFF \\\
|
||||||
%endif \
|
%endif \
|
||||||
@ -591,7 +594,7 @@ export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
|
|||||||
export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
|
export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
|
||||||
export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
|
export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
|
||||||
%if %{with java}
|
%if %{with java}
|
||||||
export JAVA_HOME=/usr/lib/jvm/java
|
export JAVA_HOME=%{_prefix}/lib/jvm/java
|
||||||
%ifarch %{arm} s390x riscv64
|
%ifarch %{arm} s390x riscv64
|
||||||
# getting "java.lang.OutOfMemoryError: Java heap space" during the build
|
# getting "java.lang.OutOfMemoryError: Java heap space" during the build
|
||||||
export JAVA_TOOL_OPTIONS=-Xmx2048m
|
export JAVA_TOOL_OPTIONS=-Xmx2048m
|
||||||
|
Loading…
Reference in New Issue
Block a user