From owner-freebsd-current Thu Mar 28 11:26:41 2002 Delivered-To: freebsd-current@freebsd.org Received: from dragon.nuxi.com (trang.nuxi.com [66.92.13.169]) by hub.freebsd.org (Postfix) with ESMTP id 5509837B419; Thu, 28 Mar 2002 11:26:35 -0800 (PST) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by dragon.nuxi.com (8.12.2/8.12.2) with ESMTP id g2SJQYYm093374; Thu, 28 Mar 2002 11:26:34 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.2/8.12.2/Submit) id g2SJPIbD093373; Thu, 28 Mar 2002 11:25:18 -0800 (PST) Date: Thu, 28 Mar 2002 11:25:17 -0800 From: "David O'Brien" To: Kris Kennaway 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> Reply-To: obrien@FreeBSD.ORG References: <2085.62.179.190.82.1017303516.squirrel@webmail.debolaz.com> <20020328222925.H7619-100000@gamplex.bde.org> <20020328034942.A99289@xor.obsecurity.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <20020328034942.A99289@xor.obsecurity.org>; from kris@obsecurity.org on Thu, Mar 28, 2002 at 03:49:42AM -0800 X-Operating-System: FreeBSD 5.0-CURRENT Organization: The NUXI BSD group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG 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