Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 438447c78bae
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c26cbd96925c
Choose a head ref
  • 7 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 25, 2016

  1. Copy the full SHA
    7b962b3 View commit details
  2. Copy the full SHA
    0461c9b View commit details
  3. Copy the full SHA
    76e6dd2 View commit details
  4. [Truffle] Extra space.

    chrisseaton committed Nov 25, 2016
    Copy the full SHA
    46b0b2f View commit details
  5. Copy the full SHA
    8ffd10f View commit details
  6. Copy the full SHA
    52273d7 View commit details
  7. Copy the full SHA
    c26cbd9 View commit details
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -16,6 +16,11 @@
*.tokens
*.su
*.ll
*.bc
extconf.h
mkmf.log
Makefile
cext-output.txt

.DS_Store
.debug.properties
1 change: 1 addition & 0 deletions test/truffle/cexts/xml/ext/xml/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'mkmf'
$CFLAGS += " -I#{ENV['LIBXML_INCLUDE']}"
$LDFLAGS += " -l #{ENV['LIBXML_LIB']}"
create_makefile('xml')
3 changes: 2 additions & 1 deletion test/truffle/cexts/xopenssl/ext/xopenssl/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'mkmf'
# $CFLAGS += " -I#{ENV['OPENSSL_INCLUDE']}"
$CFLAGS += " -I#{ENV['OPENSSL_INCLUDE']}"
$LDFLAGS += " -l #{ENV['OPENSSL_LIB']}"
create_makefile('xopenssl')
36 changes: 19 additions & 17 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -871,23 +871,25 @@ def test_cexts(*args)

# Test that we can compile and run some real C extensions

tests = [
['oily_png', ['chunky_png-1.3.6', 'oily_png-1.2.0'], ['oily_png']],
['psd_native', ['chunky_png-1.3.6', 'oily_png-1.2.0', 'bindata-2.3.1', 'hashie-3.4.4', 'psd-enginedata-1.1.1', 'psd-2.1.2', 'psd_native-1.1.3'], ['oily_png', 'psd_native']],
['nokogiri', [], ['nokogiri']]
]

tests.each do |gem_name, dependencies, libs, gem_root|
next if gem_name == 'nokogiri' # nokogiri totally excluded
next if gem_name == 'nokogiri' && no_libxml
gem_root = "#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}"
cextc gem_root, false, '-Werror=implicit-function-declaration'

next if gem_name == 'psd_native' # psd_native is excluded just for running
run '--graal',
*dependencies.map { |d| "-I#{ENV['GEM_HOME']}/gems/#{d}/lib" },
*libs.map { |l| "-I#{JRUBY_DIR}/test/truffle/cexts/#{l}/lib" },
"#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}/test.rb", gem_root
if ENV['GEM_HOME']
tests = [
['oily_png', ['chunky_png-1.3.6', 'oily_png-1.2.0'], ['oily_png']],
['psd_native', ['chunky_png-1.3.6', 'oily_png-1.2.0', 'bindata-2.3.1', 'hashie-3.4.4', 'psd-enginedata-1.1.1', 'psd-2.1.2', 'psd_native-1.1.3'], ['oily_png', 'psd_native']],
['nokogiri', [], ['nokogiri']]
]

tests.each do |gem_name, dependencies, libs, gem_root|
next if gem_name == 'nokogiri' # nokogiri totally excluded
next if gem_name == 'nokogiri' && no_libxml
gem_root = "#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}"
cextc gem_root, false, '-Werror=implicit-function-declaration'

next if gem_name == 'psd_native' # psd_native is excluded just for running
run '--graal',
*dependencies.map { |d| "-I#{ENV['GEM_HOME']}/gems/#{d}/lib" },
*libs.map { |l| "-I#{JRUBY_DIR}/test/truffle/cexts/#{l}/lib" },
"#{JRUBY_DIR}/test/truffle/cexts/#{gem_name}/test.rb", gem_root
end
end
end
private :test_cexts
2 changes: 2 additions & 0 deletions truffle/src/main/c/openssl/extconf.rb
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
require 'mkmf'
$CFLAGS += " -I#{ENV['OPENSSL_INCLUDE']} -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID"
$LDFLAGS += " -l #{ENV['OPENSSL_LIB']}"
create_makefile('openssl')
4 changes: 2 additions & 2 deletions truffle/src/main/ruby/core/rbconfig.rb
Original file line number Diff line number Diff line change
@@ -104,8 +104,8 @@ module RbConfig
'CC' => cc,
'CPP' => cpp,
'COMPILE_C' => "$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$< -o $@ && #{opt} -S -always-inline -mem2reg $@ -o $@",
'CFLAGS' => " -emit-llvm -I#{ENV['OPENSSL_HOME']}/include -DHAVE_OPENSSL_110_THREADING_API -DHAVE_HMAC_CTX_COPY -DHAVE_EVP_CIPHER_CTX_COPY -DHAVE_BN_RAND_RANGE -DHAVE_BN_PSEUDO_RAND_RANGE -DHAVE_X509V3_EXT_NCONF_NID -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens ",
'LINK_SO' => "mx -v -p #{ENV['SULONG_HOME']} su-link -o $@ -l #{ENV['OPENSSL_LIB']} -l #{ENV['LIBXML_LIB']} $(OBJS)",
'CFLAGS' => "-emit-llvm",
'LINK_SO' => "mx -v -p #{ENV['SULONG_HOME']} su-link -o $@ $(OBJS)",
'TRY_LINK' => "#{clang} $(src) $(INCFLAGS) $(CFLAGS) -I#{ENV['SULONG_HOME']}/include $(LIBS)"
})