From e78d94cdc79962f06dfd91f1de0b02199c0233ef Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Mon, 9 Sep 2002 03:23:06 +0000 Subject: - pull in the last bit of changes to sync this up with the netbsd-1-6-RELEASE gcc. - enable building shared libstdc++ - add a -R to LDFLAGS in Makefile.gcc to point to the shared libs this pkg installs --- lang/gcc/Makefile | 4 ++-- lang/gcc/Makefile.gcc | 4 +++- lang/gcc/PLIST.SunOS | 6 +++--- lang/gcc/distinfo | 8 +++++--- lang/gcc/files/UPDATE.txt | 13 ++++++++----- lang/gcc/patches/patch-ab | 15 +++++++++++++++ lang/gcc/patches/patch-ac | 13 +++++++++++++ 7 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 lang/gcc/patches/patch-ab create mode 100644 lang/gcc/patches/patch-ac (limited to 'lang/gcc') diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index deec630490b..09000436678 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2002/08/12 01:53:34 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.45 2002/09/09 03:23:06 dmcmahill Exp $ # Make sure that the version number in "Makefile.gcc" matches this. DISTNAME= gcc-2.95.3 @@ -14,7 +14,7 @@ HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html COMMENT= GNU Compiler Collection PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCHFILES= gcc-2.95.3-diff-2002-08-11.gz +PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison diff --git a/lang/gcc/Makefile.gcc b/lang/gcc/Makefile.gcc index 859cf53c74b..8fa15c14d50 100644 --- a/lang/gcc/Makefile.gcc +++ b/lang/gcc/Makefile.gcc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gcc,v 1.4 2002/05/25 18:45:54 dmcmahill Exp $ +# $NetBSD: Makefile.gcc,v 1.5 2002/09/09 03:23:06 dmcmahill Exp $ .include "../../mk/bsd.prefs.mk" @@ -13,11 +13,13 @@ CPP= ${LOCALBASE}/bin/cpp CXX= ${LOCALBASE}/bin/g++ F77= ${LOCALBASE}/bin/g77 PKG_FC= ${LOCALBASE}/bin/g77 +LDFLAGS+= -R${LOCALBASE}/lib .else CC= ${LOCALBASE}/gcc-2.95.3/bin/cc CPP= ${LOCALBASE}/gcc-2.95.3/bin/cpp CXX= ${LOCALBASE}/gcc-2.95.3/bin/c++ F77= ${LOCALBASE}/gcc-2.95.3/bin/g77 PKG_FC= ${LOCALBASE}/gcc-2.95.3/bin/g77 +LDFLAGS+= -R${LOCALBASE}/gcc-2.95.3/lib .endif .endif diff --git a/lang/gcc/PLIST.SunOS b/lang/gcc/PLIST.SunOS index 198a1964052..74712faa8f3 100644 --- a/lang/gcc/PLIST.SunOS +++ b/lang/gcc/PLIST.SunOS @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.SunOS,v 1.4 2002/08/19 18:20:08 seb Exp $ +@comment $NetBSD: PLIST.SunOS,v 1.5 2002/09/09 03:23:06 dmcmahill Exp $ ${MACHINE_GNU_PLATFORM}/include/_G_config.h ${MACHINE_GNU_PLATFORM}/include/assert.h bin/${MACHINE_GNU_PLATFORM}-gcc @@ -294,8 +294,8 @@ lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.a lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/libstdc++.so lib/gcc-lib/${MACHINE_GNU_PLATFORM}/${GCC_VERSION}/specs lib/libiberty.a -lib/libstdc++.a.2.10.0 -lib/libstdc++.so.2.10.0 +lib/libstdc++.a.2.10.0nb1 +lib/libstdc++.so.2.10.0nb1 man/man1/cccp.1 man/man1/g++.1 man/man1/g77.1 diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index e320cdcc3b7..f41620c936d 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.12 2002/08/12 01:53:35 dmcmahill Exp $ +$NetBSD: distinfo,v 1.13 2002/09/09 03:23:06 dmcmahill Exp $ SHA1 (gcc-2.95.3.tar.gz) = 535d27038d161c0e7c2662702e11a48aa97ef622 Size (gcc-2.95.3.tar.gz) = 12911721 bytes -SHA1 (gcc-2.95.3-diff-2002-08-11.gz) = 0d587df7cf552f1ae92131e6e0e5b37d543f2b05 -Size (gcc-2.95.3-diff-2002-08-11.gz) = 80435 bytes +SHA1 (gcc-2.95.3-diff-2002-08-29.gz) = 9e54a31e78070cba3f6840275350bd0cbf20fe84 +Size (gcc-2.95.3-diff-2002-08-29.gz) = 564720 bytes SHA1 (patch-aa) = 1f6daca7e6abe4c29987f1360d2c77e4c344b6d1 +SHA1 (patch-ab) = b0ed66562798ae52736bf50bfaeec894cda5e810 +SHA1 (patch-ac) = f42b5ab389c3a51991e61cdb7533875003308001 diff --git a/lang/gcc/files/UPDATE.txt b/lang/gcc/files/UPDATE.txt index e35764abc9b..98c3e9e2fe8 100644 --- a/lang/gcc/files/UPDATE.txt +++ b/lang/gcc/files/UPDATE.txt @@ -1,4 +1,4 @@ -# $NetBSD: UPDATE.txt,v 1.1 2002/08/12 01:53:37 dmcmahill Exp $ +# $NetBSD: UPDATE.txt,v 1.2 2002/09/09 03:23:07 dmcmahill Exp $ This file documents the steps taken to update this package. @@ -6,9 +6,11 @@ This file documents the steps taken to update this package. make clean && make extract -=) Copy to .orig directory +=) Copy to .orig directory excluding CVS directories + mkdir -p /some/tmp/dir/gcc-2.95.3.orig - mv work/gcc-2.95.3 /some/tmp/dir/gcc-2.95.3.orig/gcc + cd work/gcc-2.95.3 + tar --exclude CVS -cvf - gcc include lib{f2c,iberty,io,stdc++} texinfo | ( cd /some/tmp/dir/gcc-2.95.3.orig ; tar -xf - ) =) Update in-tree gcc sources @@ -17,12 +19,13 @@ This file documents the steps taken to update this package. =) Copy over the new sources excluding CVS directories mkdir /some/tmp/dir/gcc-2.95.3 - tar --exclude CVS -cvf - gcc | ( cd /some/tmp/dir/gcc-2.95.3 ; tar -xf - ) + cd /usr/src/gnu/dist/toolchain + tar --exclude CVS -cvf - gcc include lib{f2c,iberty,io,stdc++} texinfo | ( cd /some/tmp/dir/gcc-2.95.3 ; tar -xf - ) =) Create patch file mkdir /some/tmp/dir/foo - cd /some/tmp/dir/foo && diff -u2 -r -N ../gcc-2.95.3.orig/gcc ../gcc-2.95.3/gcc > gcc-2.95.3-diff-`date '+%Y-%m-%d'` + cd /some/tmp/dir/foo && diff -u2 -r -N ../gcc-2.95.3.orig ../gcc-2.95.3 > gcc-2.95.3-diff-`date '+%Y-%m-%d'` gzip gcc-2.95.3-diff-`date '+%Y-%m-%d'` =) copy the patch file to your distfiles directory, and 'make makesum'. Now proceed with diff --git a/lang/gcc/patches/patch-ab b/lang/gcc/patches/patch-ab new file mode 100644 index 00000000000..0872804c9cb --- /dev/null +++ b/lang/gcc/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.6 2002/09/09 03:23:07 dmcmahill Exp $ + +Enable building the shared libstdc++ + +--- ../gcc-2.95.3/libstdc++/Makefile.in.orig Thu Aug 29 18:57:24 2002 ++++ ../gcc-2.95.3/libstdc++/Makefile.in +@@ -43,7 +43,7 @@ SHDEPS = + + STAMP = bigstmp + +-LIBS = $(ARLIB) $(ARLINK) ++LIBS = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) + + #### package, host, target, and site dependent Makefile fragments come in here. + ## diff --git a/lang/gcc/patches/patch-ac b/lang/gcc/patches/patch-ac new file mode 100644 index 00000000000..4fa07f77d20 --- /dev/null +++ b/lang/gcc/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.5 2002/09/09 03:23:07 dmcmahill Exp $ + +--- ../gcc-2.95.3/libiberty/Makefile.in.orig Thu Aug 29 20:05:50 2002 ++++ ../gcc-2.95.3/libiberty/Makefile.in +@@ -57,7 +57,7 @@ CFLAGS = @CFLAGS@ + LIBCFLAGS = $(CFLAGS) + RANLIB = @RANLIB@ + +-PICFLAG = ++PICFLAG = -fPIC -DPIC + + MAKEOVERRIDES = + -- cgit v1.2.3