[glite-lb-client-java] Try to fix build on armhfp (increase timeout, although network is not used).
František Dvořák
valtri at fedoraproject.org
Mon Feb 24 14:58:30 UTC 2014
commit 496c1de5041bd76e68a03fd7957bd2a1f7639ab0
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Mon Feb 24 16:01:23 2014 +0100
Try to fix build on armhfp (increase timeout, although network is not used).
axis-timeout.diff | 19 +++++++++++++++++++
glite-lb-client-java.spec | 4 ++++
2 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/axis-timeout.diff b/axis-timeout.diff
new file mode 100644
index 0000000..b1d30a3
--- /dev/null
+++ b/axis-timeout.diff
@@ -0,0 +1,19 @@
+commit 4446c4db77da02949c63cf71b9813a8d4c6ce258
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Mon Feb 24 15:50:11 2014 +0100
+
+ Set big enough timeout for building on slower machines (the network is not used here though). Trying to fix build for armhfp for Fedora.
+
+diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
+index 228c3f0..031d3c4 100644
+--- a/org.glite.lb.client-java/Makefile
++++ b/org.glite.lb.client-java/Makefile
+@@ -150,7 +150,7 @@ build/gen:
+ ${GEN} build/gen
+
+ build/axis:
+- ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl
++ ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java --output build/axis --timeout 600 ${stagedir}${prefix}/share/wsdl/glite-lb/LB.wsdl
+
+ build/javadoc: build/gen
+ ${JAVADOC} -d build/javadoc -classpath build/classes/axis:build/classes/core:build/classes/security:${jobid_classpath}:${axis_classpath}:${trustmanager_classpath} $(addprefix ${top_srcdir}/src/org/glite/lb/,$(DOC_SOURCES)) build/gen/*.java
diff --git a/glite-lb-client-java.spec b/glite-lb-client-java.spec
index 4628d0a..1ff0954 100644
--- a/glite-lb-client-java.spec
+++ b/glite-lb-client-java.spec
@@ -15,6 +15,8 @@ Patch0: jni-path.diff
Patch1: cflags.diff
# https://github.com/CESNET/glite-lb/commit/b84862df75991212b6a374b872894ca6a5c067d0
Patch2: ppc64.diff
+# https://github.com/CESNET/glite-lb/commit/4446c4db77da02949c63cf71b9813a8d4c6ce258
+Patch3: axis-timeout.diff
BuildRequires: ant
BuildRequires: axis
@@ -67,6 +69,7 @@ L&B client.
%patch0 -p2
%patch1 -p2
%patch2 -p2
+%patch3 -p3
%build
@@ -116,6 +119,7 @@ install -m 0644 JPP-%{name}.pom JPP-%{name}-axis.pom $RPM_BUILD_ROOT%{_mavenpomd
%changelog
* Mon Feb 24 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-3
- Switch to java-headless (RB #1068107)
+- Try to fix build on armhfp (increase timeout, event the network is not used)
* Wed Jan 15 2014 František Dvořák <valtri at civ.zcu.cz> - 2.0.5-2
- Remove jpackage-utils (Build)Requires (needed only for EPEL <= 6)
More information about the scm-commits
mailing list