svn commit: r323839 - head/devel/cross-gcc

[Tim Kientzle]

Author: kientzle (src committer)
Date: Sun Jul 28 16:58:31 2013
New Revision: 323839
URL: http://svnweb.freebsd.org/changeset/ports/323839

Log:
  PACKAGE_BUILDING isn't really the right condition here;
  what we use as the binutils really depends on whether this
  is being used as a master port or as a standalone port.

Modified:
  head/devel/cross-gcc/Makefile

Modified: head/devel/cross-gcc/Makefile
==============================================================================
--- head/devel/cross-gcc/Makefile	Sun Jul 28 16:51:54 2013	(r323838)
+++ head/devel/cross-gcc/Makefile	Sun Jul 28 16:58:31 2013	(r323839)
@@ -22,18 +22,10 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp
 		mpfr.4:${PORTSDIR}/math/mpfr \
 		mpc.2:${PORTSDIR}/math/mpc
 
-#
-# Temporary hack to deal with dependencies during package builds for
-# slave ports.
-#
-.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils
-RUN_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/${OURTARGET}-binutils
-BROKEN=		plist build broken with tinderbox/cluster
-.else
-BUILD_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
-RUN_DEPENDS=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
-.endif
+# If using this as a master port, override BUILD_DEPENDS and
+# RUN_DEPENDS with the appropriate specific binutils port.
+BUILD_DEPENDS?=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
+RUN_DEPENDS?=	${OURTARGET}-as:${PORTSDIR}/devel/cross-binutils
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes