diff options
| author |   Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-07-21 14:16:11 +0200 |
|---|---|---|
| committer | Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2010-07-21 14:16:11 +0200 |
| commit | 318ccc73633410c81006e08816869c8db355e483 (patch) | |
| tree | 3a69071b2734713031b1d19553a787270972b09d | |
| parent | Add berkdb 5.0 patch. (diff) | |
| download | ruby-scripts-318ccc73633410c81006e08816869c8db355e483.tar.gz ruby-scripts-318ccc73633410c81006e08816869c8db355e483.tar.bz2 ruby-scripts-318ccc73633410c81006e08816869c8db355e483.zip | |
Update berkdb 5 patch.
| -rw-r--r-- | patchsets/patches-1.9.2_rc2/007_berkdb-5.0.patch | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/patchsets/patches-1.9.2_rc2/007_berkdb-5.0.patch b/patchsets/patches-1.9.2_rc2/007_berkdb-5.0.patch index 2516cd3..bc32020 100644 --- a/patchsets/patches-1.9.2_rc2/007_berkdb-5.0.patch +++ b/patchsets/patches-1.9.2_rc2/007_berkdb-5.0.patch @@ -1,13 +1,31 @@ -Index: ruby-1.8.7-p299/ext/dbm/extconf.rb +Index: ruby-1.9.2-rc2/ext/dbm/extconf.rb =================================================================== ---- ruby-1.8.7-p299.orig/ext/dbm/extconf.rb -+++ ruby-1.8.7-p299/ext/dbm/extconf.rb -@@ -26,7 +26,7 @@ def headers.db_check(db) +--- ruby-1.9.2-rc2.orig/ext/dbm/extconf.rb ++++ ruby-1.9.2-rc2/ext/dbm/extconf.rb +@@ -21,12 +21,12 @@ headers = { + def headers.db_check(db) + db_prefix = nil + have_gdbm = false +- hsearch = nil ++ db_defs = nil + case db when /^db2?$/ db_prefix = "__db_n" - hsearch = "-DDB_DBM_HSEARCH " -+ hsearch = "-DDB_DBM_HSEARCH -DHAVE_DBM " ++ db_defs = %w[-DDB_DBM_HSEARCH -DHAVE_DBM] when "gdbm" have_gdbm = true when "gdbm_compat" +@@ -36,9 +36,9 @@ def headers.db_check(db) + db_prefix ||= "" + + if (have_library(db, db_prefix+"dbm_open") || have_func(db_prefix+"dbm_open")) and +- hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, hsearch)} ++ hdr = self.fetch(db, ["ndbm.h"]).find {|h| have_type("DBM", h, db_defs.join(" "))} + have_func(db_prefix+"dbm_clearerr") unless have_gdbm +- $defs << hsearch if hsearch ++ $defs += db_defs if db_defs + $defs << '-DDBM_HDR="<'+hdr+'>"' + true + else |