cvs commit: ALFS/profiles/LFS/config_tarball general.ent

jamie at linuxfromscratch.org jamie at linuxfromscratch.org
Thu Feb 5 11:59:11 PST 2004


jamie       04/02/05 12:59:11

  Modified:    profiles/LFS/chapter05 glibc.xml lockingglibc.xml
               profiles/LFS/chapter06 adjustingtoolchain.xml glibc.xml
               profiles/LFS/config_seperate general.ent
               profiles/LFS/config_tarball general.ent
  Log:
  This time properly added support for changing the linker in the gcc specs file
  by changing an entity in general.ent. This makes it easier to build LFS on
  non-x86 arch's.
  
  Revision  Changes    Path
  1.8       +1 -1      ALFS/profiles/LFS/chapter05/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/glibc.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- glibc.xml	4 Feb 2004 19:57:26 -0000	1.7
  +++ glibc.xml	5 Feb 2004 19:59:10 -0000	1.8
  @@ -44,7 +44,7 @@
   		</mkdir>
   
   		<execute command="touch">
  -			<param>/tools/etc/&ld-config-file;</param>
  +			<param>/tools/etc/ld.so.conf</param>
   		</execute>
   
   		<make>
  
  
  
  1.2       +2 -2      ALFS/profiles/LFS/chapter05/lockingglibc.xml
  
  Index: lockingglibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter05/lockingglibc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lockingglibc.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ lockingglibc.xml	5 Feb 2004 19:59:10 -0000	1.2
  @@ -15,8 +15,8 @@
   
   	<search_replace>
   		<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  -		<find> /lib/ld-linux.so.2</find>
  -		<replace> /tools/lib/ld-linux.so.2</replace>
  +		<find> /lib/&ld-specs-file;</find>
  +		<replace> /tools/lib/&ld-specs-file;</replace>
   	</search_replace>
   
   	<remove>/tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</remove>
  
  
  
  1.2       +2 -2      ALFS/profiles/LFS/chapter06/adjustingtoolchain.xml
  
  Index: adjustingtoolchain.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/adjustingtoolchain.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- adjustingtoolchain.xml	6 Dec 2003 03:25:45 -0000	1.1
  +++ adjustingtoolchain.xml	5 Feb 2004 19:59:11 -0000	1.2
  @@ -17,8 +17,8 @@
   	<stage name="Amending GCC specs file.">
   		<search_replace>
   			<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  -			<find> /tools/lib/ld-linux.so.2</find>
  -			<replace> /lib/ld-linux.so.2</replace>
  +			<find> /tools/lib/&ld-specs-file;</find>
  +			<replace> /lib/&ld-specs-file;</replace>
   		</search_replace>
   	</stage>
   
  
  
  
  1.8       +4 -4      ALFS/profiles/LFS/chapter06/glibc.xml
  
  Index: glibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/chapter06/glibc.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- glibc.xml	4 Feb 2004 19:57:26 -0000	1.7
  +++ glibc.xml	5 Feb 2004 19:59:11 -0000	1.8
  @@ -37,7 +37,7 @@
   		</make>
   
   		<execute command="touch">
  -			<param>/etc/&ld-config-file;</param>
  +			<param>/etc/ld.so.conf</param>
   		</execute>
   
   		<make>
  @@ -104,14 +104,14 @@
   		</copy>
   
   		<textdump>
  -			<file>/etc/&ld-config-file;</file>
  +			<file>/etc/ld.so.config</file>
   			<content>
  -				=# Begin /etc/&ld-config-file;
  +				=# Begin /etc/ld.so.config
   				=
   				=/usr/local/lib
   				=/opt/lib
   				=
  -				=# End /etc/&ld-config-file;
  +				=# End /etc/ld.so.config
   			</content>
   		</textdump>
   	</stage>
  
  
  
  1.7       +3 -3      ALFS/profiles/LFS/config_seperate/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_seperate/general.ent,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- general.ent	4 Feb 2004 19:57:26 -0000	1.6
  +++ general.ent	5 Feb 2004 19:59:11 -0000	1.7
  @@ -169,9 +169,9 @@
   <!ENTITY grub-root "hd0,0">
   <!ENTITY grub-install-location "hd0">
   
  -<!-- dynamic library file that your system uses, 
  +<!-- dynamic linker in the gcc specs file that your system uses, 
   	e.g.
  -		x86 = ld.so.conf
  +		x86 = ld-linux.so.2
   		powerpc = ld.so.1
   -->
  -<!ENTITY ld-config-file "ld.so.conf">
  +<!ENTITY ld-specs-file "ld-linux.so.2">
  
  
  
  1.3       +4 -3      ALFS/profiles/LFS/config_tarball/general.ent
  
  Index: general.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/LFS/config_tarball/general.ent,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- general.ent	4 Feb 2004 19:57:26 -0000	1.2
  +++ general.ent	5 Feb 2004 19:59:11 -0000	1.3
  @@ -169,9 +169,10 @@
   <!ENTITY grub-root "hd0,0">
   <!ENTITY grub-install-location "hd0">
   
  -<!-- dynamic library file that your system uses, 
  +<!-- dynamic linker in the gcc specs file that your system uses, 
   	e.g.
  -		x86 = ld.so.conf
  +		x86 = ld-linux.so.2
   		powerpc = ld.so.1
   -->
  -<!ENTITY ld-config-file "ld.so.conf">
  +<!ENTITY ld-specs-file "ld-linux.so.2">
  +
  
  
  



More information about the alfs-log mailing list