--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi,
for now gcc.mk doesn't take care of GCC3_INSTALLTO_SUBPREFIX, which means that
if GCC3_INSTALLTO_SUBPREFIX is set in /etc/mk.conf some pakages (libtool-base
is the first one I ran into) won't build (GCC3_INSTALLTO_SUBPREFIX is set to
gcc-3.2.2 here):
===> Extracting for libtool-base-1.4.20010614nb19
===> Required package gcc3-c>=3.3.2: NOT found
===> Verifying reinstall for ../../lang/gcc3-c
===> *** No /local/metal1/chroot/local/metal1/pkgsrc/distfiles/pkg-vulnerabilities file found,
===> *** skipping vulnerability checks. To fix, install
===> *** the pkgsrc/security/audit-packages package and run
===> *** '/usr/local/sbin/download-vulnerability-list'.
===> Installing for gcc3_gcc-3.3.2-c-3.3.2
===> gcc3_gcc-3.3.2-c-3.3.2 is already installed - perhaps an older version?

The attached patch fixes this. Comments ?
Maybe this (which is also in Makefile.common and buildlink*.mk) should be
in a common place ...

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 26 ans d'experience feront toujours la difference
--

--J2SCkAp4GZ/dPZZf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="gcc.diff"

Index: gcc.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/compiler/gcc.mk,v
retrieving revision 1.37
diff -u -r1.37 gcc.mk
--- gcc.mk	2004/02/05 04:12:28	1.37
+++ gcc.mk	2004/02/05 18:48:31
@@ -124,7 +124,7 @@
 #
 # We require gcc-3.x in the lang/gcc3-* directories.
 #
-_GCC_PKGBASE=		gcc3-c
+_GCC_PKGBASE=		gcc3_${GCC3_INSTALLTO_SUBPREFIX}-c
 LANGUAGES.gcc=		c c++ fortran java objc
 _LANGUAGES.gcc=		# empty
 .    for _lang_ in ${USE_LANGUAGES}
@@ -136,7 +136,7 @@
 .    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}
@@ -148,7 +148,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)
@@ -157,7 +157,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

--J2SCkAp4GZ/dPZZf--