summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2014-11-28 21:38:47 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2014-11-28 21:38:47 +0000
commit2016893a79012414f0dd2475230e17bf0b846aed (patch)
tree14ecca9705846cba01eaeff188af70235bfd9708
parenta619bea0e4f7d4a156ef13342562b9a4acf6b79d (diff)
downloadclasspath-2016893a79012414f0dd2475230e17bf0b846aed.tar.gz
PR64109: Missing symbol in libjavautil.so
2014-11-28 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/64109 * NEWS: Updated. * native/jni/java-util/Makefile.am: Link against jcl library. Signed-off-by: Andrew John Hughes <gnu_andrew@member.fsf.org>
-rw-r--r--ChangeLog7
-rw-r--r--NEWS1
-rw-r--r--native/jni/java-util/Makefile.am2
3 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1970e6725..29d72c7f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ PR classpath/64109
+ * NEWS: Updated.
+ * native/jni/java-util/Makefile.am:
+ Link against jcl library.
+
2014-09-15 Guillermo Rodriguez <guille.rodriguez@gmail.com>
* doc/www.gnu.org/announce/20120307.wml:
diff --git a/NEWS b/NEWS
index dc30c351f..80419405b 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ New in release 0.99.1 (XXX XX, 2012)
- PR55140: Addition of exception to codePointBefore breaks OpenJDK GenerateBreakIteratorData tool
- PR57070: VMProcess needs to notifyAll() instead of notify()
- PR58688: gnu.java.security.x509.PolicyNodeImpl#addAllPolicyQualifiers does not work
+ - PR64109: Missing symbol in libjavautil.so
New in release 0.99 (Feb 15, 2012)
diff --git a/native/jni/java-util/Makefile.am b/native/jni/java-util/Makefile.am
index 59ddc74e2..f2281a815 100644
--- a/native/jni/java-util/Makefile.am
+++ b/native/jni/java-util/Makefile.am
@@ -2,6 +2,8 @@ nativeexeclib_LTLIBRARIES = libjavautil.la
libjavautil_la_SOURCES = java_util_VMTimeZone.c
+libjavautil_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
+
AM_LDFLAGS = @CLASSPATH_MODULE@
AM_CPPFLAGS = @CLASSPATH_INCLUDES@
AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \