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 <olivier_at_gid0.org>: > > > 2008/11/20 Pascal Hofstee <caelian_at_gmail.com>: > > >> On Thu, 20 Nov 2008 01:46:31 -0000 > > >> > > >> "Pegasus Mc Cleaft" <ken_at_mthelicon.com> 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? > > <SNIP> > > 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_at_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." --- boot2/Makefile.orig 2008-11-20 20:56:31.000000000 +0100 +++ boot2/Makefile 2008-11-20 20:56:42.000000000 +0100 _at__at_ -94,11 +94,4 _at__at_ 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 <bsd.prog.mk> --- gptboot/Makefile.orig 2008-11-20 20:50:34.000000000 +0100 +++ gptboot/Makefile 2008-11-20 20:50:40.000000000 +0100 _at__at_ -67,11 +67,4 _at__at_ 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 <bsd.prog.mk> --- libfirewire/Makefile.orig 2008-11-20 20:56:07.000000000 +0100 +++ libfirewire/Makefile 2008-11-20 20:56:18.000000000 +0100 _at__at_ -16,15 +16,4 _at__at_ CFLAGS+= -Wformat -Wall -.if ${MACHINE_ARCH} == "amd64" -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include <bsd.lib.mk> - -.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 _at__at_ -45,14 +45,4 _at__at_ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -.if ${MACHINE_ARCH} == "amd64" -CLEANFILES+= machine -machine: - ln -sf ${.CURDIR}/../../../i386/include machine -.endif - .include <bsd.lib.mk> - -.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 _at__at_ -110,10 +110,3 _at__at_ LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand .include <bsd.prog.mk> - -.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 _at__at_ -98,11 +98,4 _at__at_ 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 <bsd.prog.mk> --- gptzfsboot/Makefile.orig 2008-11-20 19:58:45.000000000 +0100 +++ gptzfsboot/Makefile 2008-11-20 20:50:25.000000000 +0100 _at__at_ -64,11 +64,4 _at__at_ 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 <bsd.prog.mk>Received on Thu Nov 20 2008 - 19:13:50 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:39:37 UTC