summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@oath.com>2019-01-23 15:16:28 +0100
committerArnstein Ressem <aressem@oath.com>2019-01-23 15:16:28 +0100
commitf647a0e7fdebea19ee6298c31e8e1dee1314773a (patch)
tree577fd6dafb3c15677d2c0c97b6aa0bf234d7b828 /dist
parent1a0ce61af6e287a4d366d81abe93c7efe4700c6e (diff)
We execute the java binary explicitly when compiling. Need to adjust PATH. Also parallell compilation with mvn works now.
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec3
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index e7da84afdfa..e520f282e1f 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -156,11 +156,12 @@ source %{_devtoolset_enable} || true
source %{_rhmaven35_enable} || true
%endif
+export PATH="/usr/lib/jvm/java-11-openjdk/bin:$PATH"
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
export FACTORY_VESPA_VERSION=%{version}
sh bootstrap.sh java
-mvn --batch-mode -nsu -T 1 install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
+mvn --batch-mode -nsu -T 1C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true
cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DJAVA_HOME=/usr/lib/jvm/java-11-openjdk \
-DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \