From owner-freebsd-ports Thu Sep 30 0:34:32 1999 Delivered-To: freebsd-ports@freebsd.org Received: from shale.csir.co.za (shale.csir.co.za [146.64.46.5]) by hub.freebsd.org (Postfix) with ESMTP id 7DC7814CE2 for ; Thu, 30 Sep 1999 00:34:23 -0700 (PDT) (envelope-from reg@shale.csir.co.za) Received: from granite.hip.berkeley.edu (granite.hip.berkeley.edu [136.152.155.25]) by shale.csir.co.za (8.9.3/8.9.3) with ESMTP id JAA20826; Thu, 30 Sep 1999 09:34:14 +0200 (SAT) (envelope-from reg@shale.csir.co.za) Received: (from reg@localhost) by granite.hip.berkeley.edu (8.9.3/8.9.3) id AAA59674; Thu, 30 Sep 1999 00:32:41 -0700 (PDT) (envelope-from reg) Date: Thu, 30 Sep 1999 00:32:41 -0700 From: Jeremy Lea To: Bill Fenner Cc: ports@FreeBSD.ORG Subject: Re: Bad interaction between libtool version check and patches Message-ID: <19990930003241.E35653@shale.csir.co.za> References: <199909272040.NAA69605@mango.attlabs.att.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0pre3i In-Reply-To: <199909272040.NAA69605@mango.attlabs.att.com> Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi, On Mon, Sep 27, 1999 at 01:40:34PM -0700, Bill Fenner wrote: > It'd be nice if failing the libtool version check didn't leave the > port in an inconsistent state; now I have to go down 2 levels of > dependencies (or scroll back past 50 lines of "Exit 1") and make clean. > I don't have any brilliant suggestions, other than splitting the > patch-libtool target into pre-patch-libtool which checks the version > and post-patch-libtool which does whatever else. Does this fix your problem? Index: bsd.port.mk =================================================================== RCS file: /usr/home/ncvs/ports/Mk/bsd.port.mk,v retrieving revision 1.320 diff -u -r1.320 bsd.port.mk --- bsd.port.mk 1999/09/22 01:04:30 1.320 +++ bsd.port.mk 1999/09/30 07:30:21 @@ -1919,6 +2089,7 @@ @(if ${LIBTOOL} --version | grep -vq "1\.3\.3-freebsd-ports"; then \ (echo "Your libtool installation is out of date. Please remove"; \ echo "and reinstall ${PORTSDIR}/devel/libtool."; \ + ${MAKE} NOCLEANDEPENDS=yes clean; \ exit 1); \ fi; \ LIBTOOLDIR=`which ${LIBTOOL} | sed -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \ Regards, -Jeremy -- | "Come home my prodigal son, come home and lets be one, --+-- don't want to see you cry, don't make me tell you why, | you've lived in a house with me, my blood has set you free, | in the world you'll surely die, nothing else will satisfy." -MIC To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message