summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2015-04-16 14:16:32 -0400
committerOtavio Salvador <otavio@ossystems.com.br>2016-01-04 09:21:06 -0200
commitc64369872559ba6604429070a72003719f54098f (patch)
treee9c9216b23f42f0cd5f3731c51b9f098d509b4c7
parent24092dc5e6680602d8a4b66bd9046f345bf58b3a (diff)
downloadmeta-java-c64369872559ba6604429070a72003719f54098f.tar.gz
inetlib: fix inetlib dependency during compilation
Fix a dependency issue when building many parallel threads for inetlib. The build failure looks like: 1. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43) import javax.security.auth.callback.Callback; ^^^^^^^^^^^^^^ The issue is due to the jar linking before all the objects are complete. Signed-off-by: Paul Barrette <paul.barrette@windriver.com> Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-rw-r--r--recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch31
-rw-r--r--recipes-core/classpathx/inetlib_1.1.1.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch b/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
new file mode 100644
index 0000000..6691228
--- /dev/null
+++ b/recipes-core/classpathx/inetlib-1.1.1/inetlib-missing-dependency-for-util_classes.patch
@@ -0,0 +1,31 @@
1From 9779e734630e65ac7f9b27531c521e6555e2b12b Mon Sep 17 00:00:00 2001
2From: Paul Barrette <paul.barrette@windriver.com>
3Date: Wed, 14 May 2014 10:55:31 -0400
4Subject: [PATCH] inetlib: missing dependency for util_classes
5
6Fix a dependency for intermittent build failures, e.g.:
71. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43)
8 import javax.security.auth.callback.Callback;
9 ^^^^^^^^^^^^^^
10
11Signed-off-by: Paul Barrette <paul.barrette@windriver.com>
12---
13 Makefile.am | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 5694974..ca93170 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -205,7 +205,7 @@ comsat_classes = $(patsubst $(src)/%.java, $(dst)/%.class, $(comsat_sources))
21
22 # Jar
23
24-$(inetlib_jar): $(dst) $(META_INF_FILES) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
25+$(inetlib_jar): $(dst) $(META_INF_FILES) $(util_classes) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
26 $(JAR) cf $(inetlib_jar) -C $(dst) META-INF -C $(dst) gnu
27
28 $(dst):
29--
301.8.3.2
31
diff --git a/recipes-core/classpathx/inetlib_1.1.1.bb b/recipes-core/classpathx/inetlib_1.1.1.bb
index f078e33..e42a650 100644
--- a/recipes-core/classpathx/inetlib_1.1.1.bb
+++ b/recipes-core/classpathx/inetlib_1.1.1.bb
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
7 7
8SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \ 8SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \
9 file://datadir_java.patch \ 9 file://datadir_java.patch \
10 file://inetlib-missing-dependency-for-util_classes.patch \
10 " 11 "
11 12
12inherit java-library autotools 13inherit java-library autotools