Skip to content

Commit

Permalink
[Truffle] RbConfig and mkmf updates to support making openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
Brandon Fish committed Nov 8, 2016
1 parent 4217ec8 commit e814214
Show file tree
Hide file tree
Showing 6 changed files with 2,746 additions and 6 deletions.
1 change: 1 addition & 0 deletions lib/ruby/truffle/cext/include/ruby.h
View file
@@ -0,0 +1 @@
#include "../ruby.h"
1 change: 1 addition & 0 deletions lib/ruby/truffle/cext/ruby/encoding.h
View file
@@ -0,0 +1 @@
#include "../ruby.h"
1 change: 1 addition & 0 deletions lib/ruby/truffle/cext/ruby/oniguruma.h
View file
@@ -0,0 +1 @@
#include "../ruby.h"

3 comments on commit e814214

@bjfish
Copy link
Contributor

@bjfish bjfish commented on e814214 Nov 8, 2016 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chrisseaton Could you give this a try? I've been running with:

cd ~/Documents/jruby/truffle/src/main/c/openssl/
OPENSSL_HOME=/usr/local/opt/openssl SULONG_HOME=/Users/brandonfish/Documents/suparent/sulong ../../../../../bin/jruby -X+T extconf.rb
make

Copy the openssl.su to jruby/lib/ruby/truffle/openssl.
Then give require "openssl" a try. I see an error upon requiring.

I've added our own version of the mkmf file with # MODIFIED tags where changes are made because the original mkmf appears to hard code assumptions about the ruby project directory structure.

@eregon
Copy link
Member

@eregon eregon commented on e814214 Nov 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bjfish When you edit an existing file like that, first commit the original, and then your modifications. That would allow to easily port the modifications to a newer version and see what got modified.

@chrisseaton
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bjfish with running su-opt, this now seems to do what we want.

Please sign in to comment.