From 2d2e3e3e8452de0a672d3153ef1eb6e2dda2c433 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Thu, 4 Jan 2018 20:12:38 +0000 Subject: Fix build with Ruby 2.4+ and unbreak this port MFH: 2018Q1 --- databases/rubygem-mysql/Makefile | 2 -- databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile index 9e048a6a8195..f04e48a1a0ea 100644 --- a/databases/rubygem-mysql/Makefile +++ b/databases/rubygem-mysql/Makefile @@ -12,8 +12,6 @@ COMMENT= MySQL API module for Ruby LICENSE= GPLv2 RUBY LICENSE_COMB= dual -BROKEN_RUBY24= yes - USE_RUBY= yes USES= gem mysql diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c new file mode 100644 index 000000000000..67d36e97f044 --- /dev/null +++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c @@ -0,0 +1,11 @@ +--- ext/mysql_api/mysql.c.orig 2018-01-03 15:47:52 UTC ++++ ext/mysql_api/mysql.c +@@ -1317,7 +1317,7 @@ static VALUE stmt_bind_result(int argc, + } + else if (argv[i] == rb_cString) + s->result.bind[i].buffer_type = MYSQL_TYPE_STRING; +- else if (argv[i] == rb_cNumeric || argv[i] == rb_cInteger || argv[i] == rb_cFixnum) ++ else if (argv[i] == rb_cNumeric || argv[i] == rb_cInteger || argv[i] == rb_cInteger) + s->result.bind[i].buffer_type = MYSQL_TYPE_LONGLONG; + else if (argv[i] == rb_cFloat) + s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE; -- cgit v1.2.3