Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
In message 4be9e69a.9020...@delphij.net, Xin LI (delp...@delphij.net) wrote: Please try this patch: http://people.freebsd.org/~delphij/for_review/patch-lzmabuild.diff I'm not quite satisfied with this patch though. [...] It fixed the build. If you need another patch testing just let me know. Many thanks. Cheers, Nick. -- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
On Tue, May 11, 2010 at 04:22:02PM -0700, Xin LI wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi,
Please try this patch:
http://people.freebsd.org/~delphij/for_review/patch-lzmabuild.diff
I'm not quite satisfied with this patch though.
The problem was:
- ar, libarchive now unconditionally depends on LZMA library;
- When building on old system, /usr/lib/liblzma.a would not exist;
- ar is bootstrap tool and thus will be built in BMAKE stage;
- The build fails here since no liblzma is pre-built.
How about bootstrapping liblzma instead? NB: Completely untested.
%%%
Index: Makefile.inc1
===
--- Makefile.inc1 (revision 207959)
+++ Makefile.inc1 (working copy)
@@ -931,7 +931,7 @@
.endif
.if ${BOOTSTRAPPING} = 700044 ${BOOTSTRAPPING} 800022
-_ar= usr.bin/ar
+_ar= lib/liblzma usr.bin/ar
.endif
.if ${BOOTSTRAPPING} 800013
%%%
Cheers,
--
Ruslan Ermilov
r...@freebsd.org
FreeBSD committer
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
In message 201005101528.o4afsimx091...@svn.freebsd.org, Martin Matuska (m...@freebsd.org) wrote: Author: mm Date: Mon May 10 15:28:44 2010 New Revision: 207849 URL: http://svn.freebsd.org/changeset/base/207849 Log: Enable liblzma support in libarchive Adjust dependencies for programs using libarchive Add xz and linkage against liblzma to rescue system Approved by:kientzle, delphij (mentor) MFC after: 2 weeks Modified: head/Makefile.inc1 head/lib/libarchive/Makefile head/rescue/rescue/Makefile head/usr.bin/ar/Makefile head/usr.bin/cpio/Makefile head/usr.bin/cpio/test/Makefile head/usr.bin/tar/Makefile head/usr.bin/tar/test/Makefile [...] This commit breaks the build for me. I am building on a i386 system running FreeBSD 7.3-STABLE r205828. Prior to this commit I could build HEAD fine. Here are the last few lines of the build up to the point it fails: === usr.bin/ar (obj,depend,all,install) /usr/obj/home/FreeBSD.svn/base/head/tmp/home/FreeBSD.svn/base/head/usr.bin/ar created for /home/FreeBSD.svn/base/head/usr.bin/ar lex -t /home/FreeBSD.svn/base/head/usr.bin/ar/acplex.l acplex.c yacc -d /home/FreeBSD.svn/base/head/usr.bin/ar/acpyacc.y cp y.tab.c acpyacc.c rm -f .depend mkdep -f .depend -a-I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include /home/FreeBSD.svn/base/head/usr.bin/ar/ar.c acplex.c acpyacc.c /home/FreeBSD.svn/base/head/usr.bin/ar/read.c /home/FreeBSD.svn/base/head/usr.bin/ar/util.c /home/FreeBSD.svn/base/head/usr.bin/ar/write.c echo ar: /usr/lib/libc.a /usr/lib/libarchive.a /usr/lib/libbz2.a /usr/lib/libz.a /usr/lib/liblzma.a /usr/lib/libelf.a /usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/lib/libegacy.a .depend cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/ar.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c acplex.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c acpyacc.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/read.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/util.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/write.c make: don't know how to make /usr/lib/liblzma.a. Stop *** Error code 2 Stop in /home/FreeBSD.svn/base/head. *** Error code 1 Stop in /home/FreeBSD.svn/base/head. *** Error code 1 Stop in /home/FreeBSD.svn/base/head. I have removed my /etc/make.conf and /etc/src.conf and deleted /usr/obj before starting the build. Cheers, Nick. -- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
On May 11, 2010, at 3:02 PM, N.J. Mann wrote: In message 201005101528.o4afsimx091...@svn.freebsd.org, Martin Matuska (m...@freebsd.org) wrote: Author: mm Date: Mon May 10 15:28:44 2010 New Revision: 207849 URL: http://svn.freebsd.org/changeset/base/207849 Log: Enable liblzma support in libarchive Adjust dependencies for programs using libarchive Add xz and linkage against liblzma to rescue system Approved by:kientzle, delphij (mentor) MFC after: 2 weeks Modified: head/Makefile.inc1 head/lib/libarchive/Makefile head/rescue/rescue/Makefile head/usr.bin/ar/Makefile head/usr.bin/cpio/Makefile head/usr.bin/cpio/test/Makefile head/usr.bin/tar/Makefile head/usr.bin/tar/test/Makefile [...] This commit breaks the build for me. I am building on a i386 system running FreeBSD 7.3-STABLE r205828. Prior to this commit I could build HEAD fine. Here are the last few lines of the build up to the point it fails: === usr.bin/ar (obj,depend,all,install) /usr/obj/home/FreeBSD.svn/base/head/tmp/home/FreeBSD.svn/base/head/usr.bin/ar created for /home/FreeBSD.svn/base/head/usr.bin/ar lex -t /home/FreeBSD.svn/base/head/usr.bin/ar/acplex.l acplex.c yacc -d /home/FreeBSD.svn/base/head/usr.bin/ar/acpyacc.y cp y.tab.c acpyacc.c rm -f .depend mkdep -f .depend -a-I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include /home/FreeBSD.svn/base/head/usr.bin/ar/ar.c acplex.c acpyacc.c /home/FreeBSD.svn/base/head/usr.bin/ar/read.c /home/FreeBSD.svn/base/head/usr.bin/ar/util.c /home/FreeBSD.svn/base/head/usr.bin/ar/write.c echo ar: /usr/lib/libc.a /usr/lib/libarchive.a /usr/lib/libbz2.a /usr/lib/libz.a /usr/lib/liblzma.a /usr/lib/libelf.a /usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/lib/libegacy.a .depend cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/ar.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c acplex.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c acpyacc.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/read.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/util.c cc -O2 -pipe -I. -I/home/FreeBSD.svn/base/head/usr.bin/ar -std=gnu99 -I/usr/obj/home/FreeBSD.svn/base/head/tmp/legacy/usr/include -c /home/FreeBSD.svn/base/head/usr.bin/ar/write.c make: don't know how to make /usr/lib/liblzma.a. Stop *** Error code 2 Stop in /home/FreeBSD.svn/base/head. *** Error code 1 Stop in /home/FreeBSD.svn/base/head. *** Error code 1 Stop in /home/FreeBSD.svn/base/head. I have removed my /etc/make.conf and /etc/src.conf and deleted /usr/obj before starting the build. Hi Nick, Please detail the steps that you did to actually reproduce the problem. Just to let you know though, piecewise updating of just libarchive isn't possible; you need to update some Makefiles and other pieces that Martin touched in the lzma import (in particular Makefile.inc1). Otherwise things will break quickly. HTH, -Garrett___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
In message 25885e8d-93a9-47c7-bc55-aee2d3773...@gmail.com, Garrett Cooper (yanef...@gmail.com) wrote: Please detail the steps that you did to actually reproduce the problem. I usually do a SVN update every day and then do a buildworld and buildkernel (GENERIC and four other custom kernels) for head, stable/8 and stable/7. Because the build box is an old dual-P3 machine that lot takes about 18 hours. Also, I am preparing to update my desktop machine from 7-STABLE to 8-STABLE and so I didn't do a SVN update for a couple of days. Hence, this was the first time I had done a SVN update since lzma was imported to the tree. My usual procedure is: 1. remove any local patches 2. svn update 3. re-add local patches 4. buildworld in head 5. buildkernel in head (GENERIC and then custom kernels) 6. buildworld in stable/8 7. buildkernel in stable/8 (GENERIC and then custom kernels) 8. buildworld in stable/7 9. buildkernel in stable/7 (GENERIC and then custom kernels) When I had the initial failure I immediately did a `rm -r /usr/obj' and re-tried the build (step 4 above). It failed again in the same place. I then moved my /usr/src.conf and /usr/make.conf aside, just in case, `rm -r /usr/obj' again and re-tried the build. It failed in the same place, so I then started to a search to find which commit was causing the breakage: 207848 is okay, 207849 fails. Just to let you know though, piecewise updating of just libarchive isn't possible; you need to update some Makefiles and other pieces that Martin touched in the lzma import (in particular Makefile.inc1). Otherwise things will break quickly. So, should I build 207848 and then update to 207849? I think I must be misunderstanding something here because I fail to see how that will work. Please feel free to enlighten me. :-) Many thanks. Cheers, Nick. -- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 2010/05/11 12:34, Garrett Cooper wrote: Hi Nick, Please detail the steps that you did to actually reproduce the problem. Just to let you know though, piecewise updating of just libarchive isn't possible; you need to update some Makefiles and other pieces that Martin touched in the lzma import (in particular Makefile.inc1). Otherwise things will break quickly. I don't think there is anything wrong with Nick's procedure, I am able to reproduce this on ref7. Figuring out why this would happen... Cheers, - -- Xin LI delp...@delphij.nethttp://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBAgAGBQJL6bkjAAoJEATO+BI/yjfBiHwH/1iCBXPC+07tNc/luBwDub3v fl5t4DSassr6QAZ9GEK3q2TQtbnOCtBPaEU70AgjX+7UHnzUQc9+4Dpyz8wVGpXB L5SP1hDXKPhwmbzadUbk6xPS2k7AMdcJVhedf13TR6T7WRDKfudx90wYhtC3FSKZ zPla/IIrBHuNb4sHgSBRZdpdpcmi+exi4wXQjGPER7MwRGT3snlK8YPSClS/7M5R NrghOA9EEQ1xCK4sGX3PcUX45RG+Fm+QSMe7iiYzDXNWzxZ7Qr+lBYqISilEM+hC luZHFPCswmAinh/XgCVCM/CYHBCvi5fRHnmE0ykAxD4bwmgu1ODSVXnsmZSOO8k= =5qQt -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r207849 - in head: . lib/libarchive rescue/rescue usr.bin/ar usr.bin/cpio usr.bin/cpio/test usr.bin/tar usr.bin/tar/test
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, Please try this patch: http://people.freebsd.org/~delphij/for_review/patch-lzmabuild.diff I'm not quite satisfied with this patch though. The problem was: - ar, libarchive now unconditionally depends on LZMA library; - When building on old system, /usr/lib/liblzma.a would not exist; - ar is bootstrap tool and thus will be built in BMAKE stage; - The build fails here since no liblzma is pre-built. The current approach of mine is: - When OSRELDATE is less than the import, pass NO_LZMA when building ar(1) - Add support for build flag NO_LZMA to ar(1).[*] [*] I think this is not quite right, perhaps we need to have a global MK_XZ or something and use that flag? Cheers, - -- Xin LI delp...@delphij.nethttp://www.delphij.net/ FreeBSD - The Power to Serve! Live free or die -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.14 (FreeBSD) iQEcBAEBAgAGBQJL6eaaAAoJEATO+BI/yjfB3l0H/jvOofC2zzZS1xpqVA/e4ROD NIXl0HeXvt1ra12wqKCt9w2Ilgx830qVAB1kHLXnOOckWYrSkWQ3soxMSuszBEM5 dkrNFwzMIi4Jed1Vg9vtpPtKPyMysM+xA1b6asGT/y18NqEBr35YnZrfqr5L/G0N 7D4qLWpMNQyhJqtIhSSXarT5NTI5272/lNQh3J3568yTtvPq2gbiTg0yj0hTr00J M+DcSFssHM9wNwM1rKWjpuRaY/x+9gjaka2y23hZVAhoFDXjSWHy5JoVwmNjHvIU 2qlnf8y87vMncEFy5FNFVzTAn/tJJfaGXO/GoHnzMxtpgdcrcwMcmcMujRaKpyI= =4nAw -END PGP SIGNATURE- ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
