svn commit: r399101 - head/lang/fpc-units

John Marino marino at FreeBSD.org
Sun Oct 11 19:08:04 UTC 2015


Author: marino
Date: Sun Oct 11 19:08:02 2015
New Revision: 399101
URL: https://svnweb.freebsd.org/changeset/ports/399101

Log:
  lang/fpc-units: Finally fix default build on FreeBSD 9
  
  On FreeBSD9, libEGL is built by GCC which requires binutils as a run
  depends.  fpc-cairo requires libEGL.  fpc-libbfd and binutils conflict
  with each other due to both installing the same header.  Thus, on
  FreeBSD 9, the BFD and CAIRO options cannot coexist.  Since both were
  set on by default, no binary package for fpc-units has built for months.
  
  Since there is no mechanism to set options by release, I use bmake's
  exist() function to check for /usr/include/lwres which only exists on
  FreeBSD 9.  If it's present, the BFD option is disabled by default.  This
  should restore the building of the fpc-units package on FreeBSD 9.
  
  Reported by:	pkg-fallout (for months)

Modified:
  head/lang/fpc-units/Makefile

Modified: head/lang/fpc-units/Makefile
==============================================================================
--- head/lang/fpc-units/Makefile	Sun Oct 11 18:56:50 2015	(r399100)
+++ head/lang/fpc-units/Makefile	Sun Oct 11 19:08:02 2015	(r399101)
@@ -96,7 +96,7 @@ X11_DESC=	Interface to X windows server
 XFORMS_DESC=	Interface to X-Forms
 ZLIB_DESC=	Interface to the zlib compression library
 
-OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
+OPTIONS_DEFAULT=A52 ASPELL BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
 		FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
 		FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPINDEXER \
 		FPMKUNIT FPPKG FV GDBM GMP GTK2 HERMES ICONVENC \
@@ -105,6 +105,12 @@ OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAI
 		PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
 		UTMP UUID X11 XFORMS ZLIB
 
+.if !exists(/usr/include/lwres)	# directory only exists on FreeBSD 9
+# On FreeBSD 9, CAIRO is built with GCC which pulls in binutils
+# binutils and BFD conflict, so BFD and CAIRO cannot coexist of F9
+OPTIONS_DEFAULT+=	BFD
+.endif
+
 .include <bsd.port.options.mk>
 
 UNITS_SELECTED=		#


More information about the svn-ports-all mailing list