Re: Merging the jh branch to trunk
On Fri, 07 Sep 2007 18:25:54 -0400, Jeremy Huntwork [EMAIL PROTECTED] wrote: Matthew Burgess wrote: Jeremy, did you have to make any changes to the toolchain adjustment phase to cater for GCC-4.2.1? So I'm guessing I avoided what you're hitting now. Here's what is in trunk: gcc -dumpspecs | sed '[EMAIL PROTECTED]/lib/ld-linux.so.2@/tools@g' \ `dirname $(gcc -print-libgcc-file-name)`/specs And here's what's in the jh branch: gcc -dumpspecs | sed 's@/lib\(64\)\?/ld@/tools@g' \ `dirname $(gcc -print-libgcc-file-name)`/specs Thanks Jeremy, that was exactly the problem. I've uploaded the updated gcc.patch file. I just removed the '^' so the sed only matches what current trunk matches, rather than the ld-uClibc.so.0 entry as well which your '/lib/ld/@' version would. Regards, Matt. -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
Re: Merging the jh branch to trunk
El Sábado, 8 de Septiembre de 2007 12:26, Matthew Burgess escribió: Thanks Jeremy, that was exactly the problem. I've uploaded the updated gcc.patch file. I just removed the '^' so the sed only matches what current trunk matches, rather than the ld-uClibc.so.0 entry as well which your '/lib/ld/@' version would. On the gcc.patch file, into the chunk chapter05/gcc-pass2.xml, in the sed and surroinding text that replaces the gcc-specs-patch there is references to linux64.h, /lib64/ld, and /lib32/ld. Don't should that references be left-out until x86_64 support merge? -- Manuel Canales Esparcia Usuario de LFS nº2886: http://www.linuxfromscratch.org LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.info TLDP-ES: http://es.tldp.org -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page