From owner-freebsd-current@FreeBSD.ORG Thu Nov 20 20:13:50 2008 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4EFC106564A for ; Thu, 20 Nov 2008 20:13:50 +0000 (UTC) (envelope-from zozo@q.gid0.org) Received: from smtp3-g19.free.fr (smtp3-g19.free.fr [212.27.42.29]) by mx1.freebsd.org (Postfix) with ESMTP id 3729A8FC16 for ; Thu, 20 Nov 2008 20:13:49 +0000 (UTC) (envelope-from zozo@q.gid0.org) Received: from smtp3-g19.free.fr (localhost.localdomain [127.0.0.1]) by smtp3-g19.free.fr (Postfix) with ESMTP id 02F2217C811; Thu, 20 Nov 2008 21:13:48 +0100 (CET) Received: from q.gid0.org (s.gid0.org [88.163.116.140]) by smtp3-g19.free.fr (Postfix) with ESMTP id 84FC617C8E1; Thu, 20 Nov 2008 21:13:41 +0100 (CET) Received: (from zozo@localhost) by q.gid0.org (8.14.3/8.14.3/Submit) id mAKKDbFG077333; Thu, 20 Nov 2008 21:13:37 +0100 (CET) (envelope-from zozo) Date: Thu, 20 Nov 2008 21:13:37 +0100 From: Olivier SMEDTS To: Pegasus Mc Cleaft Message-ID: <20081120201336.GA66837@q.gid0.org> References: <367b2c980811201038s7d2ae03bnf36a6630f36bc188@mail.gmail.com> <367b2c980811201057y4e44e0ehb227d37702d98c43@mail.gmail.com> <200811201949.06286.ken@mthelicon.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="9jxsPFA5p3P2qPhR" Content-Disposition: inline In-Reply-To: <200811201949.06286.ken@mthelicon.com> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: hackers@freebsd.org, current@freebsd.org, Pascal Hofstee Subject: Re: build problems with gptzfsboot (AMD64) 8.0-CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Nov 2008 20:13:50 -0000 --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Nov 20, 2008 at 07:49:06PM +0000, Pegasus Mc Cleaft wrote: > On Thursday 20 November 2008 18:57:53 Olivier SMEDTS wrote: > > What is your MACHINE_ARCH ? > > Mine is amd64, I think there's a problem with the conditional in > > sys/boot/i386/gptzfsboot/Makefile. > > ld doesn't need gptzfsboot.o on i386. Now I think I've got it : All the '.if ${MACHINE_ARCH} == "amd64"' which replace the amd64 machine link with an i386 one are useless on 7.0 and -CURRENT since rev. 1.17 of sys/boot/efi/libefi/Makefile. This file already takes care of replacing MACHINE_ARCH. And I don't think zfs*boot will be in 6-STABLE. You can apply the following patch in sys/boot/i386. I'll submit a PR if it's not committed before. Cheers, Olivier > > > > Olivier > > > > 2008/11/20 Olivier SMEDTS : > > > 2008/11/20 Pascal Hofstee : > > >> On Thu, 20 Nov 2008 01:46:31 -0000 > > >> > > >> "Pegasus Mc Cleaft" wrote: > > >>> Hi everyone, > > >>> > > >>> I am having difficulties rebuilding the world after some patches > > >>> were made today. I was wondering if anyone else is experiencing the > > >>> same troubles? > > > > Hi Oliver, > My machine is an Core2 Quad running under AMD64. (CPUTYPE?=core2) > > Thanks for replying. It puts my mind to ease because I was thinking it was a > problem I created (I recently moved the /usr/src directory into a seperate zfs > filing system) > > Peg -- Olivier Smedts _ ASCII ribbon campaign ( ) e-mail: olivier@gid0.org - against HTML email & vCards X www: http://www.gid0.org - against proprietary attachments / \ "Il y a seulement 10 sortes de gens dans le monde : ceux qui comprennent le binaire, et ceux qui ne le comprennent pas." --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename=patch --- boot2/Makefile.orig 2008-11-20 20:56:31.000000000 +0100 +++ boot2/Makefile 2008-11-20 20:56:42.000000000 +0100 @@ -94,11 +94,4 @@ ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" -beforedepend boot2.s: machine -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include --- gptboot/Makefile.orig 2008-11-20 20:50:34.000000000 +0100 +++ gptboot/Makefile 2008-11-20 20:50:40.000000000 +0100 @@ -67,11 +67,4 @@ gptboot.o: ${.CURDIR}/../../common/ufsread.c -.if ${MACHINE_ARCH} == "amd64" -beforedepend gptboot.o: machine -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include --- libfirewire/Makefile.orig 2008-11-20 20:56:07.000000000 +0100 +++ libfirewire/Makefile 2008-11-20 20:56:18.000000000 +0100 @@ -16,15 +16,4 @@ CFLAGS+= -Wformat -Wall -.if ${MACHINE_ARCH} == "amd64" -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include - -.if ${MACHINE_ARCH} == "amd64" -beforedepend ${OBJS}: machine -.endif - --- libi386/Makefile.orig 2008-11-20 20:55:38.000000000 +0100 +++ libi386/Makefile 2008-11-20 20:55:55.000000000 +0100 @@ -45,14 +45,4 @@ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -.if ${MACHINE_ARCH} == "amd64" -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include - -.if ${MACHINE_ARCH} == "amd64" -beforedepend ${OBJS}: machine -.endif --- loader/Makefile.orig 2008-11-20 20:54:43.000000000 +0100 +++ loader/Makefile 2008-11-20 20:54:58.000000000 +0100 @@ -110,10 +110,3 @@ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand .include - -.if ${MACHINE_ARCH} == "amd64" -beforedepend ${OBJS}: machine -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif --- zfsboot/Makefile.orig 2008-11-20 20:54:18.000000000 +0100 +++ zfsboot/Makefile 2008-11-20 20:54:27.000000000 +0100 @@ -98,11 +98,4 @@ ORG1=`printf "%d" ${ORG1}` \ REL1=`printf "%d" ${REL1}` > ${.TARGET} -.if ${MACHINE_ARCH} == "amd64" -beforedepend zfsboot.s: machine -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include --- gptzfsboot/Makefile.orig 2008-11-20 19:58:45.000000000 +0100 +++ gptzfsboot/Makefile 2008-11-20 20:50:25.000000000 +0100 @@ -64,11 +64,4 @@ zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c -.if ${MACHINE_ARCH} == "amd64" -beforedepend gptzfsboot.o: machine -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include --9jxsPFA5p3P2qPhR--