From owner-svn-ports-head@FreeBSD.ORG Sat Aug 23 14:08:11 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7863960; Sat, 23 Aug 2014 14:08:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 99DBA3763; Sat, 23 Aug 2014 14:08:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NE8Bmk037521; Sat, 23 Aug 2014 14:08:11 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NE8BRv037519; Sat, 23 Aug 2014 14:08:11 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201408231408.s7NE8BRv037519@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Sat, 23 Aug 2014 14:08:11 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 14:08:11 -0000 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