Date: Wed, 21 Oct 2015 08:32:52 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r399894 - branches/2015Q4/lang/fpc-units Message-ID: <201510210832.t9L8WqrZ087641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Wed Oct 21 08:32:52 2015 New Revision: 399894 URL: https://svnweb.freebsd.org/changeset/ports/399894 Log: MFH: r399101 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) Approved by: ports-secteam (feld) Modified: branches/2015Q4/lang/fpc-units/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/lang/fpc-units/Makefile ============================================================================== --- branches/2015Q4/lang/fpc-units/Makefile Wed Oct 21 08:26:20 2015 (r399893) +++ branches/2015Q4/lang/fpc-units/Makefile Wed Oct 21 08:32:52 2015 (r399894) @@ -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= #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510210832.t9L8WqrZ087641>