← Back to branch summary

~ubuntu-branches/ubuntu/wily/ruby2.2/wily-proposed

« back to all changes in this revision

Viewing changes to ext/fiddle/extconf.rb

  • Committer: Package Import Robot
  • Author(s): Antonio Terceiro
  • Date: 2015-05-03 18:56:32 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20150503185632-kbjmakqdg20vt677
Tags: 2.2.2-1
* New upstream release
  - includes fix for vulnerability with overly permissive matching of
    hostnames in OpenSSL extension [CVE-2015-1855]
* debian/rules: add import-orig-source to automate importing orig tarballs
  generated from the upstream git mirror.
* debian/tests: add a functional test that will run all tests under test/

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/fiddle/extconf.rb
36
36
  end
37
37
  libffi.include = "#{libffi.builddir}/include"
38
38
  libffi.lib = "#{libffi.builddir}/.libs"
39
 
  libffi.a = "#{libffi.lib}/libffi.#{$LIBEXT}"
 
39
  libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
40
40
  nowarn = CONFIG.merge("warnflags"=>"")
41
41
  libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
42
42
  ver = ver[/libffi-(.*)/, 1]
64
64
  ld = RbConfig::CONFIG['LD']
65
65
  args.concat %W[
66
66
    --srcdir=#{libffi.srcdir}
67
 
    --disable-shared --host=#{libffi.arch}
 
67
    --host=#{libffi.arch}
68
68
    --enable-builddir=#{RUBY_PLATFORM}
69
69
  ]
 
70
  args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static')
70
71
  args << libffi.opt if libffi.opt
71
72
  args.concat %W[
72
73
      CC=#{cc} CFLAGS=#{libffi.cflags}