malloc 1.3.3 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. data/Rakefile +15 -13
  2. metadata +2 -2
data/Rakefile CHANGED
@@ -7,14 +7,15 @@ require 'rake/loaders/makefile'
7
7
  require 'rbconfig'
8
8
 
9
9
  PKG_NAME = 'malloc'
10
- PKG_VERSION = '1.3.3'
10
+ PKG_VERSION = '1.3.4'
11
+ CFG = RbConfig::CONFIG
11
12
  CXX = ENV[ 'CXX' ] || 'g++'
12
13
  RB_FILES = FileList[ 'lib/**/*.rb' ]
13
14
  CC_FILES = FileList[ 'ext/*.cc' ]
14
15
  HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
15
16
  TC_FILES = FileList[ 'test/tc_*.rb' ]
16
17
  TS_FILES = FileList[ 'test/ts_*.rb' ]
17
- SO_FILE = "ext/#{PKG_NAME}.so"
18
+ SO_FILE = "ext/#{PKG_NAME}.#{CFG[ 'DLEXT' ]}"
18
19
  PKG_FILES = [ 'Rakefile', 'README.md', 'COPYING', '.document' ] +
19
20
  RB_FILES + CC_FILES + HH_FILES + TS_FILES + TC_FILES
20
21
  BIN_FILES = [ 'README.md', 'COPYING', '.document', SO_FILE ] +
@@ -26,17 +27,18 @@ EMAIL = %q{jan@wedesoft.de}
26
27
  HOMEPAGE = %q{http://wedesoft.github.com/malloc/}
27
28
 
28
29
  OBJ = CC_FILES.ext 'o'
29
- $CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
30
- $CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
31
- if RbConfig::CONFIG[ 'rubyhdrdir' ]
32
- $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
33
- "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
30
+ $CXXFLAGS = "-DNDEBUG #{CFG[ 'CPPFLAGS' ]} #{CFG[ 'CFLAGS' ]}"
31
+ if CFG[ 'rubyhdrdir' ]
32
+ $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'rubyhdrdir' ]} " +
33
+ "-I#{CFG[ 'rubyhdrdir' ]}/#{CFG[ 'arch' ]}"
34
34
  else
35
- $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
35
+ $CXXFLAGS = "#{$CXXFLAGS} -I#{CFG[ 'archdir' ]}"
36
36
  end
37
- $LIBRUBYARG = "-L#{RbConfig::CONFIG[ 'libdir' ]} #{RbConfig::CONFIG[ 'LIBRUBYARG' ]}"
38
- $SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
39
- $SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
37
+ $LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} " +
38
+ "#{CFG[ 'SOLIBS' ]} #{CFG[ 'DLDLIBS' ]}"
39
+ $SITELIBDIR = CFG[ 'sitelibdir' ]
40
+ $SITEARCHDIR = CFG[ 'sitearchdir' ]
41
+ $LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
40
42
 
41
43
  task :default => :all
42
44
 
@@ -44,7 +46,7 @@ desc 'Compile Ruby extension (default)'
44
46
  task :all => [ SO_FILE ]
45
47
 
46
48
  file SO_FILE => OBJ do |t|
47
- sh "#{CXX} -shared -o #{t.name} #{OBJ} #{$LIBRUBYARG}"
49
+ sh "g++ #{$LDSHARED} -o #{t.name} #{OBJ} #{$LIBRUBYARG}"
48
50
  end
49
51
 
50
52
  task :test => [ SO_FILE ]
@@ -163,7 +165,7 @@ rule '.o' => '.cc' do |t|
163
165
  end
164
166
 
165
167
  file ".depends.mf" do |t|
166
- sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
168
+ sh "g++ -MM #{CC_FILES.join ' '} | " +
167
169
  "sed -e :a -e N -e 's/\\n/\\$/g' -e ta | " +
168
170
  "sed -e 's/ *\\\\\\$ */ /g' -e 's/\\$/\\n/g' | sed -e 's/^/ext\\//' > #{t.name}"
169
171
  end
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 3
8
- - 3
9
- version: 1.3.3
8
+ - 4
9
+ version: 1.3.4
10
10
  platform: ruby
11
11
  authors:
12
12
  - Jan Wedekind