libyajl2 0.1.10 → 0.1.11
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.
- checksums.yaml +4 -4
- data/ext/libyajl2/extconf.rb +8 -7
- data/lib/libyajl2/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 29a02e90f2ed93b73b6ae8817e3a642a7a95a495
|
|
4
|
+
data.tar.gz: 4ae49d8a164cb4dcc0d88028f9abd7149dc2c5e4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 444d1906930e8b87cbd464dce82343f419400f6451d8a47dda4ab9f4ed57643cc38b1ec844aa7ee52497d54a6e4280fd6b241c66360c0f4cf6101d9bb1b0ca88
|
|
7
|
+
data.tar.gz: 0681909336a7403320518c81194f544c97225d1a2c4f9964eeffe769fa7671b7c70c1ccefdc0b957c0dffd5aecbe6d887cca8fb269b34fbcebfa7584c5445dca
|
data/ext/libyajl2/extconf.rb
CHANGED
|
@@ -40,16 +40,9 @@ module Libyajl2Build
|
|
|
40
40
|
|
|
41
41
|
$CFLAGS << " -DNDEBUG"
|
|
42
42
|
|
|
43
|
-
|
|
44
43
|
# ENV vars can override everything
|
|
45
44
|
$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
|
|
46
45
|
$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
|
|
47
|
-
|
|
48
|
-
if windows?
|
|
49
|
-
# on windows this will try to spit out a *.def that exports Init_libyajl which is wrong, we aren't a ruby lib, so we
|
|
50
|
-
# will never export that.
|
|
51
|
-
RbConfig::MAKEFILE_CONFIG['DLDFLAGS'].gsub!(/\$\(DEFFILE\)/, '')
|
|
52
|
-
end
|
|
53
46
|
end
|
|
54
47
|
|
|
55
48
|
def self.makemakefiles
|
|
@@ -57,6 +50,14 @@ module Libyajl2Build
|
|
|
57
50
|
dir_config("libyajl")
|
|
58
51
|
create_makefile("libyajl")
|
|
59
52
|
|
|
53
|
+
# on windows the Makefile will try to export Init_libyajl which is wrong because we aren't a ruby lib.
|
|
54
|
+
# i could not figure out how to tell mkmf.rb to stop being so helpful, so instead will just patch it here.
|
|
55
|
+
if windows?
|
|
56
|
+
makefile = IO.read("Makefile")
|
|
57
|
+
makefile.gsub!(/\$\(DEFFILE\)/, '')
|
|
58
|
+
File.open("Makefile", 'w+') {|f| f.write(makefile) }
|
|
59
|
+
end
|
|
60
|
+
|
|
60
61
|
# we cheat and build it right away...
|
|
61
62
|
system("make V=1")
|
|
62
63
|
# ...so we can hack up what install does later and copy over the include files
|
data/lib/libyajl2/version.rb
CHANGED