Skip to content

Commit 6e1bd33

Browse files
committed
Backport changes from 1-3-stable. Closes #79
After 1.3.7 release, backport changes associated with the compilation and the changelog itself.
1 parent af493aa commit 6e1bd33

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

CHANGELOG.rdoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
=== Unreleased
1+
=== 1.3.7 / 2013-01-11
22

33
* Bugfixes
44
* Closing a bad statement twice will not segv.
55
* Aggregate handlers are initialized on each query. Closes #44
66

7+
* Internal
8+
* Unset environment variables that could affect cross compilation.
9+
710
=== 1.3.6 / 2012-04-16
811

912
* Enhancements

lib/sqlite3/version.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module SQLite3
22

3-
VERSION = '1.3.6'
3+
VERSION = '1.3.7'
44

55
module VersionProxy
66

77
MAJOR = 1
88
MINOR = 3
9-
TINY = 6
9+
TINY = 7
1010
BUILD = nil
1111

1212
STRING = [ MAJOR, MINOR, TINY, BUILD ].compact.join( "." )

tasks/gem.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ HOE = Hoe.spec 'sqlite3' do
2121
spec_extras[:required_rubygems_version] = '>= 1.3.5'
2222
spec_extras[:extensions] = ["ext/sqlite3/extconf.rb"]
2323

24-
extra_dev_deps << ['rake-compiler', "~> 0.7.0"]
24+
extra_dev_deps << ['rake-compiler', "~> 0.8.2"]
2525
extra_dev_deps << ["mini_portile", "~> 0.2.2"]
2626

2727
clean_globs.push('**/test.db')

tasks/vendor_sqlite3.rake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ if ENV["USE_MINI_PORTILE"] == "true"
3636
end
3737

3838
task :cross do
39+
["CC", "CXX", "LDFLAGS", "CPPFLAGS", "RUBYOPT"].each do |var|
40+
ENV.delete(var)
41+
end
3942
host = ENV.fetch("HOST", Rake::ExtensionCompiler.mingw_host)
4043
$recipes.each do |_, recipe|
4144
recipe.host = host

0 commit comments

Comments
 (0)