Date: Thu, 28 Mar 2002 11:25:17 -0800 From: "David O'Brien" <obrien@FreeBSD.ORG> To: Kris Kennaway <kris@obsecurity.org> Cc: current@FreeBSD.ORG, re@FreeBSD.ORG Subject: Re: linux_base-7 installation breaks with zlib 1.1.4 Message-ID: <20020328112517.A92633@dragon.nuxi.com> In-Reply-To: <20020328034942.A99289@xor.obsecurity.org>; from kris@obsecurity.org on Thu, Mar 28, 2002 at 03:49:42AM -0800 References: <2085.62.179.190.82.1017303516.squirrel@webmail.debolaz.com> <20020328222925.H7619-100000@gamplex.bde.org> <20020328034942.A99289@xor.obsecurity.org>
index | next in thread | previous in thread | raw e-mail
On Thu, Mar 28, 2002 at 03:49:42AM -0800, Kris Kennaway wrote:
> > I use the following quick fix for the corresponding core dump in man and zgrep.
>
> I'd like to see this committed and merged to the DP1 tree ASAP so my
> packages stop dumping core and we can produce a DP1 snapshot that
> includes linux compatibility.
Just depend on gcc30 or gcc31 to build those ports.
Below is my local patch for doing this. You'd want to remove the
hardcoding of USE_GCC?=3.1, and add back in 3.0 support (based on the 3.1
bits).
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.403
diff -u -r1.403 bsd.port.mk
--- bsd.port.mk 25 Mar 2002 08:48:47 -0000 1.403
+++ bsd.port.mk 25 Mar 2002 20:12:32 -0000
@@ -141,9 +141,7 @@
# compression.
# USE_ZIP - Says that the port distfile uses zip, not tar w/[bg]zip
# for compression.
-# USE_GCC295 - Says that the port requires this version of gcc, either in
-# the system or installed from a port.
-# USE_GCC30 - Says that the port requires this version of gcc, either in
+# USE_GCC - Says that the port requires this version of gcc, either in
# the system or installed from a port.
# USE_GMAKE - Says that the port uses gmake.
# GMAKE - Set to path of GNU make if not in $PATH (default: gmake).
@@ -909,16 +907,18 @@
.endif
LIBTOOLFLAGS?= --disable-ltlibs
.endif
-.if defined(USE_GCC295) && ${OSVERSION} < 400012
+.if defined(USE_GCC) && ${USE_GCC} == 2.95 && ${OSVERSION} < 400012
CC= gcc295
CXX= g++295
BUILD_DEPENDS+= gcc295:${PORTSDIR}/lang/gcc295
MAKE_ENV+= CC=${CC} CXX=${CXX}
+.else
+USE_GCC?= 3.1
.endif
-.if defined(USE_GCC30) && ${OSVERSION} < 500999
-CC= gcc30
-CXX= g++30
-BUILD_DEPENDS+= gcc30:${PORTSDIR}/lang/gcc30
+.if defined(USE_GCC) && ${USE_GCC} == 3.1 && ${OSVERSION} < 500999
+CC= gcc31
+CXX= g++31
+BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31
MAKE_ENV+= CC=${CC} CXX=${CXX}
.endif
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020328112517.A92633>