These two packages really only need GNU "as" 1.11 or newer to build on

NetBSD-1.5.*, so pull in the build-time dependency on binutils and gcc
conditionally on the version reported by ${AS}. For that case, set
${GCC_EXEC_PREFIX} in the build environment, and pass in an "--as="
argument to "configure", to make absolutely sure the new "gas" gets used.

3 files changed, 16 insertions, 7 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index 06df466d77b..10dad6ef11d 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/04/30 15:09:57 veego Exp $
+# $NetBSD: Makefile,v 1.5 2002/05/03 18:00:50 fredb Exp $
 
 .include "../../graphics/mplayer/Makefile.common"
 
@@ -55,10 +55,8 @@ do-install:
 
 .include "../../audio/lame/buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
-.include "../../devel/binutils/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
-.include "../../lang/gcc/Makefile.gcc"
 .include "../../misc/libdvdread/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index fcd98caaa00..3fa0b460e52 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2002/04/30 15:10:00 veego Exp $
+# $NetBSD: Makefile,v 1.24 2002/05/03 18:00:50 fredb Exp $
 
 .include "Makefile.common"
 
@@ -18,10 +18,8 @@ do-install:
 
 .include "../../audio/lame/buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
-.include "../../devel/binutils/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
-.include "../../lang/gcc/Makefile.gcc"
 .include "../../misc/libdvdread/buildlink.mk"
 .include "../../mk/ossaudio.buildlink.mk"
 .include "../../mk/pthread.buildlink.mk"
diff --git a/graphics/mplayer/Makefile.common b/graphics/mplayer/Makefile.common
index a6faa6368b8..e6ef6977471 100644
--- a/graphics/mplayer/Makefile.common
+++ b/graphics/mplayer/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2002/05/03 14:52:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2002/05/03 18:00:50 fredb Exp $
 
 MPLAYER_DIST_VERSION=	0.90pre2
 MPLAYER_PKG_VERSION=	${MPLAYER_DIST_VERSION:S/pre/rc/}
@@ -37,3 +37,16 @@ CONFIGURE_ARGS+=	--disable-mpdvdkit
 # but that directory may be mounted as noexec; work this around by setting
 # TMPDIR to ${WRKDIR}
 CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+# The package needs GNU "as" 2.11 or newer to build.
+#
+AS_VERSION!=	${AS} --version | ${AWK} 'NR==1 {print $$3}'
+.if ${AS_VERSION:M2.1[1-9]*} == ""
+CONFIGURE_ARGS+=	--as="${LOCALBASE}/${MACHINE_GNU_PLATFORM}/bin/as"
+CONFIGURE_ENV+=	GCC_EXEC_PREFIX="${LOCALBASE}/${MACHINE_GNU_PLATFORM}/bin/"
+MAKE_ENV+=	GCC_EXEC_PREFIX="${LOCALBASE}/${MACHINE_GNU_PLATFORM}/bin/"
+.include "../../devel/binutils/buildlink.mk"
+.include "../../lang/gcc/Makefile.gcc"
+.endif