Subject: Re: gcc3 patches
To: None <tech-pkg@netbsd.org>
From: Manuel Bouyer <bouyer@antioche.lip6.fr>
List: tech-pkg
Date: 02/23/2004 19:02:21
--ReaqsoxgOBHFXBhH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Mon, Feb 23, 2004 at 06:57:06PM +0100, Manuel Bouyer wrote:
> Hi,
> here are various patches against the current gcc3 packages and dependancy,
This time with the patch (thanks wiz)
> which do various things:
> - upgrade to gcc 3.3.3 (the most important, 3.3.2 can't build qt3-tools
> on solaris because of what looks like a codegen bug)
> - remove /usr/local/{include,lib} from the default search path, because this
> breaks a lot of things when LOCALBASE=/usr/local
> - handle non-empty ${GCC_VERSION} better (but in its current form breaks with
> an empty ${GCC_VERSION}).
>
> Comments ?
>
--
Manuel Bouyer <bouyer@antioche.eu.org>
NetBSD: 26 ans d'experience feront toujours la difference
--
--ReaqsoxgOBHFXBhH
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gcc3.diff"
Index: lang/gcc3/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- lang/gcc3/Makefile 14 Feb 2004 13:49:25 -0000 1.52
+++ lang/gcc3/Makefile 23 Feb 2004 17:51:57 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.52 2004/02/14 13:49:25 tron Exp $
-GCC_VERSION= 3.3.2
+GCC_VERSION= 3.3.3
DISTNAME= gcc3-${GCC_VERSION}
PKGREVISION= 2
CATEGORIES= lang
@@ -13,11 +13,11 @@
NOT_FOR_PLATFORM= Darwin-*-*
-DEPENDS+= gcc3-c-${GCC_VERSION}{,nb*}:../../lang/gcc3-c
-DEPENDS+= gcc3-c++-${GCC_VERSION}{,nb*}:../../lang/gcc3-c++
-DEPENDS+= gcc3-f77-${GCC_VERSION}{,nb*}:../../lang/gcc3-f77
-DEPENDS+= gcc3-java-${GCC_VERSION}{,nb*}:../../lang/gcc3-java
-DEPENDS+= gcc3-objc-${GCC_VERSION}{,nb*}:../../lang/gcc3-objc
+DEPENDS+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c-${GCC_VERSION}{,nb*}:../../lang/gcc3-c
+DEPENDS+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c++-${GCC_VERSION}{,nb*}:../../lang/gcc3-c++
+DEPENDS+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-f77-${GCC_VERSION}{,nb*}:../../lang/gcc3-f77
+DEPENDS+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-java-${GCC_VERSION}{,nb*}:../../lang/gcc3-java
+DEPENDS+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-objc-${GCC_VERSION}{,nb*}:../../lang/gcc3-objc
EXTRACT_ONLY= # empty
NO_CHECKSUM= yes
Index: lang/gcc3-c/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c/Makefile.common,v
retrieving revision 1.14
diff -u -r1.14 Makefile.common
--- lang/gcc3-c/Makefile.common 13 Feb 2004 15:13:01 -0000 1.14
+++ lang/gcc3-c/Makefile.common 23 Feb 2004 17:51:57 -0000
@@ -1,6 +1,6 @@
# $NetBSD: Makefile.common,v 1.14 2004/02/13 15:13:01 jlam Exp $
-GCC_VERSION= 3.3.2
+GCC_VERSION= 3.3.3
DISTNAME= gcc-${GCC_VERSION}
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
Index: lang/gcc3-c/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- lang/gcc3-c/distinfo 3 Dec 2003 11:28:55 -0000 1.6
+++ lang/gcc3-c/distinfo 23 Feb 2004 17:51:57 -0000
@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.6 2003/12/03 11:28:55 drochner Exp $
-SHA1 (gcc-3.3.2.tar.bz2) = 8750024a3e5a79d17a610d93cb5f171097e3ffee
-Size (gcc-3.3.2.tar.bz2) = 23585904 bytes
-SHA1 (patch-ab) = f0795e3792cd5200140bc19e291a2616b7d31468
+SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
+Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
+SHA1 (patch-ab) = ac8e59db276129f2e640fb045a707316a028f8b4
SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
-SHA1 (patch-ai) = bb9f4975769cd104b25b4609a1d4c888bb147bb1
+SHA1 (patch-ai) = 2f33d76746a48b34e8005428a94a746f4876ddc6
+SHA1 (patch-aj) = 1e995210580c646f1167c5f59c77aae9e51f3853
Index: lang/gcc3-c/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- lang/gcc3-c/patches/patch-ab 9 Jul 2003 15:14:43 -0000 1.3
+++ lang/gcc3-c/patches/patch-ab 23 Feb 2004 17:51:57 -0000
@@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.3 2003/07/09 15:14:43 drochner 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 @@
+--- gcc/Makefile.in.orig Thu Jan 29 05:42:13 2004
++++ gcc/Makefile.in Wed Feb 18 15:23:47 2004
+@@ -1280,6 +1280,7 @@
# Language-independent files.
DRIVER_DEFINES = \
@@ -10,3 +10,11 @@
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
-DDEFAULT_TARGET_VERSION=\"$(version)\" \
+@@ -2201,7 +2202,6 @@
+ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
+ -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
+- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
+ -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
+ -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ @TARGET_SYSTEM_ROOT_DEFINE@
Index: lang/gcc3-c/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c/patches/patch-ai,v
retrieving revision 1.1
diff -u -r1.1 patch-ai
--- lang/gcc3-c/patches/patch-ai 6 Jul 2003 12:15:08 -0000 1.1
+++ lang/gcc3-c/patches/patch-ai 23 Feb 2004 17:51:57 -0000
@@ -1,8 +1,8 @@
$NetBSD: patch-ai,v 1.1 2003/07/06 12:15:08 drochner Exp $
---- gcc/configure.orig 2003-07-04 12:51:47.000000000 +0200
-+++ gcc/configure 2003-07-04 12:52:44.000000000 +0200
-@@ -8559,7 +8559,7 @@
+--- gcc/configure.orig Tue Dec 2 02:56:14 2003
++++ gcc/configure Wed Feb 18 15:26:15 2004
+@@ -8352,7 +8352,7 @@
lang_specs_files=
lang_options_files=
lang_tree_files=
Index: lang/gcc3-c/patches/patch-aj
===================================================================
RCS file: lang/gcc3-c/patches/patch-aj
diff -N lang/gcc3-c/patches/patch-aj
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/gcc3-c/patches/patch-aj 23 Feb 2004 17:51:57 -0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ai,v 1.1 2003/07/06 12:15:08 drochner Exp $
+
+--- gcc/collect2.c.orig Wed Feb 4 16:26:53 2004
++++ gcc/collect2.c Wed Feb 4 16:27:24 2004
+@@ -2399,7 +2399,6 @@
+ /* built in directories are /lib, /usr/lib, and /usr/local/lib */
+ *pp++ = "/lib";
+ *pp++ = "/usr/lib";
+- *pp++ = "/usr/local/lib";
+ *pp = 0;
+ }
+ libname = name;
Index: lang/gcc3-c++/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c++/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- lang/gcc3-c++/distinfo 3 Dec 2003 11:28:55 -0000 1.6
+++ lang/gcc3-c++/distinfo 23 Feb 2004 17:51:57 -0000
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.6 2003/12/03 11:28:55 drochner Exp $
-SHA1 (gcc-3.3.2.tar.bz2) = 8750024a3e5a79d17a610d93cb5f171097e3ffee
-Size (gcc-3.3.2.tar.bz2) = 23585904 bytes
-SHA1 (patch-aa) = 93a4299e7d64b91f750ba96c75f0487cdf87abea
+SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
+Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
+SHA1 (patch-aa) = ef708652447946c4933d6b8950b7c0c8cbcc1116
SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
+SHA1 (patch-ah) = d7ea2e02daa0f84d9a6b07fd080345e8ec6e1b00
Index: lang/gcc3-c++/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-c++/patches/patch-aa,v
retrieving revision 1.2
diff -u -r1.2 patch-aa
--- lang/gcc3-c++/patches/patch-aa 8 Jul 2003 15:05:00 -0000 1.2
+++ lang/gcc3-c++/patches/patch-aa 23 Feb 2004 17:51:57 -0000
@@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.2 2003/07/08 15:05:00 drochner Exp $
---- Makefile.in.orig 2003-05-14 02:18:14.000000000 +0200
-+++ Makefile.in 2003-07-03 23:14:35.000000000 +0200
-@@ -1642,8 +1642,8 @@
+--- Makefile.in.orig Sat Jul 5 04:37:08 2003
++++ Makefile.in Wed Feb 18 19:33:47 2004
+@@ -1644,8 +1644,8 @@
install-dosrel-fake:
Index: lang/gcc3-c++/patches/patch-ah
===================================================================
RCS file: lang/gcc3-c++/patches/patch-ah
diff -N lang/gcc3-c++/patches/patch-ah
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lang/gcc3-c++/patches/patch-ah 23 Feb 2004 17:51:57 -0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.2 2003/07/08 15:05:00 drochner Exp $
+
+--- libstdc++-v3/Makefile.in.orig Wed Feb 11 14:20:20 2004
++++ libstdc++-v3/Makefile.in Wed Feb 11 14:20:31 2004
+@@ -234,7 +234,7 @@
+ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
+ cd $(srcdir) && $(ACLOCAL)
+
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++config.status:
+ $(SHELL) ./config.status --recheck
+ $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+ cd $(srcdir) && $(AUTOCONF)
Index: lang/gcc3-f77/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/lang/gcc3-f77/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- lang/gcc3-f77/distinfo 3 Dec 2003 11:28:55 -0000 1.5
+++ lang/gcc3-f77/distinfo 23 Feb 2004 17:51:57 -0000
@@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.5 2003/12/03 11:28:55 drochner Exp $
-SHA1 (gcc-3.3.2.tar.bz2) = 8750024a3e5a79d17a610d93cb5f171097e3ffee
-Size (gcc-3.3.2.tar.bz2) = 23585904 bytes
+SHA1 (gcc-3.3.3.tar.bz2) = a9efbc34c5dd7fc48f7d700461de4fc014968cab
+Size (gcc-3.3.3.tar.bz2) = 23279245 bytes
SHA1 (patch-aa) = 541cd543720cccc24aa60b9ac26cfa6143e7e5d4
Index: mk/compiler/gcc.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/compiler/gcc.mk,v
retrieving revision 1.55
diff -u -r1.55 gcc.mk
--- mk/compiler/gcc.mk 20 Feb 2004 07:18:19 -0000 1.55
+++ mk/compiler/gcc.mk 23 Feb 2004 17:51:58 -0000
@@ -10,7 +10,7 @@
# _GCC_DIST_VERSION is the highest version of GCC installed by the pkgsrc
# without the PKGREVISIONs.
#
-_GCC_DIST_VERSION= 3.3.2
+_GCC_DIST_VERSION= 3.3.3
# _GCC2_PATTERNS matches N s.t. N <= 2.95.3.
_GCC2_PATTERNS= [0-1].* 2.[0-9] 2.[0-9].* 2.[1-8][0-9] 2.[1-8][0-9].* \
@@ -139,14 +139,14 @@
#
# We require gcc-3.x in the lang/gcc3-* directories.
#
-_GCC_PKGBASE= gcc3-c
+_GCC_PKGBASE= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c
. if !empty(PKGPATH:Mlang/gcc3-c)
_IGNORE_GCC= yes
MAKEFLAGS+= _IGNORE_GCC=yes
. endif
. if !defined(_IGNORE_GCC) && !empty(_LANGUAGES.gcc:Mc)
_GCC_PKGSRCDIR= ../../lang/gcc3-c
-_GCC_DEPENDENCY= gcc3-c>=${_GCC_REQD}:../../lang/gcc3-c
+_GCC_DEPENDENCY= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c>=${_GCC_REQD}:../../lang/gcc3-c
. endif
.endif
_GCC_DEPENDS= ${_GCC_PKGBASE}>=${_GCC_REQD}
@@ -158,7 +158,7 @@
. endif
. if !defined(_IGNORE_GCC3CXX) && !empty(_LANGUAGES.gcc:Mc++)
_GCC_PKGSRCDIR+= ../../lang/gcc3-c++
-_GCC_DEPENDENCY+= gcc3-c++>=${_GCC_REQD}:../../lang/gcc3-c++
+_GCC_DEPENDENCY+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c++>=${_GCC_REQD}:../../lang/gcc3-c++
USE_GCC_SHLIB?= yes
. endif
. if !empty(PKGPATH:Mlang/gcc3-f77)
@@ -167,7 +167,7 @@
. endif
. if !defined(_IGNORE_GCC3F77) && !empty(_LANGUAGES.gcc:Mfortran)
_GCC_PKGSRCDIR+= ../../lang/gcc3-f77
-_GCC_DEPENDENCY+= gcc3-f77>=${_GCC_REQD}:../../lang/gcc3-f77
+_GCC_DEPENDENCY+= gcc3_${GCC3_INSTALLTO_SUBPREFIX}-f77>=${_GCC_REQD}:../../lang/gcc3-f77
USE_GCC_SHLIB?= yes
. endif
.endif
--ReaqsoxgOBHFXBhH--