Skip to content

Fix build on OS X #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rawrafox wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix build on OS X #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d07ce
Fix JAVA_HOME default on OS X
rawrafox Sep 18, 2016
167da39
Fix JAVA_PLATFORM on OS X
rawrafox Sep 18, 2016
516002e
Update recommended version in README.md
rawrafox Sep 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 9 additions & 13 deletions ext/kyotocabinet-java/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::"`
Expand All @@ -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"
Expand Down