diff options
| author | tron <tron@pkgsrc.org> | 2003-10-26 14:26:25 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2003-10-26 14:26:25 +0000 |
| commit | bed161cd0580af1c86473a58abd2e89c2779e58a (patch) | |
| tree | f686be6e832c287cb2a6e6bf7fea08ade6fa8a39 | |
| parent | 06d5ca37ff6df865f2720ef8b33690653366075f (diff) | |
| download | pkgsrc-bed161cd0580af1c86473a58abd2e89c2779e58a.tar.gz | |
Solve GCC version problem by patching the "configure" script because the
"--disable-gcc-checking" makes the build interactive.
| -rw-r--r-- | graphics/mplayer-share/Makefile.common | 3 | ||||
| -rw-r--r-- | graphics/mplayer-share/patches/patch-aa | 17 |
2 files changed, 14 insertions, 6 deletions
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common index 9d7ead07993..09a5bc34eb9 100644 --- a/graphics/mplayer-share/Makefile.common +++ b/graphics/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2003/10/26 14:04:41 tron Exp $ +# $NetBSD: Makefile.common,v 1.44 2003/10/26 14:26:25 tron Exp $ # MPLAYER_DIST_VERSION= 1.0pre1 @@ -37,7 +37,6 @@ CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --with-extralibdir="${LOCALBASE}/lib" \ --with-extralibdir="${X11BASE}/lib" \ --disable-mpdvdkit \ - --disable-gcc-checking \ # The configure script attempts to test-execute compiled programs in /tmp, # but that directory may be mounted as noexec; work this around by setting diff --git a/graphics/mplayer-share/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa index f53f09caadd..689098786f5 100644 --- a/graphics/mplayer-share/patches/patch-aa +++ b/graphics/mplayer-share/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2003/01/20 07:10:42 fredb Exp $ +$NetBSD: patch-aa,v 1.6 2003/10/26 14:26:26 tron Exp $ ---- configure.orig Thu Oct 24 14:12:40 2002 -+++ configure -@@ -298,8 +298,8 @@ for ac_option do +--- configure.orig 2003-09-01 12:51:11.000000000 +0200 ++++ configure 2003-10-26 15:24:19.000000000 +0100 +@@ -348,8 +348,8 @@ _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; --with-extralibdir=*) @@ -13,3 +13,12 @@ $NetBSD: patch-aa,v 1.5 2003/01/20 07:10:42 fredb Exp $ ;; --enable-runtime-cpudetection) _runtime_cpudetection=yes +@@ -473,7 +473,7 @@ + for _cc in "$_cc" gcc-3.1 gcc3 gcc-3.0 cc ; do + echocheck "$_cc version" + cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1` +- cc_version=`( $_cc -dumpversion ) 2>&1` ++ cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1` + if test "$?" -gt 0; then + cc_version="not found" + fi |