diff options
| author | swills <swills@FreeBSD.org> | 2016-02-04 03:07:19 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2016-02-04 03:07:19 +0800 |
| commit | ecc4bd0e56cbb0cdbfceedb91297337183d2f719 (patch) | |
| tree | 31828b7e9d3418ef5c16cbac0003ca08e3f90c92 /databases/rubygem-bdb1 | |
| parent | aca18930a742d40340c1dc9eea47e5727f019c50 (diff) | |
| download | freebsd-ports-gnome-ecc4bd0e56cbb0cdbfceedb91297337183d2f719.tar.gz freebsd-ports-gnome-ecc4bd0e56cbb0cdbfceedb91297337183d2f719.tar.zst freebsd-ports-gnome-ecc4bd0e56cbb0cdbfceedb91297337183d2f719.zip | |
databases/rubygem-bdb1: fix build with Ruby 2.2 and 2.3
Diffstat (limited to 'databases/rubygem-bdb1')
| -rw-r--r-- | databases/rubygem-bdb1/Makefile | 11 | ||||
| -rw-r--r-- | databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile index 087000f6f239..5dd8f7b448c9 100644 --- a/databases/rubygem-bdb1/Makefile +++ b/databases/rubygem-bdb1/Makefile @@ -11,12 +11,15 @@ COMMENT= Ruby interface to Berkeley DB revision 1.8x with full feature support LICENSE= BSD2CLAUSE RUBY LICENSE_COMB= dual -BROKEN_RUBY22= yes -BROKEN_RUBY23= yes - USES= execinfo USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${RUBY_VER} >= 2.2 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ext_bdb1_recnum.c +.endif + +.include <bsd.port.post.mk> diff --git a/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c b/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c new file mode 100644 index 000000000000..9a172a17615a --- /dev/null +++ b/databases/rubygem-bdb1/files/extra-patch-ext_bdb1_recnum.c @@ -0,0 +1,11 @@ +--- ext/bdb1/recnum.c.orig ++++ ext/bdb1/recnum.c +@@ -17,7 +17,7 @@ + argc++; + } + rb_hash_aset(argv[argc - 1], array, INT2FIX(0)); +- if (rb_hash_aref(argv[argc - 1], sarray) != RHASH(argv[argc - 1])->ifnone) { ++ if (rb_hash_aref(argv[argc - 1], sarray) != rb_hash_ifnone(argv[argc - 1])) { + rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0)); + } + rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER)); |