Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jan 2018 20:12:38 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r458079 - in head/databases/rubygem-mysql: . files
Message-ID:  <201801042012.w04KCc56056293@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Thu Jan  4 20:12:38 2018
New Revision: 458079
URL: https://svnweb.freebsd.org/changeset/ports/458079

Log:
  Fix build with Ruby 2.4+ and unbreak this port
  
  MFH:		2018Q1

Added:
  head/databases/rubygem-mysql/files/
  head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c   (contents, props changed)
Modified:
  head/databases/rubygem-mysql/Makefile

Modified: head/databases/rubygem-mysql/Makefile
==============================================================================
--- head/databases/rubygem-mysql/Makefile	Thu Jan  4 20:12:33 2018	(r458078)
+++ head/databases/rubygem-mysql/Makefile	Thu Jan  4 20:12:38 2018	(r458079)
@@ -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
 

Added: head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c	Thu Jan  4 20:12:38 2018	(r458079)
@@ -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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801042012.w04KCc56056293>