USE_GCC patch

[Matthias Andree]

Kris Kennaway <kris at obsecurity.org> writes:

> Sorry for the delay in getting this in, but this is the patch I'd like
> to commit in the next day or so.  I've bumped up all of the
> USE_GCC=3.3 to 3.4 except where that causes problems.  It's pretty
> straightforward, but please let me know ASAP if you see any problems.

> Index: sysutils/e2fsprogs/Makefile
> ===================================================================
> RCS file: /home/pcvs/ports/sysutils/e2fsprogs/Makefile,v
> retrieving revision 1.20
> diff -u -r1.20 Makefile
> --- sysutils/e2fsprogs/Makefile	26 Mar 2004 08:43:20 -0000	1.20
> +++ sysutils/e2fsprogs/Makefile	20 Aug 2004 06:42:37 -0000
> @@ -19,7 +19,7 @@
>  USE_GETTEXT=	yes
>  .endif
>  
> -USE_GCC=	3.3
> +USE_GCC=	3.4
>  PATCH_STRIP=	-p1
>  USE_AUTOCONF_VER=	213

I've let this port set USE_GCC=3.3 to work around a bogus compile
failure in FreeBSD 4.8's GCC because I had just wanted to get that
stoopid port fixed, but never got around to analyzing the bug.

4.10-RELEASE-p3 is fine with the "onboard" GCC 2.95, we might make this
USE_GCC conditional on ${OSVERSION} < 491000 - and that's just because I
don't have 4.8 around to test.

How about this instead?

--- a/sysutils/e2fsprogs/Makefile	Fri Mar 26 09:43:20 2004
+++ b/sysutils/e2fsprogs/Makefile	Tue Sep 28 19:49:31 2004
@@ -19,7 +19,6 @@
 USE_GETTEXT=	yes
 .endif
 
-USE_GCC=	3.3
 PATCH_STRIP=	-p1
 USE_AUTOCONF_VER=	213
 USE_REINPLACE=	yes
@@ -66,6 +65,10 @@
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 491000
+USE_GCC=	3.4
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|-DRESOURCE_TRACK||' ${WRKSRC}/e2fsck/Makefile.in


-- 
Matthias Andree

Encrypted mail welcome: my GnuPG key ID is 0x052E7D95 (PGP/MIME preferred)