Changeset d49e97c


Ignore:
Timestamp:
12/02/2016 07:30:39 PM (5 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
nosym
Children:
853aeb6
Parents:
5d15cba
Message:

Create branch without lib64 symlinks

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/nosym@11148 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • chapter05/gcc-pass1.xml

    r5d15cba rd49e97c  
    6969    Issue:</para>
    7070
    71 <screen><userinput remap="pre">for file in \
    72  $(find gcc/config -name linux64.h -o -name linux.h -o -name sysv4.h)
     71<screen><userinput remap="pre">for file in gcc/config/{linux,i386/linux{,64}}.h
    7372do
    7473  cp -uv $file{,.orig}
     
    9897    copied files.  When used in conjunction with <command>cp -u</command>, this
    9998    prevents unexpected changes to the original files in case the commands are
    100     inadvertently run twice.  </para>
     99    inadvertently run twice.</para>
     100
     101    <para>Finally, on x86_64 hosts, set the default directory name for
     102    64-bit libraries to <quote>lib</quote>:</para>
     103
     104<screen><userinput remap="pre">case $(uname -m) in
     105  x86_64)
     106    sed -e '/m64=/s/lib64/lib/' \
     107        -i.orig gcc/config/i386/t-linux64
     108 ;;
     109esac</userinput></screen>
     110
    101111<!--
    102112    <para>GCC doesn't detect stack protection correctly, which causes problems
     
    124134    --prefix=/tools                                \
    125135    --with-glibc-version=2.11                      \
     136    --with-slibdir=/tools/lib                      \
    126137    --with-sysroot=$LFS                            \
    127138    --with-newlib                                  \
  • chapter05/gcc-pass2.xml

    r5d15cba rd49e97c  
    7171    class="directory">/tools</filename>.</para>
    7272
    73 <screen><userinput remap="pre">for file in \
    74  $(find gcc/config -name linux64.h -o -name linux.h -o -name sysv4.h)
     73<screen><userinput remap="pre">for file in gcc/config/{linux,i386/linux{,64}}.h
    7574do
    7675  cp -uv $file{,.orig}
     
    8584done</userinput></screen>
    8685
     86    <para>If building on x86_64, change the default directory name for 64-bit
     87    libraries to <quote>lib</quote>:</para>
     88
     89<screen><userinput remap="pre">case $(uname -m) in
     90  x86_64)
     91    sed -e '/m64=/s/lib64/lib/' \
     92        -i.orig gcc/config/i386/t-linux64
     93  ;;
     94esac</userinput></screen>
     95
    8796    <para>As in the first build of GCC it requires the GMP, MPFR and MPC
    8897    packages. Unpack the tarballs and move them into the required directory
     
    118127    --with-local-prefix=/tools                     \
    119128    --with-native-system-header-dir=/tools/include \
     129    --with-slibdir=/tools/lib                      \
    120130    --enable-languages=c,c++                       \
    121131    --disable-libstdcxx-pch                        \
  • chapter06/creatingdirs.xml

    r5d15cba rd49e97c  
    2525
    2626case $(uname -m) in
    27  x86_64) ln -sv lib /lib64
    28          ln -sv lib /usr/lib64
    29          ln -sv lib /usr/local/lib64 ;;
     27 x86_64) mkdir -v /lib64 ;;
    3028esac
    3129
  • chapter06/gcc.xml

    r5d15cba rd49e97c  
    4646<screen><userinput remap="pre">patch -Np1 -i ../gcc-6.1.0-asan-1.patch</userinput></screen>
    4747-->
     48    <para>If building on x86_64, change the default direcotory name for 64-bit
     49    libraries to <quote>lib</quote>:</para>
     50
     51<screen><userinput remap="pre">case $(uname -m) in
     52  x86_64)
     53    sed -e '/m64=/s/lib64/lib/' \
     54        -i.orig gcc/config/i386/t-linux64
     55  ;;
     56esac</userinput></screen>
     57
    4858    <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
    4959
     
    176186  <para>Depending on your machine architecture, the above may differ slightly,
    177187  the difference usually being the name of the directory
    178   after <filename class="directory">/usr/lib/gcc</filename>. If your machine is
    179   a 64-bit system, you may also see a directory named <filename class="directory">lib64</filename>
    180   towards the end of the string. The important thing to
    181   look for here is that <command>gcc</command> has found all three
     188  after <filename class="directory">/usr/lib/gcc</filename>. The important
     189  thing to look for here is that <command>gcc</command> has found all three
    182190  <filename>crt*.o</filename> files under the
    183191  <filename class="directory">/usr/lib</filename> directory.</para>
  • chapter06/glibc.xml

    r5d15cba rd49e97c  
    5858<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
    5959
     60    <para>Create a symlink for LSB compliance and, for x86_64, a
     61    compatibility symlink required for the dynamic loader to function
     62    correctly:</para>
     63
     64<screen><userinput remap="pre">case $(uname -m) in
     65    x86) ln -s ld-linux.so.2 /lib/ld-lsb.so.3
     66    ;;
     67    x86_64) ln -s ../lib/ld-linux-x86-64.so.2 /lib64
     68            ln -s ../lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
     69    ;;
     70esac</userinput></screen>
     71
    6072    <para>The Glibc documentation recommends building Glibc
    6173    in a dedicated build directory:</para>
     
    6880<screen><userinput remap="configure">../configure --prefix=/usr          \
    6981             --enable-kernel=&min-kernel; \
    70              --enable-obsolete-rpc</userinput></screen>
     82             --enable-obsolete-rpc        \
     83             libc_cv_slibdir=/lib</userinput></screen>
    7184
    7285    <para>Compile the package:</para>
  • chapter06/libcap.xml

    r5d15cba rd49e97c  
    5656    <para>Install the package:</para>
    5757
    58 <screen><userinput remap="install">make RAISE_SETFCAP=no prefix=/usr install
     58<screen><userinput remap="install">make RAISE_SETFCAP=no lib=lib prefix=/usr install
    5959chmod -v 755 /usr/lib/libcap.so</userinput></screen>
    6060
Note: See TracChangeset for help on using the changeset viewer.