diff options
author | drochner <drochner@pkgsrc.org> | 2003-07-03 15:56:37 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2003-07-03 15:56:37 +0000 |
commit | f92baced29152fcab9cdc83923996b42e15ae464 (patch) | |
tree | c3b059a506ea4663aa408f538776c8fd4652b152 | |
parent | 3c58e326c09a881e5d3c95a82a924416532156ab (diff) | |
download | pkgsrc-f92baced29152fcab9cdc83923996b42e15ae464.tar.gz |
It seems that splitting gcc3 is more work than I expected.
Until this is done, put everything back but java.
-rw-r--r-- | lang/gcc3/Makefile | 7 | ||||
-rw-r--r-- | lang/gcc3/PLIST | 5 | ||||
-rw-r--r-- | lang/gcc3/files/gcc3.mk | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile index ab99947a220..c06961f3bc9 100644 --- a/lang/gcc3/Makefile +++ b/lang/gcc3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2003/07/03 11:58:05 drochner Exp $ +# $NetBSD: Makefile,v 1.27 2003/07/03 15:56:37 drochner Exp $ # DISTNAME= gcc-3.3 @@ -24,7 +24,8 @@ HAS_CONFIGURE= YES CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} -CONFIGURE_ARGS+= --enable-languages="c c++" +# java deliberately omitted, we'll provide an addon +CONFIGURE_ARGS+= --enable-languages="c c++ f77 objc ada" UNLIMIT_RESOURCES= datasize # as this is named gcc3, use DISTNAME instead. @@ -33,7 +34,7 @@ MESSAGE_SUBST+= PKGNAME_NOREV=${DISTNAME} TEXINFO_REQD= 4.2 -INFO_FILES= cpp.info gcc.info +INFO_FILES= cpp.info g77.info gcc.info .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h) diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST index aa633e51add..4afeceb7a85 100644 --- a/lang/gcc3/PLIST +++ b/lang/gcc3/PLIST @@ -1,7 +1,10 @@ -@comment $NetBSD: PLIST,v 1.5 2003/07/03 11:58:05 drochner Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/07/03 15:56:37 drochner Exp $ @unexec ${INSTALL_INFO} --delete %D/info/cpp.info %D/info/dir info/cpp.info @exec ${INSTALL_INFO} %D/info/cpp.info %D/info/dir +@unexec ${INSTALL_INFO} --delete %D/info/g77.info %D/info/dir +info/g77.info +@exec ${INSTALL_INFO} %D/info/g77.info %D/info/dir @unexec ${INSTALL_INFO} --delete %D/info/gcc.info %D/info/dir info/gcc.info @exec ${INSTALL_INFO} %D/info/gcc.info %D/info/dir diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk index 4907f3cf818..f863b284969 100644 --- a/lang/gcc3/files/gcc3.mk +++ b/lang/gcc3/files/gcc3.mk @@ -1,4 +1,4 @@ -# $NetBSD: gcc3.mk,v 1.5 2003/07/03 11:58:05 drochner Exp $ +# $NetBSD: gcc3.mk,v 1.6 2003/07/03 15:56:38 drochner Exp $ # # make configuration file for @PKGNAME_NOREV@ @@ -6,3 +6,5 @@ USE_GCC3= # defined CC= @GCC_PREFIX@/bin/cc CPP= @GCC_PREFIX@/bin/cpp CXX= @GCC_PREFIX@/bin/c++ +F77= @GCC_PREFIX@/bin/g77 +PKG_FC= @GCC_PREFIX@/bin/g77 |