Date: Sat, 23 Aug 2014 14:08:11 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365736 - in head/devel/rubygem-ffi: . files Message-ID: <201408231408.s7NE8BRv037519@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Sat Aug 23 14:08:10 2014 New Revision: 365736 URL: http://svnweb.freebsd.org/changeset/ports/365736 QAT: https://qat.redports.org/buildarchive/r365736/ Log: devel/rubygem-ffi: Fix loading libc on 10.x and newer PR: 188741 Submitted by: asomers Obtained from: https://github.com/Carpetsmoker/ffi/commit/ac63e07f76ed65e4ad8865ef1804ce6e7a333d19 Added: head/devel/rubygem-ffi/files/ head/devel/rubygem-ffi/files/patch-lib__ffi__library.rb (contents, props changed) Modified: head/devel/rubygem-ffi/Makefile Modified: head/devel/rubygem-ffi/Makefile ============================================================================== --- head/devel/rubygem-ffi/Makefile Sat Aug 23 14:04:12 2014 (r365735) +++ head/devel/rubygem-ffi/Makefile Sat Aug 23 14:08:10 2014 (r365736) @@ -3,6 +3,7 @@ PORTNAME= ffi PORTVERSION= 1.9.3 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG Added: head/devel/rubygem-ffi/files/patch-lib__ffi__library.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/rubygem-ffi/files/patch-lib__ffi__library.rb Sat Aug 23 14:08:10 2014 (r365736) @@ -0,0 +1,15 @@ +--- ./lib/ffi/library.rb.orig 2014-08-22 21:57:09.968099978 +0000 ++++ ./lib/ffi/library.rb 2014-08-22 21:57:30.351098318 +0000 +@@ -114,9 +114,9 @@ + + rescue Exception => ex + ldscript = false +- if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*invalid ELF header/ +- if File.read($1) =~ /GROUP *\( *([^ \)]+) *\)/ +- libname = $1 ++ if ex.message =~ /(([^ \t()])+\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)/ ++ if File.read($1) =~ /(?:GROUP|INPUT) *\( *([^\)]+)/ ++ libname = $1.split(' ')[0] + ldscript = true + end + end
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408231408.s7NE8BRv037519>