cvs commit: ALFS/profiles/BLFS/chapter12 gcc-full.xml python.xml

vdzuba at linuxfromscratch.org vdzuba at linuxfromscratch.org
Sat Nov 22 02:37:08 PST 2003


vdzuba      03/11/22 03:37:08

  Modified:    profiles/BLFS BLFS.xml packages.ent system.ent
               profiles/BLFS/chapter12 gcc-full.xml python.xml
  Log:
  updated chapter 12
  
  Revision  Changes    Path
  1.10      +1 -0      ALFS/profiles/BLFS/BLFS.xml
  
  Index: BLFS.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/BLFS.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- BLFS.xml	20 Nov 2003 20:20:18 -0000	1.9
  +++ BLFS.xml	22 Nov 2003 10:37:08 -0000	1.10
  @@ -159,6 +159,7 @@
   <stage name="Chapter 12 (programming tools)">
   
       &python;
  +    &perlmodules;
       &librep;
       &j2sdk;
       &ruby;
  
  
  
  1.13      +26 -1     ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- packages.ent	20 Nov 2003 20:20:18 -0000	1.12
  +++ packages.ent	22 Nov 2003 10:37:08 -0000	1.13
  @@ -290,6 +290,30 @@
   
   <!ENTITY python-patch     "Python-2.3.2-gdbm-2.patch">
   
  +<!ENTITY perlmodules-pdl-version   "2.4.0">
  +<!ENTITY perlmodules-pdl-package   "PDL-2.4.0.tar.gz">
  +<!ENTITY perlmodules-pdl-directory "PDL-2.4.0">
  +
  +<!ENTITY perlmodules-astro-version   "2.7.1">
  +<!ENTITY perlmodules-astro-package   "Astro-FITS-Header-2.7.1.tar.gz">
  +<!ENTITY perlmodules-astro-directory "Astro-FITS-Header-2.7.1">
  +
  +<!ENTITY perlmodules-gtk-version   "0.7008">
  +<!ENTITY perlmodules-gtk-package   "Gtk-Perl-0.7008.tar.gz">
  +<!ENTITY perlmodules-gtk-directory "Gtk-Perl-0.7008">
  +
  +<!ENTITY perlmodules-xmlwriter-version   "0.4">
  +<!ENTITY perlmodules-xmlwriter-package   "XML-Writer-0.4.tar.gz">
  +<!ENTITY perlmodules-xmlwriter-directory "XML-Writer-0.4">
  +
  +<!ENTITY perlmodules-xmlparser-version   "2.31">
  +<!ENTITY perlmodules-xmlparser-package   "XML-Parser-2.31.tar.gz">
  +<!ENTITY perlmodules-xmlparser-directory "XML-Parser-2.31">
  +
  +<!ENTITY perlmodules-recdescent-version   "1.94">
  +<!ENTITY perlmodules-recdescent-package   "Parse-RecDescent-1.94.tar.gz">
  +<!ENTITY perlmodules-recdescent-directory "Parse-RecDescent-1.94">
  +
   <!ENTITY librep-version   "0.16.2">
   <!ENTITY librep-package   "librep-0.16.2.tar.gz">
   <!ENTITY librep-directory "librep-0.16.2">
  @@ -313,7 +337,8 @@
   <!ENTITY gcc-full-package   "gcc-3.3.1.tar.bz2">
   <!ENTITY gcc-full-directory "gcc-3.3.1">
   
  -<!ENTITY gcc-full-patch     "gcc-3.3.1-no_fixincludes-2.patch">
  +<!ENTITY gcc-full-patch1    "gcc-3.3.1-no_fixincludes-2.patch">
  +<!ENTITY gcc-full-patch2    "gcc-3.3.1-suppress-libiberty.patch">
   
   <!ENTITY tcl-version   "8.4.4">
   <!ENTITY tcl-package   "tcl8.4.4-src.tar.gz">
  
  
  
  1.9       +10 -9     ALFS/profiles/BLFS/system.ent
  
  Index: system.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/system.ent,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- system.ent	20 Nov 2003 20:20:18 -0000	1.8
  +++ system.ent	22 Nov 2003 10:37:08 -0000	1.9
  @@ -84,15 +84,16 @@
   <!ENTITY mc         SYSTEM "./chapter11/mc.xml">
   
   <!-- chapter 12 -->
  -<!ENTITY python     SYSTEM "./chapter12/python.xml">
  -<!ENTITY librep     SYSTEM "./chapter12/librep.xml">
  -<!ENTITY j2sdk      SYSTEM "./chapter12/j2sdk.xml">
  -<!ENTITY ruby       SYSTEM "./chapter12/ruby.xml">
  -<!ENTITY gcc-full   SYSTEM "./chapter12/gcc-full.xml">
  -<!ENTITY tcl        SYSTEM "./chapter12/tcl.xml">
  -<!ENTITY tk         SYSTEM "./chapter12/tk.xml">
  -<!ENTITY gcc295     SYSTEM "./chapter12/gcc295.xml">
  -<!ENTITY nasm       SYSTEM "./chapter12/nasm.xml">
  +<!ENTITY python      SYSTEM "./chapter12/python.xml">
  +<!ENTITY perlmodules SYSTEM "./chapter12/perlmodules.xml">
  +<!ENTITY librep      SYSTEM "./chapter12/librep.xml">
  +<!ENTITY j2sdk       SYSTEM "./chapter12/j2sdk.xml">
  +<!ENTITY ruby        SYSTEM "./chapter12/ruby.xml">
  +<!ENTITY gcc-full    SYSTEM "./chapter12/gcc-full.xml">
  +<!ENTITY tcl         SYSTEM "./chapter12/tcl.xml">
  +<!ENTITY tk          SYSTEM "./chapter12/tk.xml">
  +<!ENTITY gcc295      SYSTEM "./chapter12/gcc295.xml">
  +<!ENTITY nasm        SYSTEM "./chapter12/nasm.xml">
   
   <!-- chapter 14 -->
   <!ENTITY dhcpcd     SYSTEM "./chapter14/dhcpcd.xml">
  
  
  
  1.2       +17 -4     ALFS/profiles/BLFS/chapter12/gcc-full.xml
  
  Index: gcc-full.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc-full.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gcc-full.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ gcc-full.xml	22 Nov 2003 10:37:08 -0000	1.2
  @@ -48,7 +48,12 @@
   		</mkdir>
   
   		<copy>
  -		        <source>&packages_dir;/&gcc-full-patch;</source>
  +		        <source>&packages_dir;/&gcc-full-patch1;</source>
  +		        <destination>&build_dir;</destination>
  +		</copy>
  +
  +		<copy>
  +		        <source>&packages_dir;/&gcc-full-patch2;</source>
   		        <destination>&build_dir;</destination>
   		</copy>
   	</stage>
  @@ -68,14 +73,20 @@
   		<patch base="&build_dir;/&gcc-full-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gcc-full-patch;</param>
  +			<param>-i ../&gcc-full-patch1;</param>
  +		</patch>
  +
  +		<patch base="&build_dir;/&gcc-full-directory;">
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&gcc-full-patch2;</param>
   		</patch>
   
   		<execute base="&build_dir;/&gcc-full-directory;/gcc/ada"
   		        command="touch treeprs.ads [es]info.h nmake.ad[bs]" />
   
   		<configure base="&build_dir;/gcc-build"
  -		           command="../&gcc-full-directory;/configure">
  +		           command="CC=/usr/bin/gcc ../&gcc-full-directory;/configure">
   		        <param>--prefix=/usr</param>
   			<param>--enable-shared</param>
   			<param>--enable-languages=c,c++,objc,f77,ada,java</param>
  @@ -108,7 +119,9 @@
   		<remove>&build_dir;/&gcc-full-directory;</remove>
   		<remove>&build_dir;/gnat</remove>
   		<remove>&build_dir;/gcc-build</remove>
  -		<remove>&build_dir;/&gcc-full-patch;</remove>
  +		<remove>&build_dir;/&gcc-full-patch1;</remove>
  +		<remove>&build_dir;/&gcc-full-patch2;</remove>
  +		<remove>/opt/gnat</remove>
   	</stage>
   
   </package>
  
  
  
  1.2       +20 -3     ALFS/profiles/BLFS/chapter12/python.xml
  
  Index: python.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/python.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- python.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ python.xml	22 Nov 2003 10:37:08 -0000	1.2
  @@ -1,8 +1,12 @@
   <package name="python" version="&python-version;">
   
  -    <packageinfo>
  -        <utilizes><name>expat</name></utilizes>
  -    </packageinfo>
  +        <packageinfo>
  +                <utilizes><name>expat</name></utilizes>
  +                <utilizes><name>tk</name></utilizes>
  +                <utilizes><name>gdbm</name></utilizes>
  +                <utilizes><name>gmp</name></utilizes>
  +                <utilizes><name>readline</name></utilizes>
  +        </packageinfo>
   
   
   	<stage name="Unpacking a package.">
  @@ -10,6 +14,10 @@
   			<archive>&packages_dir;/&python-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  +		<copy>
  +		        <source>&packages_dir;/&python-patch;</source>
  +			<destination>&build_dir;</destination>
  +		</copy>
   	</stage>
   
   	<stage name="Installing a package.">
  @@ -17,8 +25,16 @@
   			<base>&build_dir;/&python-directory;</base>
   		</stageinfo>
   
  +
  +		<patch>
  +			<param>-N</param>
  +			<param>-p1</param>
  +			<param>-i ../&python-patch;</param>
  +		</patch>
  +
   		<configure>
   			<param>--prefix=/usr</param>
  +			<param>--enable-shared</param>
   		</configure>
   
   		<make/>
  @@ -31,6 +47,7 @@
   
   	<stage name="Clean-up.">
   		<remove>&build_dir;/&python-directory;</remove>
  +		<remove>&build_dir;/&python-patch;</remove>
   	</stage>
   
   </package>
  
  
  



More information about the alfs-log mailing list