cvs commit: ALFS/profiles/BELFS/config_separate package.ent

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Mon Apr 12 06:31:39 PDT 2004


kpfleming    04/04/12 07:31:39

  Modified:    profiles/BELFS/chapter05 lockingglibc.xml
               profiles/BELFS/chapter06 adjustingtoolchain.xml
               profiles/BELFS/config_separate package.ent
  Log:
  adjust specs file edits for correct paths
  split gcc version number into version/cvs-version
  
  Revision  Changes    Path
  1.2       +2 -2      ALFS/profiles/BELFS/chapter05/lockingglibc.xml
  
  Index: lockingglibc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BELFS/chapter05/lockingglibc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lockingglibc.xml	9 Apr 2004 01:28:55 -0000	1.1
  +++ lockingglibc.xml	12 Apr 2004 13:31:39 -0000	1.2
  @@ -14,12 +14,12 @@
   	<remove>&build_dir;/binutils-build</remove>
   
   	<search_replace>
  -		<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  +		<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
   		<find> /lib/&glibc-loader;</find>
   		<replace> /tools/lib/&glibc-loader;</replace>
   	</search_replace>
   
  -	<remove>/tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</remove>
  +	<remove>/tools/lib/gcc/*/*/include/{pthread.h,bits/sigthread.h}</remove>
   
   <!-- Test basic functions of toolchain with:
   	echo 'main(){}' > dummy.c; gcc dummy.c; readelf -l a.out | grep ': /tools';
  
  
  
  1.3       +1 -1      ALFS/profiles/BELFS/chapter06/adjustingtoolchain.xml
  
  Index: adjustingtoolchain.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BELFS/chapter06/adjustingtoolchain.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- adjustingtoolchain.xml	9 Apr 2004 03:20:29 -0000	1.2
  +++ adjustingtoolchain.xml	12 Apr 2004 13:31:39 -0000	1.3
  @@ -17,7 +17,7 @@
   
   	<stage name="Amending GCC specs file.">
   		<search_replace>
  -			<file>/tools/lib/gcc-lib/&gcc_target;/&gcc-version;/specs</file>
  +			<file>/tools/lib/gcc/&gcc_target;/&gcc-version;/specs</file>
   			<find> /tools/lib/&glibc-loader;</find>
   			<replace> /lib/&glibc-loader;</replace>
   		</search_replace>
  
  
  
  1.5       +6 -5      ALFS/profiles/BELFS/config_separate/package.ent
  
  Index: package.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BELFS/config_separate/package.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- package.ent	10 Apr 2004 03:04:46 -0000	1.4
  +++ package.ent	12 Apr 2004 13:31:39 -0000	1.5
  @@ -102,17 +102,18 @@
   <!ENTITY gawk-package "gawk-&gawk-version;.tar.bz2">
   <!ENTITY gawk-directory "gawk-&gawk-version;">
   
  -<!ENTITY gcc-version "3.4.0-20040406">
  -<!ENTITY gcc-directory "gcc-&gcc-version;">
  +<!ENTITY gcc-version "3.4.0">
  +<!ENTITY gcc-cvs-version "20040406">
  +<!ENTITY gcc-directory "gcc-&gcc-version;-&gcc-cvs-version;">
   
   <!ENTITY gcc-core-md5 "f508291f0a22efbd9ecd4160ba28e2bb">
  -<!ENTITY gcc-core-package "gcc-core-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-core-package "gcc-core-&gcc-version;-&gcc-cvs-version;.tar.bz2">
   
   <!ENTITY gcc-gpp-md5 "f6d41deeebe5861c730642db0b046b21">
  -<!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-gpp-package "gcc-g++-&gcc-version;-&gcc-cvs-version;.tar.bz2">
     
   <!ENTITY gcc-testsuite-md5 "f19ed6ec00fb69bf0f60f8f097122304">
  -<!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;.tar.bz2">
  +<!ENTITY gcc-testsuite-package "gcc-testsuite-&gcc-version;-&gcc-cvs-version;.tar.bz2">
   
   <!ENTITY gcc-no-fixincludes-patch-md5 "78fa00bc9f7173b9658eeb86ce9291c9">
   <!ENTITY gcc-no-fixincludes-patch "gcc-&gcc-version;-no_fixincludes-1.patch">
  
  
  



More information about the alfs-log mailing list