From 8a21c8a0f38b73daaf2edc8c7e10e988e5ae092f Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 14 Feb 1998 04:18:25 +0000 Subject: Upgrade to 1998-02-05 SNAP. Fixes problems several have had with 1.0.1. Including linking with the STL vector class. --- lang/gcc-ooo/Makefile | 32 +++++++++++++++++++------------- lang/gcc-ooo/distinfo | 2 +- lang/gcc-ooo/files/patch-ad | 19 +++++++------------ lang/gcc-ooo/files/patch-af | 21 +++++++++++++++++++++ 4 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 lang/gcc-ooo/files/patch-af (limited to 'lang/gcc-ooo') diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index 45c2a77..b8860aa 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: egcs -# Version required: 1.0.1 +# Version required: 1998-02-05 # Date created: 9 Jan 1998 # Whom: John Polstra # -# $Id: Makefile,v 1.4 1998/01/23 17:49:35 jdp Exp $ +# $Id: Makefile,v 1.5 1998/02/03 07:48:35 asami Exp $ # -DISTNAME= egcs-1.0.1 +DISTNAME= egcs-980205 CATEGORIES= lang -MASTER_SITES= ftp://ftp.cygnus.com/pub/egcs/releases/egcs-1.0.1/ \ - ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.0.1/ \ - ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.0.1/ +MASTER_SITES= ftp://ftp.cygnus.com/pub/egcs/snapshots/1998-02-05/ \ + ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-02-05/ \ + ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-02-05/ MAINTAINER= jdp@polstra.com @@ -21,16 +21,22 @@ USE_GMAKE= yes CONFIGURE_ARGS= --with-gnu-as --with-gnu-ld i386-unknown-freebsd MAN1= cccp.1 g++.1 g77.1 gcc.1 -FME=${PREFIX} +post-patch: + @(cd ${WRKSRC}/gcc/config/i386/ ; \ + MAJ=`sysctl -n kern.osreldate | sed -e '/.....$$/s///'` ; \ + mv freebsd.h freebsd.h.in ; \ + sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h ; \ + mv freebsd-elf.h freebsd-elf.h.in ; \ + sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd-elf.h.in >freebsd-elf.h) post-install: @(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/c++ \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1 \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1obj \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1plus \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cpp \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/f771 \ - ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/ld ; \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1 \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1obj \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1plus \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cpp \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/f771 \ + ${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/ld ; \ do strip $$prog ; \ done) if [ ! -f ${PREFIX}/info/dir ]; then \ diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo index 0546423..0d54ed3 100644 --- a/lang/gcc-ooo/distinfo +++ b/lang/gcc-ooo/distinfo @@ -1 +1 @@ -MD5 (egcs-1.0.1.tar.gz) = 3bdeb3a5835753aa53725002d8939606 +MD5 (egcs-980205.tar.gz) = 2dff4b0ab51a94721828f9e20d101e0b diff --git a/lang/gcc-ooo/files/patch-ad b/lang/gcc-ooo/files/patch-ad index aae7be9..cb56621 100644 --- a/lang/gcc-ooo/files/patch-ad +++ b/lang/gcc-ooo/files/patch-ad @@ -1,17 +1,12 @@ ---- gcc/config/i386/freebsd.h.orig Fri Oct 17 23:52:58 1997 -+++ gcc/config/i386/freebsd.h Thu Jan 22 21:50:29 1998 -@@ -35,10 +35,13 @@ - #include "i386/perform.h" - - #undef CPP_PREDEFINES --#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" -+#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=2 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" - +--- gcc/config/i386/freebsd.h.orig Fri Feb 13 10:52:24 1998 ++++ gcc/config/i386/freebsd.h Fri Feb 13 11:03:27 1998 +@@ -40,6 +40,9 @@ /* Like the default, except no -lg. */ - #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" -+ + #define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}" + +#undef CC1PLUS_SPEC +#define CC1PLUS_SPEC "-fsjlj-exceptions" - ++ #undef SIZE_TYPE #define SIZE_TYPE "unsigned int" + diff --git a/lang/gcc-ooo/files/patch-af b/lang/gcc-ooo/files/patch-af new file mode 100644 index 0000000..d838cff --- /dev/null +++ b/lang/gcc-ooo/files/patch-af @@ -0,0 +1,21 @@ +--- gcc/config/i386/freebsd-elf.h.orig Sat Dec 6 09:25:14 1997 ++++ gcc/config/i386/freebsd-elf.h Fri Feb 13 11:43:46 1998 +@@ -127,6 +127,9 @@ + } \ + } + ++#undef CC1PLUS_SPEC ++#define CC1PLUS_SPEC "-fsjlj-exceptions" ++ + #undef SIZE_TYPE + #define SIZE_TYPE "unsigned int" + +@@ -140,7 +143,7 @@ + #define WCHAR_TYPE_SIZE BITS_PER_WORD + + #undef CPP_PREDEFINES +-#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__=2 -Asystem(FreeBSD)" ++#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__ -Asystem(FreeBSD)" + + #undef CPP_SPEC + #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -- cgit v1.1