|
Lines 1-15
Link Here
|
| 1 |
--- ext/dbm/extconf.rb.orig 2018-08-01 14:46:21 UTC |
1 |
--- ext/dbm/extconf.rb.orig 2019-12-01 06:24:29 UTC |
| 2 |
+++ ext/dbm/extconf.rb |
2 |
+++ ext/dbm/extconf.rb |
| 3 |
@@ -23,7 +23,7 @@ dir_config("dbm") |
3 |
@@ -24,7 +24,7 @@ dir_config("dbm") |
| 4 |
if dblib = with_config("dbm-type", nil) |
4 |
if dblib = with_config("dbm-type", nil) |
| 5 |
dblib = dblib.split(/[ ,]+/) |
5 |
dblib = dblib.split(/[ ,]+/) |
| 6 |
else |
6 |
else |
| 7 |
- dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm) |
7 |
- dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm) |
| 8 |
+ dblib = %w(libc db db2 db1 db6 db5 db48 db3 gdbm_compat gdbm qdbm) |
8 |
+ dblib = %w(libc db db2 db1 db6 db5 db48 db3 gdbm_compat gdbm qdbm) |
| 9 |
end |
9 |
end |
| 10 |
|
10 |
|
| 11 |
headers = { |
11 |
headers = { |
| 12 |
@@ -32,8 +32,9 @@ headers = { |
12 |
@@ -33,7 +33,7 @@ headers = { |
| 13 |
"db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], |
13 |
"db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"], |
| 14 |
"db2" => ["db2/db.h", "db2.h", "db.h"], |
14 |
"db2" => ["db2/db.h", "db2.h", "db.h"], |
| 15 |
"db3" => ["db3/db.h", "db3.h", "db.h"], |
15 |
"db3" => ["db3/db.h", "db3.h", "db.h"], |
|
Lines 16-26
Link Here
|
| 16 |
- "db4" => ["db4/db.h", "db4.h", "db.h"], |
16 |
- "db4" => ["db4/db.h", "db4.h", "db.h"], |
| 17 |
+ "db48" => ["db48/db.h", "db4.h", "db.h"], |
17 |
+ "db48" => ["db48/db.h", "db4.h", "db.h"], |
| 18 |
"db5" => ["db5/db.h", "db5.h", "db.h"], |
18 |
"db5" => ["db5/db.h", "db5.h", "db.h"], |
| 19 |
+ "db6" => ["db6/db.h", "db6.h", "db.h"], |
19 |
"db6" => ["db6/db.h", "db6.h", "db.h"], |
| 20 |
"gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 |
20 |
"gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1 |
| 21 |
"gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0 |
21 |
@@ -127,6 +127,19 @@ end |
| 22 |
"qdbm" => ["qdbm/relic.h", "relic.h"], |
|
|
| 23 |
@@ -125,13 +126,26 @@ end |
| 24 |
|
22 |
|
| 25 |
|
23 |
|
| 26 |
def headers.db_check2(db, hdr) |
24 |
def headers.db_check2(db, hdr) |
|
Lines 40-54
Link Here
|
| 40 |
$defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'}) |
38 |
$defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'}) |
| 41 |
$defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'}) |
39 |
$defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'}) |
| 42 |
|
40 |
|
| 43 |
hsearch = nil |
41 |
@@ -147,7 +160,7 @@ def headers.db_check2(db, hdr) |
| 44 |
|
|
|
| 45 |
case db |
| 46 |
- when /^db[2-5]?$/ |
| 47 |
+ when /^db[2-6].*$/ |
| 48 |
hsearch = "-DDB_DBM_HSEARCH" |
| 49 |
when "gdbm_compat" |
| 50 |
have_library("gdbm") or return false |
| 51 |
@@ -145,7 +159,7 @@ def headers.db_check2(db, hdr) |
| 52 |
# 4.3BSD original ndbm is contained in libc. |
42 |
# 4.3BSD original ndbm is contained in libc. |
| 53 |
# 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc. |
43 |
# 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc. |
| 54 |
if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) : |
44 |
if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) : |