Date: Fri, 11 Apr 2014 11:45:14 +0000 (UTC) From: Boris Samorodov <bsam@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350926 - head/print/cups-base Message-ID: <201404111145.s3BBjEAB006491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bsam Date: Fri Apr 11 11:45:13 2014 New Revision: 350926 URL: http://svnweb.freebsd.org/changeset/ports/350926 QAT: https://qat.redports.org/buildarchive/r350926/ Log: . fix cross-building; [1]; . refine comment. Reported by: gjb [1] Suggested by: bdrewery [1] MFH: 2014Q2 Modified: head/print/cups-base/Makefile Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Fri Apr 11 11:44:05 2014 (r350925) +++ head/print/cups-base/Makefile Fri Apr 11 11:45:13 2014 (r350926) @@ -57,11 +57,13 @@ PORTREVISION= 0 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_DEFINE= GNUTLS +USES+= compiler .elif defined(CUPS_IMAGE) PORTREVISION= 0 CUPS_SUFFIX= -image LICENSE= LGPL21 OPTIONS_DEFINE= GNUTLS +USES+= compiler .else INSTALLS_ICONS= yes PORTREVISION= 0 @@ -298,11 +300,12 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/ulpt-cupsd.sh ${STAGEDIR}${PREFIX}/sbin/ .endif -# This is just a band-aid to unbreak print/cups-client at systems with default gcc compiler, -# should be reworked to build with blocks and libdispatch support (via options). +# This is to workaround a CUPS bug. Should be fixed by 1.7.3. +# pfg@ filed a bug report upstream: https://www.cups.org/str.php?L4397 # .include <bsd.port.pre.mk> -.if (defined(CUPS_CLIENT) || defined(CUPS_IMAGE)) && ${OPSYS} == "FreeBSD" && ${OSVERSION} > 1000000 +.if (defined(CUPS_CLIENT) || defined(CUPS_IMAGE)) && ${OPSYS} == "FreeBSD" && \ + ${OSVERSION} > 1000000 && ${COMPILER_TYPE} == clang CFLAGS+= -fno-blocks .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404111145.s3BBjEAB006491>