From owner-cvs-all@FreeBSD.ORG Sat Mar 20 11:53:13 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7C0AE16A4CE; Sat, 20 Mar 2004 11:53:13 -0800 (PST) Received: from TRANG.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3FC3443D2D; Sat, 20 Mar 2004 11:53:13 -0800 (PST) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by TRANG.nuxi.com (8.12.11/8.12.10) with ESMTP id i2KJrCMd089545; Sat, 20 Mar 2004 11:53:12 -0800 (PST) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.12.11/8.12.11/Submit) id i2KJrBh0089544; Sat, 20 Mar 2004 11:53:11 -0800 (PST) (envelope-from obrien) Date: Sat, 20 Mar 2004 11:53:11 -0800 From: "David O'Brien" To: Gerald Pfeifer Message-ID: <20040320195311.GB89343@dragon.nuxi.com> References: <200403170818.i2H8IFYU008824@repoman.freebsd.org> <20040317112344.GB86662@dragon.nuxi.com> <20040317182432.GA96023@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 5.2-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 cc: cvs-ports@FreeBSD.org cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/lang/gcc34 Makefile X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@FreeBSD.org List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2004 19:53:13 -0000 On Fri, Mar 19, 2004 at 02:13:50AM +0100, Gerald Pfeifer wrote: > On Wed, 17 Mar 2004, David O'Brien wrote: > >>> Have you tested this following the instructions at > >>> http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/porting-testing.html > >> I *DID* test on i386 (5.2-CURRENT, full 'make world' just before testing > >> the port). > > I just re-tested on FreeBSD/i386: > > > > kieu(r):/usr/ports/lang/gcc34> /usr/bin/time -h make package > > ... > > Creating bzip'd tar ball in '/usr/ports/lang/gcc34/gcc-3.4.0_20040310.tbz' > > 49m57.11s real 16m21.78s user 7m13.72s sys > > kieu(r):/usr/ports/lang/gcc34> ll gcc-3.4.0_20040310.tbz > > -rw-r--r-- 1 root ncvs 13.0M Mar 17 09:48 gcc-3.4.0_20040310.tbz > > Well, this is just one part of the testing required for port updates. > > If you follow the instructions in the Porters' Handbook, you'll note > that `make deinstall` got broken, as I just verified on beast > > rmdir: /j/gerald/lib/gcc/alpha-portbld-freebsd5.2: Directory not empty > rmdir: /j/gerald/lib/gcc: Directory not empty Actually this is a bug in your pkg-plist. I just tested this with your latest commits (Makefile rev 1.166, pkg-plist rev 1.55). This patch (which I just committed) makes the existing breakage obvious: @dirrm libexec/gcc/%%GNU_HOST%%/%%GCC_VER%% +@dirrm libexec/gcc/%%GNU_HOST%% +@dirrm libexec/gcc %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar I suggest we use the mechanism I used for lib/gcc/. That would have prevented this pkg-plist bug. If you look at ports/Mk/bsd.port.mk, you'll see that CONFIGURE_TARGET is defined as ${MACHINE_ARCH}-portbld-freebsd${OSREL}, which is effectively the same as the definition I removed and you re-added. Can we agree to this patch now? .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} -.else -CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} .endif -- -- David