mirror of
https://git.linuxfromscratch.org/lfs.git
synced 2025-03-06 14:24:48 +00:00
Merge tag 'xry111/lfs-next/for-trunk-20220302' into trunk
This commit is contained in:
commit
b39aae039a
@ -5,8 +5,8 @@
|
|||||||
%general-entities;
|
%general-entities;
|
||||||
]>
|
]>
|
||||||
|
|
||||||
<sect1 id="ch-tools-libstdcpp-pass1" role="wrap">
|
<sect1 id="ch-tools-libstdcpp" role="wrap">
|
||||||
<?dbhtml filename="gcc-libstdc++-pass1.html"?>
|
<?dbhtml filename="gcc-libstdc++.html"?>
|
||||||
|
|
||||||
<sect1info condition="script">
|
<sect1info condition="script">
|
||||||
<productname>gcc-libstdc++</productname>
|
<productname>gcc-libstdc++</productname>
|
||||||
@ -14,9 +14,9 @@
|
|||||||
<address>&gcc-url;</address>
|
<address>&gcc-url;</address>
|
||||||
</sect1info>
|
</sect1info>
|
||||||
|
|
||||||
<title>Libstdc++ from GCC-&gcc-version;, Pass 1</title>
|
<title>Libstdc++ from GCC-&gcc-version;</title>
|
||||||
|
|
||||||
<indexterm zone="ch-tools-libstdcpp-pass1">
|
<indexterm zone="ch-tools-libstdcpp">
|
||||||
<primary sortas="a-GCC">GCC</primary>
|
<primary sortas="a-GCC">GCC</primary>
|
||||||
<secondary>tools, libstdc++ pass 1</secondary>
|
<secondary>tools, libstdc++ pass 1</secondary>
|
||||||
</indexterm>
|
</indexterm>
|
||||||
|
@ -62,23 +62,24 @@ mv -v mpc-&mpc-version; mpc</userinput></screen>
|
|||||||
sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
|
sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64
|
||||||
;;
|
;;
|
||||||
esac</userinput></screen>
|
esac</userinput></screen>
|
||||||
<!--
|
|
||||||
<para>Fix an issue with GCC-10.1 when building with a cross
|
|
||||||
compiler:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">patch -Np1 -i ../&gcc-cross-patch;</userinput></screen>
|
<!-- https://gcc.gnu.org/PR100017 -->
|
||||||
-->
|
<para>Fix an issue causing failure cross-compiling libstdc++:</para>
|
||||||
|
|
||||||
|
<screen><userinput remap="pre">sed 's/gnu++17/& -nostdinc++/' \
|
||||||
|
-i libstdc++-v3/src/c++17/Makefile.in</userinput></screen>
|
||||||
|
|
||||||
|
<para>Override the building rule of libgcc and libstdc++ headers, to
|
||||||
|
allow building these libraries with POSIX threads support:</para>
|
||||||
|
|
||||||
|
<screen><userinput remap="pre">sed '/thread_header =/s/@.*@/gthr-posix.h/' \
|
||||||
|
-i libgcc/Makefile.in libstdc++-v3/include/Makefile.in</userinput></screen>
|
||||||
|
|
||||||
<para>Create a separate build directory again:</para>
|
<para>Create a separate build directory again:</para>
|
||||||
|
|
||||||
<screen><userinput remap="pre">mkdir -v build
|
<screen><userinput remap="pre">mkdir -v build
|
||||||
cd build</userinput></screen>
|
cd build</userinput></screen>
|
||||||
|
|
||||||
<para>Create a symlink that allows libgcc to be built with posix threads
|
|
||||||
support:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">mkdir -pv $LFS_TGT/libgcc
|
|
||||||
ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></screen>
|
|
||||||
|
|
||||||
<para>Before starting to build GCC, remember to unset any environment
|
<para>Before starting to build GCC, remember to unset any environment
|
||||||
variables that override the default optimization flags.</para>
|
variables that override the default optimization flags.</para>
|
||||||
|
|
||||||
@ -87,8 +88,9 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
|
|||||||
<screen><userinput remap="configure">../configure \
|
<screen><userinput remap="configure">../configure \
|
||||||
--build=$(../config.guess) \
|
--build=$(../config.guess) \
|
||||||
--host=$LFS_TGT \
|
--host=$LFS_TGT \
|
||||||
|
--target=$LFS_TGT \
|
||||||
|
LDFLAGS_FOR_TARGET=-L$PWD/$LFS_TGT/libgcc \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
CC_FOR_TARGET=$LFS_TGT-gcc \
|
|
||||||
--with-build-sysroot=$LFS \
|
--with-build-sysroot=$LFS \
|
||||||
--enable-initfini-array \
|
--enable-initfini-array \
|
||||||
--disable-nls \
|
--disable-nls \
|
||||||
@ -99,14 +101,13 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
|
|||||||
--disable-libquadmath \
|
--disable-libquadmath \
|
||||||
--disable-libssp \
|
--disable-libssp \
|
||||||
--disable-libvtv \
|
--disable-libvtv \
|
||||||
--disable-libstdcxx \
|
|
||||||
--enable-languages=c,c++</userinput></screen>
|
--enable-languages=c,c++</userinput></screen>
|
||||||
|
|
||||||
<variablelist>
|
<variablelist>
|
||||||
<title>The meaning of the new configure options:</title><!-- WIP -->
|
<title>The meaning of the new configure options:</title><!-- WIP -->
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><parameter>-with-build-sysroot=$LFS</parameter></term>
|
<term><parameter>--with-build-sysroot=$LFS</parameter></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>Normally, using <parameter>--host</parameter> ensures that
|
<para>Normally, using <parameter>--host</parameter> ensures that
|
||||||
a cross-compiler is used for building GCC, and that compiler knows
|
a cross-compiler is used for building GCC, and that compiler knows
|
||||||
@ -118,6 +119,33 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s
|
|||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><parameter>--target=$LFS_TGT</parameter></term>
|
||||||
|
<listitem>
|
||||||
|
<para>As we are cross-compiling GCC, it's impossible to build
|
||||||
|
target libraries (<filename class="libraryfile">libgcc</filename>
|
||||||
|
and <filename class="libraryfile">libstdc++</filename>) with the
|
||||||
|
compiled GCC binaries because these binaries won't run on the
|
||||||
|
host distro. GCC building system will attempt to use the
|
||||||
|
C and C++ compilers on the host distro as a workaround by default.
|
||||||
|
It's not supported to build GCC target libraries with a different
|
||||||
|
version of GCC, so using host compilers may cause building
|
||||||
|
failure. This parameter ensures to build the libraries with GCC
|
||||||
|
pass 1 and prevent the issue.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><parameter>LDFLAGS_FOR_TARGET=...</parameter></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Allow <filename class="libraryfile">libstdc++</filename> to
|
||||||
|
use shared <filename class="libraryfile">libgcc</filename> being
|
||||||
|
built in this pass, instead of the static version built in GCC
|
||||||
|
pass 1. This is needed for supporting C++ exception
|
||||||
|
handling.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><parameter>--enable-initfini-array</parameter></term>
|
<term><parameter>--enable-initfini-array</parameter></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chroot.xml"/>
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingdirs.xml"/>
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="createfiles.xml"/>
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstdc++-pass2.xml"/>
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettext.xml"/>
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bison.xml"/>
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
|
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
|
||||||
|
@ -1,120 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
|
||||||
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
|
||||||
<!ENTITY % general-entities SYSTEM "../general.ent">
|
|
||||||
%general-entities;
|
|
||||||
]>
|
|
||||||
|
|
||||||
<sect1 id="ch-tools-libstdcpp-pass2" role="wrap">
|
|
||||||
<?dbhtml filename="gcc-libstdc++-pass2.html"?>
|
|
||||||
|
|
||||||
<sect1info condition="script">
|
|
||||||
<productname>gcc-libstdc++</productname>
|
|
||||||
<productnumber>&gcc-version;</productnumber>
|
|
||||||
<address>&gcc-url;</address>
|
|
||||||
</sect1info>
|
|
||||||
|
|
||||||
<title>Libstdc++ from GCC-&gcc-version;, Pass 2</title>
|
|
||||||
|
|
||||||
<indexterm zone="ch-tools-libstdcpp-pass2">
|
|
||||||
<primary sortas="a-GCC">GCC</primary>
|
|
||||||
<secondary>tools, libstdc++ pass 2</secondary>
|
|
||||||
</indexterm>
|
|
||||||
|
|
||||||
<sect2 role="package">
|
|
||||||
<title/>
|
|
||||||
|
|
||||||
<para>When building <xref linkend="ch-tools-gcc-pass2"/> we had to defer
|
|
||||||
the installation of the C++ standard library because no suitable compiler
|
|
||||||
was available to compile it. We could not use the compiler built in that
|
|
||||||
section because it is a native compiler and should not be used outside of
|
|
||||||
chroot and risks polluting the libraries with some host components.</para>
|
|
||||||
|
|
||||||
<segmentedlist>
|
|
||||||
<segtitle>&buildtime;</segtitle>
|
|
||||||
<segtitle>&diskspace;</segtitle>
|
|
||||||
|
|
||||||
<seglistitem>
|
|
||||||
<seg>&libstdcpp-tmpp2-sbu;</seg>
|
|
||||||
<seg>&libstdcpp-tmpp2-du;</seg>
|
|
||||||
</seglistitem>
|
|
||||||
</segmentedlist>
|
|
||||||
|
|
||||||
</sect2>
|
|
||||||
|
|
||||||
<sect2 role="installation">
|
|
||||||
<title>Installation of Target Libstdc++</title>
|
|
||||||
|
|
||||||
<note>
|
|
||||||
<para><application>Libstdc++</application> is part of the GCC sources.
|
|
||||||
You should first unpack the GCC tarball and change to the
|
|
||||||
<filename>gcc-&gcc-version;</filename> directory.</para>
|
|
||||||
</note>
|
|
||||||
|
|
||||||
<para>Create a link which exists when building libstdc++ in the gcc tree:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">ln -s gthr-posix.h libgcc/gthr-default.h</userinput></screen>
|
|
||||||
|
|
||||||
<para>Create a separate build directory for libstdc++ and enter it:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="pre">mkdir -v build
|
|
||||||
cd build</userinput></screen>
|
|
||||||
|
|
||||||
<para>Prepare libstdc++ for compilation:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="configure">../libstdc++-v3/configure \
|
|
||||||
CXXFLAGS="-g -O2 -D_GNU_SOURCE" \
|
|
||||||
--prefix=/usr \
|
|
||||||
--disable-multilib \
|
|
||||||
--disable-nls \
|
|
||||||
--host=$(uname -m)-lfs-linux-gnu \
|
|
||||||
--disable-libstdcxx-pch</userinput></screen>
|
|
||||||
|
|
||||||
<variablelist>
|
|
||||||
<title>The meaning of the configure options:</title>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><parameter>CXXFLAGS="-g -O2 -D_GNU_SOURCE"</parameter></term>
|
|
||||||
<listitem>
|
|
||||||
<para>These flags are passed by the top level Makefile when doing
|
|
||||||
a full build of GCC.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><parameter>--host=$(uname -m)-lfs-linux-gnu</parameter></term>
|
|
||||||
<listitem>
|
|
||||||
<para>We have to mimic what would happen if this package were built
|
|
||||||
as part of a full compiler build. This switch would be passed to
|
|
||||||
configure by GCC's build machinery.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><parameter>--disable-libstdcxx-pch</parameter></term>
|
|
||||||
<listitem>
|
|
||||||
<para>This switch prevents the installation of precompiled
|
|
||||||
include files, which are not needed at this stage.</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
</variablelist>
|
|
||||||
|
|
||||||
<para>Compile libstdc++ by running:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="make">make</userinput></screen>
|
|
||||||
|
|
||||||
<para>Install the library:</para>
|
|
||||||
|
|
||||||
<screen><userinput remap="install">make install</userinput></screen>
|
|
||||||
|
|
||||||
</sect2>
|
|
||||||
|
|
||||||
<sect2 role="content">
|
|
||||||
<title/>
|
|
||||||
|
|
||||||
<para>Details on this package are located in <xref linkend="contents-gcc" role="."/></para>
|
|
||||||
|
|
||||||
</sect2>
|
|
||||||
|
|
||||||
</sect1>
|
|
@ -1,126 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
||||||
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
|
||||||
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
|
||||||
<!ENTITY % general-entities SYSTEM "../general.ent">
|
|
||||||
%general-entities;
|
|
||||||
]>
|
|
||||||
|
|
||||||
<sect1 id="ch-system-adjusting">
|
|
||||||
<?dbhtml filename="adjusting.html"?>
|
|
||||||
|
|
||||||
<title>Adjusting the Toolchain</title>
|
|
||||||
|
|
||||||
<para>Now that the final C libraries have been installed, it is time to adjust
|
|
||||||
the toolchain so that it will link any
|
|
||||||
newly compiled program against these new libraries.</para>
|
|
||||||
|
|
||||||
<para>First, backup the <filename class="directory">/tools</filename> linker,
|
|
||||||
and replace it with the adjusted linker we made in chapter 5. We'll also create
|
|
||||||
a link to its counterpart in
|
|
||||||
<filename class="directory">/tools/$(uname -m)-pc-linux-gnu/bin</filename>:</para>
|
|
||||||
|
|
||||||
<screen><userinput>mv -v /tools/bin/{ld,ld-old}
|
|
||||||
mv -v /tools/$(uname -m)-pc-linux-gnu/bin/{ld,ld-old}
|
|
||||||
mv -v /tools/bin/{ld-new,ld}
|
|
||||||
ln -sv /tools/bin/ld /tools/$(uname -m)-pc-linux-gnu/bin/ld</userinput></screen>
|
|
||||||
|
|
||||||
<para>the next command amends the GCC specs file to achieve three goals:
|
|
||||||
first point GCC to the new dynamic linker. Simply deleting all instances of
|
|
||||||
<quote>/tools</quote> should leave us with the correct path to the dynamic
|
|
||||||
linker. Second, let GCC know where to find the Glibc start files. Third,
|
|
||||||
add the /usr/include directory at the end of the default search path, so
|
|
||||||
that header files added in chapter 6 are found.
|
|
||||||
A <command>sed</command> command accomplishes this:</para>
|
|
||||||
|
|
||||||
<screen><userinput>gcc -dumpspecs | sed -e 's@/tools@@g' \
|
|
||||||
-e '/\*startfile_prefix_spec:/{n;s@.*@/usr/lib/ @}' \
|
|
||||||
-e '/\*cpp:/{n;s@$@ -idirafter /usr/include@}' > \
|
|
||||||
`dirname $(gcc --print-libgcc-file-name)`/specs</userinput></screen>
|
|
||||||
|
|
||||||
<para>It is a good idea to visually inspect the specs file to verify the
|
|
||||||
intended change was actually made.</para>
|
|
||||||
|
|
||||||
<para>It is imperative at this point to ensure that the basic
|
|
||||||
functions (compiling and linking) of the adjusted toolchain are working
|
|
||||||
as expected. To do this, perform the following sanity checks:</para>
|
|
||||||
|
|
||||||
<screen os="a"><userinput>echo 'int main(){}' > dummy.c
|
|
||||||
cc dummy.c -v -Wl,--verbose &> dummy.log
|
|
||||||
readelf -l a.out | grep ': /lib'</userinput></screen>
|
|
||||||
|
|
||||||
<para os="b">There should be no errors,
|
|
||||||
and the output of the last command will be (allowing for
|
|
||||||
platform-specific differences in the dynamic linker name):</para>
|
|
||||||
|
|
||||||
<screen os="c"><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
|
|
||||||
|
|
||||||
<para>Note that on 64-bit systems <filename class="directory">/lib</filename> is
|
|
||||||
the location of our dynamic linker, but is accessed via a symbolic link
|
|
||||||
in /lib64.</para>
|
|
||||||
|
|
||||||
<note><para>On 32-bit systems the interpreter should be
|
|
||||||
/lib/ld-linux.so.2.</para></note>
|
|
||||||
|
|
||||||
<para os="d">Now make sure that we're setup to use the correct start files:</para>
|
|
||||||
|
|
||||||
<screen os="e"><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
|
|
||||||
|
|
||||||
<para os="f">The output of the last command should be:</para>
|
|
||||||
|
|
||||||
<screen><computeroutput>/usr/lib/../lib/crt1.o succeeded
|
|
||||||
/usr/lib/../lib/crti.o succeeded
|
|
||||||
/usr/lib/../lib/crtn.o succeeded</computeroutput></screen>
|
|
||||||
|
|
||||||
<para os="g">Verify that the compiler is searching for the correct header
|
|
||||||
files:</para>
|
|
||||||
|
|
||||||
<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
|
|
||||||
|
|
||||||
<para os="h">This command should return the following output:</para>
|
|
||||||
|
|
||||||
<screen><computeroutput>#include <...> search starts here:
|
|
||||||
/tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
|
|
||||||
/tools/include
|
|
||||||
/tools/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include-fixed
|
|
||||||
/usr/include</computeroutput></screen>
|
|
||||||
|
|
||||||
<note><para>On a 32 bit system, x86_64 is replaced with i686.</para></note>
|
|
||||||
|
|
||||||
<para os="i">Next, verify that the new linker is being used with the correct search paths:</para>
|
|
||||||
|
|
||||||
<screen os="j"><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
|
|
||||||
|
|
||||||
<para os="k">References to paths that have components with '-linux-gnu' should
|
|
||||||
be ignored, but otherwise the output of the last command should be:</para>
|
|
||||||
|
|
||||||
<screen><computeroutput>SEARCH_DIR("/usr/lib")
|
|
||||||
SEARCH_DIR("/lib")</computeroutput></screen>
|
|
||||||
|
|
||||||
<para os="l">Next make sure that we're using the correct libc:</para>
|
|
||||||
|
|
||||||
<screen os="m"><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
|
|
||||||
|
|
||||||
<para os="n">The output of the last command should be:</para>
|
|
||||||
|
|
||||||
<screen os="o"><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
|
|
||||||
|
|
||||||
<para os="p">Make sure GCC is using the correct dynamic linker:</para>
|
|
||||||
|
|
||||||
<screen os="q"><userinput>grep found dummy.log</userinput></screen>
|
|
||||||
|
|
||||||
<para os="r">The output of the last command should be (allowing for
|
|
||||||
platform-specific differences in dynamic linker name):</para>
|
|
||||||
|
|
||||||
<screen os="s"><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
|
|
||||||
|
|
||||||
<para os="t">If the output does not appear as shown above or is not received
|
|
||||||
at all, then something is seriously wrong. Investigate and retrace the
|
|
||||||
steps to find out where the problem is and correct it. <!--The most likely
|
|
||||||
reason is that something went wrong with the specs file adjustment.--> Any
|
|
||||||
issues will need to be resolved before continuing with the process.</para>
|
|
||||||
|
|
||||||
<para os="u">Once everything is working correctly, clean up the test files:</para>
|
|
||||||
|
|
||||||
<screen os="v"><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
|
|
||||||
|
|
||||||
</sect1>
|
|
@ -197,29 +197,21 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
|
|||||||
that compiling and linking will work as expected. We do this by performing
|
that compiling and linking will work as expected. We do this by performing
|
||||||
some sanity checks:</para>
|
some sanity checks:</para>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>echo 'int main(){}' > dummy.c
|
||||||
href="adjusting.xml"
|
cc dummy.c -v -Wl,--verbose &> dummy.log
|
||||||
xpointer="xpointer(//*[@os='a'])"/>
|
readelf -l a.out | grep ': /lib'</userinput></screen>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>There should be no errors,
|
||||||
href="adjusting.xml"
|
and the output of the last command will be (allowing for
|
||||||
xpointer="xpointer(//*[@os='b'])"/>
|
platform-specific differences in the dynamic linker name):</para>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='c'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Now make sure that we're setup to use the correct start files:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='d'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>grep -o '/usr/lib.*/crt[1in].*succeeded' dummy.log</userinput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='e'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>The output of the last command should be:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='f'])"/>
|
|
||||||
|
|
||||||
<screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
|
<screen><computeroutput>/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crt1.o succeeded
|
||||||
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crti.o succeeded
|
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/../../../../lib/crti.o succeeded
|
||||||
@ -232,15 +224,12 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
|
|||||||
<filename>crt*.o</filename> files under the
|
<filename>crt*.o</filename> files under the
|
||||||
<filename class="directory">/usr/lib</filename> directory.</para>
|
<filename class="directory">/usr/lib</filename> directory.</para>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Verify that the compiler is searching for the correct header
|
||||||
href="adjusting.xml"
|
files:</para>
|
||||||
xpointer="xpointer(//*[@os='g'])"/>
|
|
||||||
|
|
||||||
<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
|
<screen><userinput>grep -B4 '^ /usr/include' dummy.log</userinput></screen>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>This command should return the following output:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='h'])"/>
|
|
||||||
|
|
||||||
<screen><computeroutput>#include <...> search starts here:
|
<screen><computeroutput>#include <...> search starts here:
|
||||||
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
|
/usr/lib/gcc/x86_64-pc-linux-gnu/&gcc-version;/include
|
||||||
@ -251,17 +240,12 @@ rm -rf /usr/lib/gcc/$(gcc -dumpmachine)/&gcc-version;/include-fixed/bits/</useri
|
|||||||
<para>Again, the directory named after your target triplet may be
|
<para>Again, the directory named after your target triplet may be
|
||||||
different than the above, depending on your system architecture.</para>
|
different than the above, depending on your system architecture.</para>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Next, verify that the new linker is being used with the correct search paths:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='i'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>grep 'SEARCH.*/usr/lib' dummy.log |sed 's|; |\n|g'</userinput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='j'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>References to paths that have components with '-linux-gnu' should
|
||||||
href="adjusting.xml"
|
be ignored, but otherwise the output of the last command should be:</para>
|
||||||
xpointer="xpointer(//*[@os='k'])"/>
|
|
||||||
|
|
||||||
<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
|
<screen><computeroutput>SEARCH_DIR("/usr/x86_64-pc-linux-gnu/lib64")
|
||||||
SEARCH_DIR("/usr/local/lib64")
|
SEARCH_DIR("/usr/local/lib64")
|
||||||
@ -284,49 +268,32 @@ SEARCH_DIR("/usr/local/lib")
|
|||||||
SEARCH_DIR("/lib")
|
SEARCH_DIR("/lib")
|
||||||
SEARCH_DIR("/usr/lib");</computeroutput></screen>
|
SEARCH_DIR("/usr/lib");</computeroutput></screen>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Next make sure that we're using the correct libc:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='l'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>grep "/lib.*/libc.so.6 " dummy.log</userinput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='m'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>The output of the last command should be:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='n'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><computeroutput>attempt to open /usr/lib/libc.so.6 succeeded</computeroutput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='o'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Make sure GCC is using the correct dynamic linker:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='p'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>grep found dummy.log</userinput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='q'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>The output of the last command should be (allowing for
|
||||||
href="adjusting.xml"
|
platform-specific differences in dynamic linker name):</para>
|
||||||
xpointer="xpointer(//*[@os='r'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><computeroutput>found ld-linux-x86-64.so.2 at /usr/lib/ld-linux-x86-64.so.2</computeroutput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='s'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>If the output does not appear as shown above or is not received
|
||||||
href="adjusting.xml"
|
at all, then something is seriously wrong. Investigate and retrace the
|
||||||
xpointer="xpointer(//*[@os='t'])"/>
|
steps to find out where the problem is and correct it. <!--The most likely
|
||||||
|
reason is that something went wrong with the specs file adjustment.--> Any
|
||||||
|
issues will need to be resolved before continuing with the process.</para>
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<para>Once everything is working correctly, clean up the test files:</para>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='u'])"/>
|
|
||||||
|
|
||||||
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
|
<screen><userinput>rm -v dummy.c a.out dummy.log</userinput></screen>
|
||||||
href="adjusting.xml"
|
|
||||||
xpointer="xpointer(//*[@os='v'])"/>
|
|
||||||
|
|
||||||
<para>Finally, move a misplaced file:</para>
|
<para>Finally, move a misplaced file:</para>
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@ rm -fv man/man8/arpd.8</userinput></screen>
|
|||||||
-->
|
-->
|
||||||
<para>Compile the package:</para>
|
<para>Compile the package:</para>
|
||||||
|
|
||||||
<screen><userinput remap="make">make</userinput></screen>
|
<screen><userinput remap="make">make NETNS_RUN_DIR=/run/netns</userinput></screen>
|
||||||
|
|
||||||
<para>This package does not have a working test suite.</para>
|
<para>This package does not have a working test suite.</para>
|
||||||
<!-- currently not useful, no tests actually run
|
<!-- currently not useful, no tests actually run
|
||||||
|
@ -63,24 +63,7 @@
|
|||||||
<screen><userinput remap="configure">SRCDIR=$(pwd)
|
<screen><userinput remap="configure">SRCDIR=$(pwd)
|
||||||
cd unix
|
cd unix
|
||||||
./configure --prefix=/usr \
|
./configure --prefix=/usr \
|
||||||
--mandir=/usr/share/man \
|
--mandir=/usr/share/man</userinput></screen>
|
||||||
$([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)</userinput></screen>
|
|
||||||
|
|
||||||
<variablelist>
|
|
||||||
<title>The meaning of the configure options:</title>
|
|
||||||
|
|
||||||
<varlistentry>
|
|
||||||
<term><parameter>$([ "$(uname -m)" = x86_64 ] && echo --enable-64bit)</parameter></term>
|
|
||||||
<listitem>
|
|
||||||
<para>The construct <parameter>$(<shell command>)</parameter>
|
|
||||||
is replaced by the output of the shell command. Here this output is
|
|
||||||
empty if running on a 32 bit machine, and is
|
|
||||||
<parameter>--enable-64bit</parameter> if running on a 64 bit machine.
|
|
||||||
</para>
|
|
||||||
</listitem>
|
|
||||||
</varlistentry>
|
|
||||||
|
|
||||||
</variablelist>
|
|
||||||
|
|
||||||
<para>Build the package:</para>
|
<para>Build the package:</para>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user