r1823 - in profiles/BLFS/trunk: chapter12 chapter12/perlmods chapter14 config_standard/packages wget

thomasp at linuxfromscratch.org thomasp at linuxfromscratch.org
Sat Mar 26 12:35:26 PST 2005


Author: thomasp
Date: 2005-03-26 13:35:24 -0700 (Sat, 26 Mar 2005)
New Revision: 1823

Added:
   profiles/BLFS/trunk/chapter12/gnat.xml
Modified:
   profiles/BLFS/trunk/chapter12/doxygen.xml
   profiles/BLFS/trunk/chapter12/expect.xml
   profiles/BLFS/trunk/chapter12/gcc-33.xml
   profiles/BLFS/trunk/chapter12/gcc-34.xml
   profiles/BLFS/trunk/chapter12/j2sdk.xml
   profiles/BLFS/trunk/chapter12/perlmods/DateManip.xml
   profiles/BLFS/trunk/chapter12/perlmods/Module-CoreList.xml
   profiles/BLFS/trunk/chapter12/perlmods/PDL.xml
   profiles/BLFS/trunk/chapter14/dhcpcd.xml
   profiles/BLFS/trunk/config_standard/packages/ch12.ent
   profiles/BLFS/trunk/wget/chapter12.urls
Log:
Package Audit: Chapters 12-15

Modified: profiles/BLFS/trunk/chapter12/doxygen.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/doxygen.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/doxygen.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -41,8 +41,8 @@
       </stageinfo>
       <remove>src/unistd.h</remove>
       <configure>
-        <param>--prefix=/usr</param>
-        <param>--docdir=/usr/share/doc</param>
+        <param>--prefix /usr</param>
+        <param>--docdir /usr/share/doc</param>
       </configure>
       <make />
       <make>

Modified: profiles/BLFS/trunk/chapter12/expect.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/expect.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/expect.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -26,15 +26,20 @@
         <destination>&build_dir;</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <base>&build_dir;/&expect-directory;</base>
+	<base>&build_dir;/&expect-directory;</base>
       </stageinfo>
-      <patch base="&build_dir;/&expect-directory;">
+      <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&expect-spawn-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <base>&build_dir;/&expect-directory;</base>
+      </stageinfo>
       <configure>
         <param>--prefix=/usr</param>
         <param>--with-tcl=/usr/lib</param>

Modified: profiles/BLFS/trunk/chapter12/gcc-33.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc-33.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/gcc-33.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -62,6 +62,20 @@
         <source>/opt/gcc-&gcc-33-version;/lib/libstdc++.so.5*</source>
         <destination>/usr/lib</destination>
       </move>
+      <link>
+	<option>force</option>
+	<target>/usr/lib/libstdc++.so.5.0.6</target>
+	<name>/opt/gcc-&gcc-33-version;/lib</name>
+      </link>
+      <link>
+	<option>force</option>
+	<target>libstdc++.so.5.0.6</target>
+	<name>/opt/gcc-&gcc-33-version;/lib/libstdc++.so.5</name>
+      </link>
+      <ownership user="root" group="root">
+	<option>recursive</option>
+	<name>/opt/gcc-&gcc-33-version;/lib/gcc-lib/i686-pc-linux-gnu/&gcc-33-version;/include</name>
+      </ownership>
     </stage>
     <stage name="Cleanup">
       <remove>&build_dir;/&gcc-33-directory;</remove>

Modified: profiles/BLFS/trunk/chapter12/gcc-34.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/gcc-34.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/gcc-34.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -29,30 +29,35 @@
         <name>&build_dir;/gcc-build</name>
       </mkdir>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <environment>
-          <variable name="CFLAGS" />
-          <variable name="CXXFLAGS" />
-          <variable name="PATH">/opt/gnat/bin:/bin:/usr/bin:/usr/local/bin</variable>
-        </environment>
-        <base>&build_dir;/gcc-build</base>
+	<base>&build_dir;/&gcc-34-directory;</base>
       </stageinfo>
-      <patch base="&build_dir;/&gcc-34-directory;">
+      <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&gcc-34-no-fixincludes-patch;</param>
       </patch>
-      <patch base="&build_dir;/&gcc-34-directory;">
+      <patch>
         <param>-N</param>
         <param>-p1</param>
         <param>-i &packages_dir;/&gcc-34-linkonce-patch;</param>
       </patch>
-      <search_replace base="&build_dir;/&gcc-34-directory;">
+      <search_replace>
         <file>libiberty/Makefile.in</file>
         <find>install_to_$(INSTALL_DEST)</find>
         <replace></replace>
       </search_replace>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+          <variable name="PATH">/opt/gnat/bin:/bin:/usr/bin:/usr/local/bin</variable>
+        </environment>
+        <base>&build_dir;/gcc-build</base>
+      </stageinfo>
       <configure command="../&gcc-34-directory;/configure">
         <param>--prefix=/usr</param>
         <param>--libexecdir=/usr/lib</param>
@@ -96,7 +101,9 @@
       </link>
       <ownership user="root" group="root">
       	<option>recursive</option>
-	<name>/usr/lib/gcc/i686-pc-linux-gnu/3.4.1/include</name>
+	<name>/usr/lib/gcc/i686-pc-linux-gnu/&gcc-34-version;/include</name>
+	<name>/usr/lib/gcc/i686-pc-linux-gnu/&gcc-34-version;/adalib</name>
+	<name>/usr/lib/gcc/i686-pc-linux-gnu/&gcc-34-version;/adainclude</name>
       </ownership>
     </stage>
     <stage name="Cleanup">

Copied: profiles/BLFS/trunk/chapter12/gnat.xml (from rev 1817, profiles/BLFS/trunk/chapter12/gnat.xml)

Modified: profiles/BLFS/trunk/chapter12/j2sdk.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/j2sdk.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -107,26 +107,9 @@
         <destination>&build_dir;/java-build</destination>
       </unpack>
     </stage>
-    <stage name="Installing">
+    <stage name="Patching">
       <stageinfo>
-        <environment>
-          <variable name="JAVA_HOME">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
-	  <variable name="PATH" mode="prepend">/opt/gcc-&gcc-33-version;/bin:</variable>
-          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/bin</variable>
-          <variable name="ALT_BOOTDIR">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
-          <variable name="CLASSPATH" />
-          <variable name="CFLAGS" />
-          <variable name="CXXFLAGS" />
-          <variable name="LDFLAGS" />
-          <variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
-          <variable name="BUILD_NUMBER">blfs-&blfs-version;</variable>
-          <variable name="DEV_ONLY">true</variable>
-          <variable name="ALT_MOZILLA_PATH">&build_dir;/java-build</variable>
-          <variable name="INSANE">true</variable>
-          <variable name="MAKE_VERBOSE">true</variable>
-          <variable name="ALT_CACERTS_FILE">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/jre/lib/security/cacerts</variable>
-        </environment>
-        <base>&build_dir;/java-build</base>
+	<base>&build_dir;/java-build</base>
       </stageinfo>
       <patch>
         <param>-N</param>
@@ -163,6 +146,28 @@
         <param>-p1</param>
         <param>-i &packages_dir;/&j2sdk-static-cxx-patch;</param>
       </patch>
+    </stage>
+    <stage name="Installing">
+      <stageinfo>
+        <environment>
+          <variable name="JAVA_HOME">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
+	  <variable name="PATH" mode="prepend">/opt/gcc-&gcc-33-version;/bin:</variable>
+          <variable name="PATH" mode="append">:/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/bin</variable>
+          <variable name="ALT_BOOTDIR">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;</variable>
+          <variable name="CLASSPATH" />
+          <variable name="CFLAGS" />
+          <variable name="CXXFLAGS" />
+          <variable name="LDFLAGS" />
+          <variable name="ALT_DEVTOOLS_PATH">"/usr/bin"</variable>
+          <variable name="BUILD_NUMBER">blfs-&blfs-version;</variable>
+          <variable name="DEV_ONLY">true</variable>
+          <variable name="ALT_MOZILLA_PATH">&build_dir;/java-build</variable>
+          <variable name="INSANE">true</variable>
+          <variable name="MAKE_VERBOSE">true</variable>
+          <variable name="ALT_CACERTS_FILE">/opt/j2sdk/j2sdk-precompiled-&j2sdk-version;/jre/lib/security/cacerts</variable>
+        </environment>
+        <base>&build_dir;/java-build</base>
+      </stageinfo>
       <make base="&build_dir;/java-build/motif/lib/Xm" />
       <make base="&build_dir;/java-build/control/make" />
       <copy base="&build_dir;/java-build/control/build/linux-i586">

Modified: profiles/BLFS/trunk/chapter12/perlmods/DateManip.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/perlmods/DateManip.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/perlmods/DateManip.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -11,7 +11,7 @@
 
 ]>
 <alfs>
-<package name="DateManip" version="&-version;">
+<package name="DateManip" version="&DateManip-version;">
   <stage name="Unpacking.">
     <unpack>
       <archive>&packages_dir;/&DateManip-package;</archive>

Modified: profiles/BLFS/trunk/chapter12/perlmods/Module-CoreList.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/perlmods/Module-CoreList.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/perlmods/Module-CoreList.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -11,16 +11,16 @@
 
 ]>
 <alfs>
-<package name="Modules-Corelist" version="&Modules-Corelist-version;">
+<package name="Module-CoreList" version="&Module-CoreList-version;">
   <stage name="Unpacking.">
     <unpack>
-      <archive>&packages_dir;/&Modules-Corelist-package;</archive>
+      <archive>&packages_dir;/&Module-CoreList-package;</archive>
       <destination>&build_dir;</destination>
     </unpack>
   </stage>
   <stage name="Installing.">
     <stageinfo>
-      <base>&build_dir;/&Modules-Corelist-directory;</base>
+      <base>&build_dir;/&Module-CoreList-directory;</base>
     </stageinfo>
     <execute command="perl Makefile.PL" />
     <make />
@@ -32,7 +32,7 @@
     </make>
   </stage>
   <stage name="Cleanup.">
-    <remove>&build_dir;/&Modules-Corelist-directory;</remove>
+    <remove>&build_dir;/&Module-CoreList-directory;</remove>
   </stage>
 </package>
 </alfs>

Modified: profiles/BLFS/trunk/chapter12/perlmods/PDL.xml
===================================================================
--- profiles/BLFS/trunk/chapter12/perlmods/PDL.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter12/perlmods/PDL.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -13,21 +13,21 @@
 <alfs>
 <package name="PDL" version="&PDL-version;">
   <packageinfo>
-    <requires>
+    <utilizes>
       <name>Filter</name>
-    </requires>
-    <requires>
+    </utilizes>
+    <utilizes>
       <name>Inline</name>
-    </requires>
-    <requires>
+    </utilizes>
+    <utilizes>
       <name>Term-Readline-Gnu</name>
-    </requires>
-    <requires>
+    </utilizes>
+    <utilizes>
       <name>ExtUtils-F77</name>
-    </requires>
-    <requires>
+    </utilizes>
+    <utilizes>
       <name>Astro-FITS-Header</name>
-    </requires>
+    </utilizes>
   </packageinfo>
   <stage name="Unpacking.">
     <unpack>

Modified: profiles/BLFS/trunk/chapter14/dhcpcd.xml
===================================================================
--- profiles/BLFS/trunk/chapter14/dhcpcd.xml	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/chapter14/dhcpcd.xml	2005-03-26 20:35:24 UTC (rev 1823)
@@ -58,10 +58,8 @@
     </stage>
     <stage name="Configuring dhcpcd">
     <copy>
-      <source>&blfs-config;/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd
-</source>
-      <destination>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd
-</destination>
+      <source>&blfs-config;/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</source>
+      <destination>/etc/sysconfig/network-devices/ifconfig.eth0/dhcpcd</destination>
     </copy>
     </stage>
     &bootscripts-clean;

Modified: profiles/BLFS/trunk/config_standard/packages/ch12.ent
===================================================================
--- profiles/BLFS/trunk/config_standard/packages/ch12.ent	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/config_standard/packages/ch12.ent	2005-03-26 20:35:24 UTC (rev 1823)
@@ -190,6 +190,10 @@
 <!ENTITY dejagnu-package   "dejagnu-&dejagnu-version;.tar.bz2">
 <!ENTITY dejagnu-directory "dejagnu-&dejagnu-version;">
 
+<!ENTITY gnat-version   "3.15p"> 	 
+<!ENTITY gnat-package   "gcc-&gcc-34-version;-gnat-&gnat-version;-i686-pc-redhat71-gnu-bin.tar.bz2"> 	 
+<!ENTITY gnat-directory "gnat-&gnat-version;-i686-pc-linux-gnu-bin">
+
 <!ENTITY gcc-34-version              "3.4.1">
 <!ENTITY gcc-34-package              "gcc-&gcc-34-version;.tar.bz2">
 <!ENTITY gcc-34-directory            "gcc-&gcc-34-version;">

Modified: profiles/BLFS/trunk/wget/chapter12.urls
===================================================================
--- profiles/BLFS/trunk/wget/chapter12.urls	2005-03-26 19:09:20 UTC (rev 1822)
+++ profiles/BLFS/trunk/wget/chapter12.urls	2005-03-26 20:35:24 UTC (rev 1823)
@@ -55,6 +55,7 @@
 
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/D-E/dejagnu-1.4.4.tar.bz2
 
+ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/gcc-3.4.1-gnat-3.15p-i686-pc-redhat71-gnu-bin.tar.bz2
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/gcc-3.4.1.tar.bz2
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/gcc-3.4.1-testsuite.tar.bz2
 ftp://ftp.lfs-matrix.net/pub/BLFS/6.0/F-H/gcc-3.4.1-no_fixincludes-1.patch




More information about the alfs-log mailing list