diff options
| author | jlam <jlam> | 2002-10-02 08:41:22 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-02 08:41:22 +0000 |
| commit | c078510307d807c3ede16bda2cf306464c5dbf9d (patch) | |
| tree | f6b98c368b77408952c0aabd6eadc1624eb3c488 | |
| parent | e8dcd770f2a6a207443aec3be25ec9dbe961a971 (diff) | |
| download | pkgsrc-c078510307d807c3ede16bda2cf306464c5dbf9d.tar.gz | |
Use gcc/buildlink2.mk instead of Makefile.gcc.
| -rw-r--r-- | audio/libogg/Makefile | 9 | ||||
| -rw-r--r-- | audio/libvorbis/Makefile | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index b772feefe6c..90ee9fadf73 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/08/25 18:38:13 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/10/02 08:41:22 jlam Exp $ DISTNAME= libogg-1.0 PKGNAME= libogg-1.0.0.8 @@ -16,10 +16,5 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= DISTNAME=${DISTNAME} -GCC_VERSION!= gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) -# "egcs" cannot be used, as it generates bad ogg files. -.include "../../lang/gcc/Makefile.gcc" -.endif - +.include "../../lang/gcc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 43c73a97090..097a1e19bc4 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/08/25 18:38:16 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2002/10/02 08:41:23 jlam Exp $ DISTNAME= libvorbis-1.0 PKGNAME= libvorbis-1.0.0.8 @@ -18,11 +18,6 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool PLIST_SUBST+= DISTNAME=${DISTNAME} -GCC_VERSION!=gcc --version -.if (${GCC_VERSION:C/-.*$$//} == egcs) -# "egcs" cannot be used, as it generates bad ogg files. -.include "../../lang/gcc/Makefile.gcc" -.endif - .include "../../audio/libogg/buildlink2.mk" +.include "../../lang/gcc/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |