Changeset 0bd108d in clfs-embedded for BOOK/cross-tools/x86

Timestamp:

Nov 12, 2006, 1:39:58 AM (17 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

master

Children:

4bdf1d0

Parents:

02ef21b

Message:

Fixed uclibc headers so they install instead of symlinking

Location:

BOOK/cross-tools/x86

Files:

• uclibc-headers.xml (modified) (3 diffs)
• uclibc.xml (modified) (4 diffs)

BOOK/cross-tools/x86/uclibc-headers.xml

@@ -47 +47 @@
   xpointer="xpointer(//*[@os='f'])"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='g'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
+
 <screen os="d1"><userinput>cp .config .config.orig
 sed -e "/^KERNEL_SOURCE/s:=.*:=\"${CLFS}/usr\":" \
@@ -56 +64 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
+  xpointer="xpointer(//*[@os='j'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
+  xpointer="xpointer(//*[@os='k'])"/>
 
    <para os="d2">Create the Headers:</para>
@@ -68 +76 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
+  xpointer="xpointer(//*[@os='n'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
+  xpointer="xpointer(//*[@os='o'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="uclibc.xml"
-  xpointer="xpointer(//*[@os='n'])"/>
+  xpointer="xpointer(//*[@os='p'])"/>
 
 <screen os="d5"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>

BOOK/cross-tools/x86/uclibc.xml

@@ -38 +38 @@
    extra/Configs/Config.in.orig > extra/Configs/Config.in</userinput></screen>
 
-    <note os="c">
+    <para os="c">By default uClibc symlinks the headers to the source directory.
+    This is not acceptable in our build scenario. So sed the Makefiles to copy them
+    instead.</para>
+
+<screen os="d"><userinput>cp Makefile Makefile.orig
+sed -e 's/$(LN) -fs/cp/g' Makefile.orig > Makefile
+for file in `find libc/sysdeps/linux -name Makefile`; do
+        cp $file $file.orig
+        sed -e 's/$(LN) -fs/cp/g' -e 's@../libc/@$(TOPDIR)libc/@g' $file.orig > $file
+done</userinput></screen>
+
+    <note os="e">
       <para>Below we are just telling uClibc to use the default configuration of
       uClibc. For those for more adventureous, you can use make menuconfig, and
@@ -44 +55 @@
     </note>
 
-    <para os="d">Create default configuration:</para>
+    <para os="f">Create default configuration:</para>
 
-<screen os="e"><userinput>make defconfig</userinput></screen>
+<screen os="g"><userinput>make defconfig</userinput></screen>
 
-   <para os="f">We will need to edit the configuration file, to make sure everything gets
+   <para os="h">We will need to edit the configuration file, to make sure everything gets
    compiled and put into it's proper locations:</para>
 
-<screen os="g"><userinput>cp .config .config.orig
+<screen os="i"><userinput>cp .config .config.orig
 sed -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CLFS_TARGET}-\":" \
     -e "/^KERNEL_SOURCE/s:=.*:=\"${CLFS}/usr\":" \
@@ -59 +70 @@
     .config.orig > .config</userinput></screen>
 
-    <para os="h">We will need to make sure that some settings in uClibc are set so we
+    <para os="j">We will need to make sure that some settings in uClibc are set so we
     can utilize all the features of BusyBox:</para>
 
-<screen os="i"><userinput>UCLIBC_OPTIONS="DO_C99_MATH UCLIBC_HAS_RPC UCLIBC_HAS_CTYPE_CHECKED UCLIBC_HAS_WCHAR UCLIBC_HAS_HEXADECIMAL_FLOATS
+<screen os="k"><userinput>UCLIBC_OPTIONS="DO_C99_MATH UCLIBC_HAS_RPC UCLIBC_HAS_CTYPE_CHECKED UCLIBC_HAS_WCHAR UCLIBC_HAS_HEXADECIMAL_FLOATS
                 UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE UCLIBC_HAS_PRINTF_M_SPEC UCLIBC_HAS_FTW UCLIBC_HAS_IPV6"
 for config in $UCLIBC_OPTIONS; do
@@ -70 +81 @@
 echo "UCLIBC_HAS_FULL_RPC=y" >> .config</userinput></screen>
 
-    <para os="j">Compile the package:</para>
+    <para os="l">Compile the package:</para>
 
-<screen os="k"><userinput>make TARGET_ARCH=i386</userinput></screen>
+<screen os="m"><userinput>make TARGET_ARCH=i386</userinput></screen>
 
-   <para os="l">We will remove the files that were copied over from our Linux Headers during
+   <para os="n">We will remove the files that were copied over from our Linux Headers during
    the building of uClibc. These files were copied into the include directory of the source
    directory of uClibc:</para>
 
-<screen os="m"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
+<screen os="o"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
 
-    <para os="n">Install the package:</para>
+    <para os="p">Install the package:</para>
 
-<screen os="o"><userinput>make PREFIX=${CLFS} install</userinput></screen>
+<screen os="q"><userinput>make PREFIX=${CLFS} install</userinput></screen>
 
   </sect2>