Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 10 Feb 2014 20:22:21 +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: r343678 - in head/lang: ruby19 ruby20
Message-ID:  <201402102022.s1AKMLxd099481@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Mon Feb 10 20:22:20 2014
New Revision: 343678
URL: http://svnweb.freebsd.org/changeset/ports/343678
QAT: https://qat.redports.org/buildarchive/r343678/

Log:
  - Fix build when newer gcc which includes a libffi is installed
  
  PR:		ports/186468
  Submitted by:	Jim Ohlstein <jim@ohlste.in>

Modified:
  head/lang/ruby19/Makefile
  head/lang/ruby20/Makefile

Modified: head/lang/ruby19/Makefile
==============================================================================
--- head/lang/ruby19/Makefile	Mon Feb 10 20:10:29 2014	(r343677)
+++ head/lang/ruby19/Makefile	Mon Feb 10 20:22:20 2014	(r343678)
@@ -18,9 +18,12 @@ LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libffi.so:${PORTSDIR}/devel/libffi \
 		libyaml.so:${PORTSDIR}/textproc/libyaml
 
+# Using LIB_DEPENDS finds the libffi from gcc which causes problems
+BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \

Modified: head/lang/ruby20/Makefile
==============================================================================
--- head/lang/ruby20/Makefile	Mon Feb 10 20:10:29 2014	(r343677)
+++ head/lang/ruby20/Makefile	Mon Feb 10 20:22:20 2014	(r343678)
@@ -18,9 +18,12 @@ LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libffi.so:${PORTSDIR}/devel/libffi \
 		libyaml.so:${PORTSDIR}/textproc/libyaml
 
+# Using LIB_DEPENDS finds the libffi from gcc which causes problems
+BUILD_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+RUN_DEPENDS=	libffi>=0:${PORTSDIR}/devel/libffi
+
 GNU_CONFIGURE=	yes
 WRKSRC=		${RUBY_WRKSRC}
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \



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