From 71d07ce52f7608f8a87f3031d33b7054ee193e17 Mon Sep 17 00:00:00 2001 From: Aurora Date: Sun, 18 Sep 2016 11:50:58 +0200 Subject: [PATCH 1/3] Fix JAVA_HOME default on OS X --- ext/kyotocabinet-java/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/kyotocabinet-java/configure b/ext/kyotocabinet-java/configure index efeb966..efa827a 100755 --- a/ext/kyotocabinet-java/configure +++ b/ext/kyotocabinet-java/configure @@ -1834,7 +1834,7 @@ then else if uname | grep Darwin >config.tmp; then # Mac OS X - MYJAVAHOME=/System/Library/Frameworks/JavaVM.framework + MYJAVAHOME=`/usr/libexec/java_home` elif test -L /usr/bin/javac; then # other Unix, but /usr/bin/javac is a symlink MYJAVAHOME=`readlink -f /usr/bin/javac | sed "s:bin/javac::"` From 167da39462f8cf054e5bab2d685f403ed4ded61f Mon Sep 17 00:00:00 2001 From: Aurora Date: Sun, 18 Sep 2016 12:00:37 +0200 Subject: [PATCH 2/3] Fix JAVA_PLATFORM on OS X --- ext/kyotocabinet-java/configure | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/ext/kyotocabinet-java/configure b/ext/kyotocabinet-java/configure index efa827a..ee97723 100755 --- a/ext/kyotocabinet-java/configure +++ b/ext/kyotocabinet-java/configure @@ -1844,18 +1844,14 @@ printf '%s\n' "$MYJAVAHOME" # Platform of Java printf 'checking JVMPLATFORM... ' -if uname | grep Darwin >config.tmp -then - JVMPLATFORM="mac" -else - for file in `\ls $MYJAVAHOME/include` - do - if test -d "$MYJAVAHOME/include/$file" - then - JVMPLATFORM="$file" - fi - done -fi +for file in `\ls $MYJAVAHOME/include` +do + if test -d "$MYJAVAHOME/include/$file" + then + JVMPLATFORM="$file" + fi +done + printf '%s\n' "$JVMPLATFORM" MYCPPFLAGS="$MYCPPFLAGS -I$MYJAVAHOME/include -I$MYJAVAHOME/include/$JVMPLATFORM" MYCPPFLAGS="$MYCPPFLAGS -I$MYJAVAHOME/Headers -I$MYJAVAHOME/Headers/$JVMPLATFORM" From 516002ebb64d1a4fd4a82ecd28ab76794880edbf Mon Sep 17 00:00:00 2001 From: Aurora Date: Sun, 18 Sep 2016 12:02:20 +0200 Subject: [PATCH 3/3] Update recommended version in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e489533..f954fa5 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ add something like this to your Gemfile: ```ruby gem "kyotocabinet-ruby", "~> 1.27.1", :platforms => [:mri, :rbx] -gem "kyotocabinet-java", "~> 0.2.0", :platforms => :jruby +gem "kyotocabinet-java", "~> 0.3.0", :platforms => :jruby ``` ## Usage