Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Apr 2011 21:42:15 GMT
From:      Eric Freeman <freebsdports@chillibear.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/156507: [PATCH] databases/ruby-cdb (patch to enable compiling with RUBY_VER 1.9)
Message-ID:  <201104192142.p3JLgFJa025039@red.freebsd.org>
Resent-Message-ID: <201104192150.p3JLo7JF019386@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         156507
>Category:       ports
>Synopsis:       [PATCH] databases/ruby-cdb (patch to enable compiling with RUBY_VER 1.9)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 19 21:50:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Eric Freeman
>Release:        8.2
>Organization:
>Environment:
FreeBSD BSD8R.local 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Thu Feb 17 02:41:51 UTC 2011     root@mason.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Currently databases/ruby-cdb does not compile when using Ruby 1.9

This patch allows it to work when RUBY_VER is 1.9
>How-To-Repeat:
install ruby 1.9

cd /usr/ports/databases/ruby-cdb && make build RUBY_VER=1.9

fails
>Fix:
diff -ru ruby-cdb.orig/Makefile ruby-cdb/Makefile
--- ruby-cdb.orig/Makefile	2011-04-18 19:50:24.000000000 +0100
+++ ruby-cdb/Makefile	2011-04-18 19:51:18.000000000 +0100
@@ -28,6 +28,12 @@
 
 .include <bsd.port.pre.mk>
 
+post-patch:
+	${REINPLACE_CMD} -E \
+		-e 's|RSTRING\(([^)]+)\)->len|RSTRING_LEN(\1)|g' \
+		-e 's|RSTRING\(([^)]+)\)->ptr|RSTRING_PTR(\1)|g' \
+		${WRKSRC}/cdb.c
+
 post-extract:
 	${RM} -f ${WRKSRC}/cdb
 	${LN} -s `cd ${CDB_PORTDIR}; ${MAKE} -V WRKSRC` ${WRKSRC}/cdb

>Release-Note:
>Audit-Trail:
>Unformatted:



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