summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-08-19 22:17:25 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-08-19 22:17:25 +0000
commitc70b1989f62293f5a10d5cd22b873475d92bcd25 (patch)
tree313940eea5a82efb89d2b4303bf38d8dce4808dd
parent920656d01103a8ba7482ce9db1f2de56a4658635 (diff)
downloadclasspath-c70b1989f62293f5a10d5cd22b873475d92bcd25.tar.gz
Fix AIX build issue (RVM-526).
2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list.
-rw-r--r--ChangeLog6
-rw-r--r--scripts/check_jni_methods.sh.in10
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e82f809cd..b39104691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-19 David P Grove <groved@us.ibm.com>
+
+ * scripts/check_jni_methods.sh.in:
+ Fix build issue on AIX by splitting generation
+ of method list.
+
2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org>
* native/jni/gstreamer-peer/gst_native_pipeline.c:
diff --git a/scripts/check_jni_methods.sh.in b/scripts/check_jni_methods.sh.in
index 2a114d340..cf3009418 100644
--- a/scripts/check_jni_methods.sh.in
+++ b/scripts/check_jni_methods.sh.in
@@ -6,12 +6,16 @@ set -e
TMPFILE=/tmp/check-jni-methods.$$.1
TMPFILE2=/tmp/check-jni-methods.$$.2
TMPFILE3=/tmp/check-jni-methods.$$.3
+TMPFILE4=/tmp/check-jni-methods.$$.4
# Find all methods defined in the header files generated
# from the java source files.
-grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h @abs_top_srcdir@/include/*.h | \
- LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' | \
- sort -u > $TMPFILE
+grep -h '^JNIEXPORT .* Java_' @abs_top_srcdir@/include/*.h | \
+ LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' > $TMPFILE
+grep -h '^JNIEXPORT .* Java_' @abs_top_builddir@/include/*.h | \
+ LC_ALL=C sed -e 's,.*JNICALL \(Java_[a-z_A-Z0-9]*\).*$,\1,' >> $TMPFILE
+sort -u $TMPFILE > $TMPFILE4
+mv $TMPFILE4 $TMPFILE
# Find all methods in the JNI C source files.
find @abs_top_srcdir@/native/jni -name \*.c | \