summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES3
-rw-r--r--lang/gcc3/DESCR16
-rw-r--r--lang/gcc3/MESSAGE8
-rw-r--r--lang/gcc3/Makefile154
-rw-r--r--lang/gcc3/PLIST4
-rw-r--r--lang/gcc3/buildlink2.mk60
-rw-r--r--lang/gcc3/distinfo9
-rw-r--r--lang/gcc3/files/gcc3.mk10
-rw-r--r--lang/gcc3/patches/patch-aa16
-rw-r--r--lang/gcc3/patches/patch-ab12
-rw-r--r--lang/gcc3/patches/patch-ae9
-rw-r--r--lang/gcc3/patches/patch-af18
-rw-r--r--lang/gcc3/patches/patch-ag13
13 files changed, 26 insertions, 306 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 76f5db00648..3b25aa8a7e3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.4658 2004/02/01 11:08:51 jmmv Exp $
+$NetBSD: CHANGES,v 1.4659 2004/02/01 14:13:19 jlam Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -543,3 +543,4 @@ Changes to the packages collection and infrastructure in 2004:
Updated gpart to 0.1h [xtraeme 2004-01-31]
Updated tcl-otcl to 1.0a8nb2 [xtraeme 2004-01-31]
Updated xmms-mad to 0.5.5nb1 [jmmv 2004-02-01]
+ Updated gcc3 to 3.3.2 [jlam 2004-02-01]
diff --git a/lang/gcc3/DESCR b/lang/gcc3/DESCR
index bef410282ba..ad644a25ce7 100644
--- a/lang/gcc3/DESCR
+++ b/lang/gcc3/DESCR
@@ -1,14 +1,4 @@
-This directory contains the GNU Compiler Collection (GCC) version 3.3.
-It includes all of the support for compiling C, C++, Objective C, Fortran,
-Java, and Chill.
+The GNU Compiler Collection (GCC) version 3.x.
-The GNU Compiler Collection is free software. See the file COPYING for copying
-permission.
-
-See the file gcc.texi (together with other files that it includes) for
-installation and porting information. The file INSTALL contains a
-copy of the installation information, as plain ASCII.
-
-See the Bugs chapter of the GCC Manual for how to report bugs
-usefully. An online readable version of the manual is in the files
-gcc.info*.
+This is a meta package for the C, C++, Objective C, Fortran, and Java
+compilers.
diff --git a/lang/gcc3/MESSAGE b/lang/gcc3/MESSAGE
deleted file mode 100644
index 3ec6da7a8cd..00000000000
--- a/lang/gcc3/MESSAGE
+++ /dev/null
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/07/04 16:11:57 seb Exp $
-
-To use ${PKGNAME} include
-"${PREFIX}/share/examples/${DISTNAME}/mk.conf"
-in your BSD style makefile.
-
-===========================================================================
diff --git a/lang/gcc3/Makefile b/lang/gcc3/Makefile
index 367ca4f6550..96b58334a58 100644
--- a/lang/gcc3/Makefile
+++ b/lang/gcc3/Makefile
@@ -1,143 +1,29 @@
-# $NetBSD: Makefile,v 1.48 2004/01/24 13:51:14 grant Exp $
-#
+# $NetBSD: Makefile,v 1.49 2004/02/01 14:12:22 jlam Exp $
-DISTNAME= gcc-3.3
-PKGREVISION= 6
-PKGNAME= ${DISTNAME:S/gcc/gcc3/}
-CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.3/}
-EXTRACT_SUFX= .tar.bz2
+GCC_VERSION= 3.3.2
+DISTNAME= gcc3-${GCC_VERSION}
+CATEGORIES= lang
+MASTER_SITES= # empty
+DISTFILES= # empty
-MAINTAINER= tech-pkg@NetBSD.org
-HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html
-COMMENT= GNU Compiler Collection, version 3
-
-CONFLICTS+= gcc-3* pgcc-[0-9]*
+MAINTAINER= tech-pkg@NetBSD.org
+HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html
+COMMENT= GNU Compiler Collection, v3
NOT_FOR_PLATFORM= Darwin-*-*
-USE_BUILDLINK2= YES
-USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
-
-HAS_CONFIGURE= YES
-
-CONFIGURE_ARGS+= --prefix=${GCC_PREFIX}
-UNLIMIT_RESOURCES= datasize
-
-FILES_SUBST+= DISTNAME=${DISTNAME} GCC_PREFIX=${GCC_PREFIX}
-MESSAGE_SUBST+= DISTNAME=${DISTNAME}
-PLIST_SUBST+= DISTNAME=${DISTNAME}
-
-TEXINFO_REQD= 4.2
-
-.include "../../mk/bsd.prefs.mk"
-
-BUILD_DEFS+= PKG_GCC3_JAVA
-
-INFO_DIR= ${GCC_PREFIX:S|^${PREFIX}/||}/info
-INFO_FILES= cpp.info g77.info gcc.info gccint.info cppinternals.info
-.if defined(PKG_GCC3_JAVA)
-INFO_FILES+= fastjar.info gcj.info
-.endif
-
-.if ${OPSYS} == "NetBSD" && exists(/usr/include/pthread.h)
-CONFIGURE_ARGS+= --host=${MACHINE_GNU_ARCH}--netbsdelf2.0
-PTHREAD_OPTS+= require native
-.include "../../mk/pthread.buildlink2.mk"
-CPPFLAGS+= -I${BUILDLINK_DIR}/include
-CFLAGS+= -I${BUILDLINK_DIR}/include
-.else
-CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
-.endif
-# java takes hours to build, so make it optional
-.if !defined(PKG_GCC3_JAVA)
-CONFIGURE_ARGS+= --enable-languages="c,c++,f77,objc,ada"
-.endif
+DEPENDS+= gcc3-c-${GCC_VERSION}:../../lang/gcc3-c
+DEPENDS+= gcc3-c++-${GCC_VERSION}:../../lang/gcc3-c++
+DEPENDS+= gcc3-f77-${GCC_VERSION}:../../lang/gcc3-f77
+DEPENDS+= gcc3-java-${GCC_VERSION}:../../lang/gcc3-java
+DEPENDS+= gcc3-objc-${GCC_VERSION}:../../lang/gcc3-objc
-.if ${OPSYS} == "NetBSD" && !defined(USE_BINUTILS)
-AS_VERSION!= ${AS} --version | ${AWK} '{ \
- split($$3, v, /[.]/); \
- printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \
- exit; \
- }'
-USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && echo YES || echo NO
-.endif
+EXTRACT_ONLY= # empty
+NO_CHECKSUM= yes
+NO_BUILDLINK= yes
+NO_CONFIGURE= yes
+NO_BUILD= yes
-.if defined(USE_BINUTILS) && ${USE_BINUTILS} == "YES"
-DEPENDS= binutils>=2.13.2.1:../../devel/binutils
-CONFIGURE_ARGS+= --with-as=${PREFIX}/${MACHINE_GNU_PLATFORM}/bin/as
-#. include "../../devel/binutils/buildlink2.mk"
-.endif
-
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
-CONFIGURE_ARGS+= --enable-shared
-.else
-. if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+= --enable-shared
-. else
-CONFIGURE_ARGS+= --disable-shared
-. endif
-. if ${CC:M*gcc*} == ""
-ALL_TARGET= bootstrap
-. endif
-.endif
-
-GCC_PREFIX= ${PREFIX}/${DISTNAME}
-GCC_VERSION= ${PKGVERSION:C|nb.*||}
-GCC_ARCHDIR= ${GCC_PREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}
-PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
-
-pre-configure:
- ${MKDIR} ${BUILD_DIRS}
- cd ${WRKSRC} && contrib/gcc_update --touch
-
-post-build:
- @${SED} ${FILES_SUBST_SED} ${FILESDIR}/gcc3.mk > ${WRKDIR}/gcc3.mk
-
-post-install:
-.if ${OPSYS} == "SunOS"
- -cd ${GCC_ARCHDIR}/include && ${RM} -f fixed && ${RMDIR} v7 v9
-.endif
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME}
- ${INSTALL_DATA} ${WRKDIR}/gcc3.mk ${PREFIX}/share/examples/${DISTNAME}/mk.conf
- ${LN} -f ${GCC_PREFIX}/bin/gcc ${GCC_PREFIX}/bin/cc
-# ${LN} -f ${GCC_PREFIX}/bin/g77 ${GCC_PREFIX}/bin/f77
- ${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
- ${FIND} ${GCC_PREFIX} \( -type f -o -type l \) -print \
- | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \
- >> ${PLIST_SRC}
- ${FIND} ${GCC_PREFIX} -type d -print \
- | ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g" \
- >> ${PLIST_SRC}
+do-install: # empty
.include "../../mk/bsd.pkg.mk"
-
-# do not allow gcc to find libintl.h (or anything else) in ${LOCALBASE}.
-# if it can, it expects it can have libintl, and linking fails miserably.
-CFLAGS:= ${CFLAGS:S|-I${LOCALBASE}/include||}
-CPPFLAGS:= ${CPPFLAGS:S|-I${LOCALBASE}/include||}
-
-# Make bootstrap with compiler != gcc possible.
-CONFIGURE_ENV+= LDFLAGS="${_STRIPFLAG_CC}"
-MAKE_ENV+= GCC_PREFIX="${GCC_PREFIX}"
-
-# On NetBSD, the gcc-2.95.3 for:
-#
-# alpha
-#
-# have an optimization bug when compiling with -O2 that is tickled by:
-#
-# java/parse.o
-#
-# note that we don't override CFLAGS and CPPFLAGS because we want the
-# crosscompiled compiler to be build with optimization. This only
-# disables optimization for the stage 1 build.
-#
-.if ${OPSYS} == "NetBSD"
-. if ${MACHINE_ARCH} == "alpha"
-CONFIG_CFLAGS= ${CFLAGS:C/-O[0-9]*//g}
-CONFIG_CPPFLAGS= ${CPPFLAGS:C/-O[0-9]*//g}
-CONFIGURE_ENV+= CFLAGS="${CONFIG_CFLAGS}" CPPFLAGS="${CONFIG_CPPFLAGS}"
-. endif
-.endif
diff --git a/lang/gcc3/PLIST b/lang/gcc3/PLIST
index be41456e120..552228a1477 100644
--- a/lang/gcc3/PLIST
+++ b/lang/gcc3/PLIST
@@ -1,3 +1 @@
-@comment $NetBSD: PLIST,v 1.10 2003/07/13 13:16:04 grant Exp $
-share/examples/${DISTNAME}/mk.conf
-@dirrm share/examples/${DISTNAME}
+@comment $NetBSD: PLIST,v 1.11 2004/02/01 14:12:22 jlam Exp $
diff --git a/lang/gcc3/buildlink2.mk b/lang/gcc3/buildlink2.mk
deleted file mode 100644
index bdef0fd907b..00000000000
--- a/lang/gcc3/buildlink2.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/02/01 02:11:06 jlam Exp $
-
-# Do not directly include this file in package Makefiles. It is
-# automatically included when required based on USE_GCC3.
-
-.if !defined(GCC3_BUILDLINK2_MK)
-GCC3_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= gcc
-BUILDLINK_DEPENDS.gcc?= gcc3>=${GCC_REQD}
-BUILDLINK_PKGSRCDIR.gcc?= ../../lang/gcc3
-
-# Packages that link against gcc shared libraries need a full
-# dependency.
-#
-.if defined(USE_GCC_SHLIB)
-BUILDLINK_DEPMETHOD.gcc+= full
-.else
-BUILDLINK_DEPMETHOD.gcc?= build
-.endif
-
-BUILDLINK_PREFIX.gcc= ${LOCALBASE}
-BUILDLINK_WRAPPER_ENV+= \
- COMPILER_PATH="${BUILDLINK_DIR}/bin"; export COMPILER_PATH
-
-# These files are from gcc-3.3.
-BUILDLINK_FILES.gcc= ${_GCC_SUBPREFIX}include/c++/3.3/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}include/c++/3.3/*/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/*/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/include/*/*/*/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/lib*.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${_GCC_ARCHSUBDIR}/specs
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${MACHINE_GNU_PLATFORM}/include/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}${MACHINE_GNU_PLATFORM}/include/*/*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/lib-org-w3c-dom.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/lib-org-xml-sax.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libffi*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libfrtbegin.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libg2c.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libgcc_s.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libgcj.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libiberty.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libobjc.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libstdc++.*
-BUILDLINK_FILES.gcc+= ${_GCC_SUBPREFIX}lib/libsupc++.*
-
-BUILDLINK_TARGETS+= gcc-buildlink
-BUILDLINK_TARGETS+= libstdc++-buildlink-la
-
-gcc-buildlink: _BUILDLINK_USE
-
-libstdc++-buildlink-la:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- lafile="${BUILDLINK_DIR}/lib/libstdc++.la"; \
- libpattern="/usr/lib/libstdc++.*"; \
- ${BUILDLINK_FAKE_LA}
-
-.endif # GCC3_BUILDLINK2_MK
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
deleted file mode 100644
index 14e5540d311..00000000000
--- a/lang/gcc3/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.12 2003/07/26 17:37:04 martin Exp $
-
-SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
-Size (gcc-3.3.tar.bz2) = 23447616 bytes
-SHA1 (patch-aa) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
-SHA1 (patch-ab) = 8e899db69149894e737e1f68372f3eef9c403635
-SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
-SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
-SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk
deleted file mode 100644
index e8a20f4c3e1..00000000000
--- a/lang/gcc3/files/gcc3.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# $NetBSD: gcc3.mk,v 1.12 2004/01/21 10:17:56 abs Exp $
-#
-# make configuration file for @DISTNAME@
-
-USE_GCC3= yes
-CC= @GCC_PREFIX@/bin/gcc
-CPP= @GCC_PREFIX@/bin/cpp
-CXX= @GCC_PREFIX@/bin/g++
-F77= @GCC_PREFIX@/bin/g77
-PKG_FC= @GCC_PREFIX@/bin/g77
diff --git a/lang/gcc3/patches/patch-aa b/lang/gcc3/patches/patch-aa
deleted file mode 100644
index b8424c5f29d..00000000000
--- a/lang/gcc3/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/07/08 16:30:46 abs Exp $
-
---- gcc/unroll.c.orig 2003-03-25 20:23:07.000000000 +0000
-+++ gcc/unroll.c
-@@ -792,9 +792,9 @@ unroll_loop (loop, insn_count, strength_
- /* We must limit the generic test to max_reg_before_loop, because only
- these pseudo registers have valid regno_first_uid info. */
- for (r = FIRST_PSEUDO_REGISTER; r < max_reg_before_loop; ++r)
-- if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) <= max_uid_for_loop
-+ if (REGNO_FIRST_UID (r) > 0 && REGNO_FIRST_UID (r) < max_uid_for_loop
- && REGNO_FIRST_LUID (r) >= copy_start_luid
-- && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) <= max_uid_for_loop
-+ && REGNO_LAST_UID (r) > 0 && REGNO_LAST_UID (r) < max_uid_for_loop
- && REGNO_LAST_LUID (r) <= copy_end_luid)
- {
- /* However, we must also check for loop-carried dependencies.
diff --git a/lang/gcc3/patches/patch-ab b/lang/gcc3/patches/patch-ab
deleted file mode 100644
index c1cc573947a..00000000000
--- a/lang/gcc3/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/07/04 16:27:29 seb Exp $
-
---- gcc/Makefile.in.orig Tue Jan 28 16:54:07 2003
-+++ gcc/Makefile.in Sat May 24 13:01:38 2003
-@@ -1236,6 +1236,7 @@
- # Language-independent files.
-
- DRIVER_DEFINES = \
-+ -DLINK_LIBGCC_SPEC="\"%D $(RPATH_FLAG)$(GCC_PREFIX)/lib\"" \
- -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
- -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
- -DDEFAULT_TARGET_VERSION=\"$(version)\" \
diff --git a/lang/gcc3/patches/patch-ae b/lang/gcc3/patches/patch-ae
deleted file mode 100644
index fbb118a891e..00000000000
--- a/lang/gcc3/patches/patch-ae
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/07/02 19:51:43 drochner Exp $
-
---- gcc/config/t-netbsd.orig 2003-06-11 19:38:33.000000000 +0200
-+++ gcc/config/t-netbsd 2003-06-11 19:38:59.000000000 +0200
-@@ -3,3 +3,4 @@
-
- # Always build crtstuff with PIC.
- CRTSTUFF_T_CFLAGS = -fPIC
-+TARGET_LIBGCC2_CFLAGS += -fPIC
diff --git a/lang/gcc3/patches/patch-af b/lang/gcc3/patches/patch-af
deleted file mode 100644
index 62701518478..00000000000
--- a/lang/gcc3/patches/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/07/26 17:37:07 martin Exp $
-
---- gcc/cppspec.c Wed Jul 23 02:40:54 2003
-+++ gcc/cppspec.c Fri Jul 25 17:57:41 2003
-@@ -85,6 +85,13 @@
-
- is_cpp_driver = 1;
-
-+ /* NetBSD uses __GNUC__ and friends in header files processed with cpp
-+ regularly. Default to old behaviour here. XXX - move me to
-+ config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC". */
-+#ifdef DEFAULT_CPP_NEED_NO_GCC
-+ need_no_gcc = DEFAULT_CPP_NEED_NO_GCC;
-+#endif
-+
- /* First pass. If we see an -S or -c, barf. If we see an input file,
- turn off read_stdin. If we see a second input file, it is actually
- the output file. If we see a third input file, barf. */
diff --git a/lang/gcc3/patches/patch-ag b/lang/gcc3/patches/patch-ag
deleted file mode 100644
index 7a542dd0c9c..00000000000
--- a/lang/gcc3/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2003/07/26 17:37:08 martin Exp $
-
-Index: gcc/config/netbsd.h
---- gcc/config/netbsd.h Wed Jul 23 02:41:37 2003
-+++ gcc/config/netbsd.h Fri Jul 25 17:57:43 2003
-@@ -234,3 +234,7 @@
- /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
- (void) mprotect (page, end - page, 7); \
- }
-+
-+/* NetBSD depends on "cpp" having GNUC semantics, and must default as if
-+ "cpp -gcc" was called. */
-+#define DEFAULT_CPP_NEED_NO_GCC 0
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 22:07:39 +0000