Date: Mon, 10 Jul 2023 11:25:15 GMT From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: edec808b3303 - main - databases/rubygem-bdb1: fix build with clang16 Message-ID: <202307101125.36ABPFGE058180@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=edec808b3303a3feeda7d4dd108d15ad06cb28bd commit edec808b3303a3feeda7d4dd108d15ad06cb28bd Author: Dirk Meyer <dinoex@FreeBSD.org> AuthorDate: 2023-07-10 11:24:59 +0000 Commit: Dirk Meyer <dinoex@FreeBSD.org> CommitDate: 2023-07-10 11:24:59 +0000 databases/rubygem-bdb1: fix build with clang16 --- databases/rubygem-bdb1/Makefile | 2 +- databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c | 197 ++++++++++++++++++++- .../rubygem-bdb1/files/patch-ext_bdb1_delegate.c | 11 ++ 3 files changed, 200 insertions(+), 10 deletions(-) diff --git a/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile index f155ce60641f..5f5d56bf30b6 100644 --- a/databases/rubygem-bdb1/Makefile +++ b/databases/rubygem-bdb1/Makefile @@ -1,6 +1,6 @@ PORTNAME= bdb1 PORTVERSION= 0.2.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases rubygems MASTER_SITES= RG diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c index d039d2ebdbb8..fc506303d49b 100644 --- a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c +++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c @@ -1,6 +1,97 @@ ---- ext/bdb1/bdb1.c.orig 2022-05-09 10:22:04 UTC +--- ext/bdb1/bdb1.c.orig 2023-07-08 13:26:04 UTC +++ ext/bdb1/bdb1.c -@@ -733,9 +733,11 @@ bdb1_close(VALUE obj) +@@ -115,7 +115,6 @@ VALUE + bdb1_test_load(VALUE obj, const DBT *a, int type_kv) + { + VALUE res; +- int i; + bdb1_DB *dbst; + + Data_Get_Struct(obj, bdb1_DB, dbst); +@@ -270,7 +269,7 @@ bdb1_mark(bdb1_DB *dbst) + } + + static VALUE +-bdb1_i185_btree(VALUE obj, VALUE dbstobj) ++bdb1_i185_btree(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg) + { + VALUE key, value; + bdb1_DB *dbst; +@@ -323,7 +322,7 @@ bdb1_i185_btree(VALUE obj, VALUE dbstobj) + } + + static VALUE +-bdb1_i185_hash(VALUE obj, VALUE dbstobj) ++bdb1_i185_hash(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg) + { + VALUE key, value; + bdb1_DB *dbst; +@@ -363,7 +362,7 @@ bdb1_i185_hash(VALUE obj, VALUE dbstobj) + } + + static VALUE +-bdb1_i185_recno(VALUE obj, VALUE dbstobj) ++bdb1_i185_recno(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg) + { + VALUE key, value; + bdb1_DB *dbst; +@@ -379,7 +378,6 @@ bdb1_i185_recno(VALUE obj, VALUE dbstobj) + dbst->info.ri.flags = NUM2INT(value); + } + else if (strcmp(options, "set_re_delim") == 0) { +- int ch; + if (TYPE(value) == T_STRING) { + str = StringValueCStr(value); + dbst->info.ri.bval = str[0]; +@@ -396,7 +394,6 @@ bdb1_i185_recno(VALUE obj, VALUE dbstobj) + dbst->info.ri.flags |= R_FIXEDLEN; + } + else if (strcmp(options, "set_re_pad") == 0) { +- int ch; + if (TYPE(value) == T_STRING) { + str = StringValueCStr(value); + dbst->info.ri.bval = str[0]; +@@ -444,7 +441,7 @@ bdb1_load_dump(VALUE obj) + } + + static VALUE +-bdb1_i185_common(VALUE obj, VALUE dbstobj) ++bdb1_i185_common(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg) + { + VALUE key, value; + bdb1_DB *dbst; +@@ -682,7 +679,7 @@ bdb1_init(int argc, VALUE *argv, VALUE obj) + } + switch(dbst->type) { + case 0: +- rb_iterate(rb_each, f, bdb1_i185_btree, obj); ++ rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_btree, obj); + if (dbst->bt_compare == 0 && rb_respond_to(obj, id_bt_compare)) { + dbst->has_info = Qtrue; + dbst->options |= BDB1_BT_COMPARE; +@@ -695,7 +692,7 @@ bdb1_init(int argc, VALUE *argv, VALUE obj) + } + break; + case 1: +- rb_iterate(rb_each, f, bdb1_i185_hash, obj); ++ rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_hash, obj); + if (dbst->h_hash == 0 && rb_respond_to(obj, id_h_hash)) { + dbst->has_info = Qtrue; + dbst->options |= BDB1_H_HASH; +@@ -703,10 +700,10 @@ bdb1_init(int argc, VALUE *argv, VALUE obj) + } + break; + case 2: +- rb_iterate(rb_each, f, bdb1_i185_recno, obj); ++ rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_recno, obj); + break; + } +- rb_iterate(rb_each, f, bdb1_i185_common, obj); ++ rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_common, obj); + } + if (name == NULL) oflags = O_CREAT | O_RDWR; + if (dbst->has_info) openinfo = &dbst->info; +@@ -733,9 +730,11 @@ bdb1_close(VALUE obj) VALUE opt; bdb1_DB *dbst; @@ -12,7 +103,7 @@ Data_Get_Struct(obj, bdb1_DB, dbst); bdb1_i_close(dbst); return Qnil; -@@ -752,15 +754,15 @@ bdb1_s_alloc(VALUE obj) +@@ -752,15 +751,15 @@ bdb1_s_alloc(VALUE obj) dbst->options |= BDB1_NOT_OPEN; cl = obj; while (cl) { @@ -31,7 +122,40 @@ dbst->type = DB_RECNO; break; } -@@ -878,7 +880,9 @@ bdb1_put(int argc, VALUE *argv, VALUE obj) +@@ -802,7 +801,7 @@ bdb1_s_create(int argc, VALUE *argv, VALUE obj) + } + + static VALUE +-bdb1_i_create(VALUE obj, VALUE db) ++bdb1_i_create(VALUE obj, VALUE db, int _argc, const VALUE *_argv, VALUE _blockarg) + { + VALUE tmp[2]; + tmp[0] = rb_ary_entry(obj, 0); +@@ -826,12 +825,12 @@ bdb1_i_create(VALUE obj, VALUE db) + static VALUE + bdb1_s_aref(int argc, VALUE *argv, VALUE obj) + { +- VALUE res, tmp[2]; ++ VALUE res; + int i; + + res = rb_funcall2(obj, rb_intern("new"), 0, 0); + if (argc == 1 && TYPE(argv[0]) == T_HASH) { +- rb_iterate(rb_each, argv[0], bdb1_i_create, res); ++ rb_block_call(argv[0], rb_intern("each"), 0, NULL, bdb1_i_create, res); + return res; + } + if (argc % 2 != 0) { +@@ -870,7 +869,7 @@ bdb1_s_open(int argc, VALUE *argv, VALUE obj) + VALUE + bdb1_put(int argc, VALUE *argv, VALUE obj) + { +- volatile VALUE a0 = Qnil; ++ volatile VALUE a0; + volatile VALUE b0 = Qnil; + VALUE a, b, c; + bdb1_DB *dbst; +@@ -878,7 +877,9 @@ bdb1_put(int argc, VALUE *argv, VALUE obj) int ret, flags; db_recno_t recno; @@ -41,7 +165,35 @@ GetDB(obj, dbst); if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3) flags = NUM2INT(c); -@@ -1071,7 +1075,9 @@ bdb1_del(VALUE obj, VALUE a) +@@ -935,7 +936,6 @@ bdb1_get_internal(int argc, VALUE *argv, VALUE obj, VA + VALUE b, c; + bdb1_DB *dbst; + DBT key, data; +- DBT datas; + int flagss; + int ret, flags; + db_recno_t recno; +@@ -994,7 +994,7 @@ bdb1_fetch(int argc, VALUE *argv, VALUE obj) + if (val == Qundef) { + if (rb_block_given_p()) { + if (argc > 1) { +- rb_raise(rb_eArgError, "wrong # of arguments", argc); ++ rb_raise(rb_eArgError, "wrong # of arguments, %d", argc); + } + return rb_yield(key); + } +@@ -1026,8 +1026,8 @@ bdb1_has_both(VALUE obj, VALUE a, VALUE b) + DBT keys, datas; + int ret, flags; + db_recno_t recno; +- volatile VALUE c = Qnil; +- volatile VALUE d = Qnil; ++ volatile VALUE c; ++ volatile VALUE d; + + GetDB(obj, dbst); + DATA_ZERO(key); +@@ -1071,7 +1071,9 @@ bdb1_del(VALUE obj, VALUE a) db_recno_t recno; volatile VALUE c = Qnil; @@ -51,8 +203,21 @@ GetDB(obj, dbst); if (dbst->type == DB_HASH) { rb_warning("delete can give strange result with DB_HASH"); -@@ -1112,7 +1118,9 @@ bdb1_delete_if(VALUE obj) - int ret, ret1, flags; +@@ -1090,7 +1092,7 @@ bdb1_empty(VALUE obj) + { + bdb1_DB *dbst; + DBT key, data; +- int ret, flags; ++ int ret; + db_recno_t recno; + + GetDB(obj, dbst); +@@ -1109,10 +1111,12 @@ bdb1_delete_if(VALUE obj) + { + bdb1_DB *dbst; + DBT key, data, save; +- int ret, ret1, flags; ++ int ret, flags; db_recno_t recno; +#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4 @@ -61,7 +226,12 @@ GetDB(obj, dbst); INIT_RECNO(dbst, key, recno); DATA_ZERO(data); -@@ -1138,7 +1146,9 @@ bdb1_clear(VALUE obj) +@@ -1134,11 +1138,13 @@ VALUE + bdb1_clear(VALUE obj) + { + bdb1_DB *dbst; +- DBT key, data, save; ++ DBT key, data; int ret, value, flags; db_recno_t recno; @@ -71,7 +241,16 @@ GetDB(obj, dbst); INIT_RECNO(dbst, key, recno); DATA_ZERO(data); -@@ -1536,8 +1546,10 @@ bdb1_sync(VALUE obj) +@@ -1360,7 +1366,7 @@ bdb1_each_kv(VALUE obj, VALUE a, VALUE result, VALUE f + int ret, flags; + db_recno_t recno; + VALUE k; +- volatile VALUE b = Qnil; ++ volatile VALUE b; + + GetDB(obj, dbst); + b = test_recno(obj, &key, &recno, a); +@@ -1536,8 +1542,10 @@ bdb1_sync(VALUE obj) { bdb1_DB *dbst; diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c new file mode 100644 index 000000000000..1a12f09e4f6a --- /dev/null +++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c @@ -0,0 +1,11 @@ +--- ext/bdb1/delegate.c.orig 2023-07-08 13:26:04 UTC ++++ ext/bdb1/delegate.c +@@ -33,7 +33,7 @@ bdb1_deleg_missing(int argc, VALUE *argv, VALUE obj) + + Data_Get_Struct(obj, struct deleg_class, delegst); + if (rb_block_given_p()) { +- res = rb_block_call(delegst->obj, id_send, argc, argv, rb_yield, 0); ++ res = rb_block_call(delegst->obj, id_send, argc, argv, (rb_block_call_func_t)rb_yield, 0); + } + else { + res = rb_funcall2(delegst->obj, id_send, argc, argv);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307101125.36ABPFGE058180>