Changeset dd30a4b


Ignore:
Timestamp:
01/28/2016 01:41:20 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
7.9-systemd, 7.9-systemd-rc1, 7.9-systemd-rc2, systemd
Children:
4e801466
Parents:
b6ceddb
Message:

Merge from trunk r10991.

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

Files:
12 edited

Legend:

Unmodified
Added
Removed
  • chapter01/changelog.xml

    rb6ceddb rdd30a4b  
    3838
    3939    <listitem>
     40      <para>2016-01-28</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[dj] - Move external build directories into
     44          dedicated build directories inside the source tree for
     45          binutils, gcc, and glibc - Merged from trunk.</para>
     46        </listitem>
     47      </itemizedlist>
     48    </listitem>
     49
     50    <listitem>
    4051      <para>2016-01-24</para>
    4152      <itemizedlist>
  • chapter05/binutils-pass1.xml

    rb6ceddb rdd30a4b  
    5353    enable.</para>
    5454
    55     <para>The Binutils documentation recommends building Binutils outside of the
    56     source directory in a dedicated build directory:</para>
     55    <para>The Binutils documentation recommends building Binutils
     56    in a dedicated build directory:</para>
    5757
    58 <screen><userinput remap="pre">mkdir -v ../binutils-build
    59 cd ../binutils-build</userinput></screen>
     58<screen><userinput remap="pre">mkdir -v build
     59cd       build</userinput></screen>
    6060
    6161    <note>
     
    7373    <para>Now prepare Binutils for compilation:</para>
    7474
    75 <screen><userinput remap="configure">../binutils-&binutils-version;/configure     \
    76     --prefix=/tools            \
    77     --with-sysroot=$LFS        \
    78     --with-lib-path=/tools/lib \
    79     --target=$LFS_TGT          \
    80     --disable-nls              \
    81     --disable-werror</userinput></screen>
     75<screen><userinput remap="configure">../configure --prefix=/tools            \
     76             --with-sysroot=$LFS        \
     77             --with-lib-path=/tools/lib \
     78             --target=$LFS_TGT          \
     79             --disable-nls              \
     80             --disable-werror</userinput></screen>
    8281
    8382    <variablelist>
  • chapter05/binutils-pass2.xml

    rb6ceddb rdd30a4b  
    4646    <para>Create a separate build directory again:</para>
    4747
    48 <screen><userinput remap="pre">mkdir -v ../binutils-build
    49 cd ../binutils-build</userinput></screen>
     48<screen><userinput remap="pre">mkdir -v build
     49cd       build</userinput></screen>
    5050
    5151    <para>Prepare Binutils for compilation:</para>
     
    5454AR=$LFS_TGT-ar                 \
    5555RANLIB=$LFS_TGT-ranlib         \
    56 ../binutils-&binutils-version;/configure     \
     56../configure                   \
    5757    --prefix=/tools            \
    5858    --disable-nls              \
  • chapter05/gcc-pass1.xml

    rb6ceddb rdd30a4b  
    112112<screen><userinput remap="pre">sed -i 's/if \((code.*))\)/if (\1 \&amp;\&amp; \!DEBUG_INSN_P (insn))/' gcc/sched-deps.c</userinput></screen>
    113113-->
    114     <para>The GCC documentation recommends building GCC outside of the
    115     source directory in a dedicated build directory:</para>
    116 
    117 <screen><userinput remap="pre">mkdir -v ../gcc-build
    118 cd ../gcc-build</userinput></screen>
     114    <para>The GCC documentation recommends building GCC
     115    in a dedicated build directory:</para>
     116
     117<screen><userinput remap="pre">mkdir -v build
     118cd       build</userinput></screen>
    119119
    120120    <para>Prepare GCC for compilation:</para>
    121121
    122 <screen><userinput remap="configure">../gcc-&gcc-version;/configure                             \
     122<screen><userinput remap="configure">../configure                                       \
    123123    --target=$LFS_TGT                              \
    124124    --prefix=/tools                                \
  • chapter05/gcc-pass2.xml

    rb6ceddb rdd30a4b  
    102102    <para>Create a separate build directory again:</para>
    103103
    104 <screen><userinput remap="pre">mkdir -v ../gcc-build
    105 cd ../gcc-build</userinput></screen>
     104<screen><userinput remap="pre">mkdir -v build
     105cd       build</userinput></screen>
    106106
    107107    <para>Before starting to build GCC, remember to unset any environment
     
    114114AR=$LFS_TGT-ar                                     \
    115115RANLIB=$LFS_TGT-ranlib                             \
    116 ../gcc-&gcc-version;/configure                             \
     116../configure                                       \
    117117    --prefix=/tools                                \
    118118    --with-local-prefix=/tools                     \
  • chapter05/generalinstructions.xml

    rb6ceddb rdd30a4b  
    108108            </listitem>
    109109            <listitem>
    110               <para>Delete the extracted source directory and any
    111               <filename class="directory"><replaceable>&lt;package&gt;</replaceable>-build</filename>
    112               directories that were created in the build process unless instructed otherwise.</para>
     110              <para>Delete the extracted source directory unless instructed otherwise.</para>
    113111            </listitem>
    114112          </orderedlist>
  • chapter05/glibc.xml

    rb6ceddb rdd30a4b  
    4848<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
    4949
    50     <para>The Glibc documentation recommends building Glibc outside of the source
    51     directory in a dedicated build directory:</para>
    52 
    53 <screen><userinput remap="pre">mkdir -v ../glibc-build
    54 cd ../glibc-build</userinput></screen>
     50    <para>The Glibc documentation recommends building Glibc
     51    in a dedicated build directory:</para>
     52
     53<screen><userinput remap="pre">mkdir -v build
     54cd       build</userinput></screen>
    5555
    5656    <para>Next, prepare Glibc for compilation:</para>
    5757
    58 <screen><userinput remap="configure">../glibc-&glibc-version;/configure                             \
     58<screen><userinput remap="configure">../configure                                        \
    5959      --prefix=/tools                               \
    6060      --host=$LFS_TGT                               \
  • chapter05/libstdc++.xml

    rb6ceddb rdd30a4b  
    4949    </note>
    5050
    51     <para>Create a directory for Libstdc++ and enter it:</para>
     51    <para>Create a separate build directory for Libstdc++ and enter it:</para>
    5252
    53 <screen><userinput remap="pre">mkdir -v ../gcc-build
    54 cd ../gcc-build</userinput></screen>
     53<screen><userinput remap="pre">mkdir -v build
     54cd       build</userinput></screen>
    5555
    5656    <para>Prepare Libstdc++ for compilation:</para>
    5757
    58 <screen><userinput remap="configure">../gcc-&gcc-version;/libstdc++-v3/configure \
     58<screen><userinput remap="configure">../libstdc++-v3/configure          \
    5959    --host=$LFS_TGT                 \
    6060    --prefix=/tools                 \
  • chapter06/binutils.xml

    rb6ceddb rdd30a4b  
    6666<screen><userinput remap="pre">patch -Np1 -i ../&binutils-multiple-plugins-patch;</userinput></screen>
    6767-->
    68     <para>The Binutils documentation recommends building Binutils outside of the
    69     source directory in a dedicated build directory:</para>
    70 
    71 <screen><userinput remap="pre">mkdir -v ../binutils-build
    72 cd ../binutils-build</userinput></screen>
     68    <para>The Binutils documentation recommends building Binutils
     69    in a dedicated build directory:</para>
     70
     71<screen><userinput remap="pre">mkdir -v build
     72cd       build</userinput></screen>
    7373
    7474    <para>Prepare Binutils for compilation:</para>
    7575
    76 <screen><userinput remap="configure">../binutils-&binutils-version;/configure --prefix=/usr   \
    77                            --enable-shared \
    78                            --disable-werror</userinput></screen>
     76<screen><userinput remap="configure">../configure --prefix=/usr   \
     77             --enable-shared \
     78             --disable-werror</userinput></screen>
    7979
    8080    <para>Compile the package:</para>
  • chapter06/gcc.xml

    rb6ceddb rdd30a4b  
    4646<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
    4747-->
    48     <para>The GCC documentation recommends building GCC outside of the source
    49     directory in a dedicated build directory:</para>
    50 
    51 <screen><userinput remap="pre">mkdir -v ../gcc-build
    52 cd ../gcc-build</userinput></screen>
     48    <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
     49
     50<screen><userinput remap="pre">mkdir -v build
     51cd       build</userinput></screen>
    5352
    5453    <para>Prepare GCC for compilation:</para>
    5554
    56 <screen><userinput remap="configure">SED=sed                       \
    57 ../gcc-&gcc-version;/configure        \
    58      --prefix=/usr            \
    59      --enable-languages=c,c++ \
    60      --disable-multilib       \
    61      --disable-bootstrap      \
    62      --with-system-zlib</userinput></screen>
     55<screen><userinput remap="configure">SED=sed                               \
     56../configure --prefix=/usr            \
     57             --enable-languages=c,c++ \
     58             --disable-multilib       \
     59             --disable-bootstrap      \
     60             --with-system-zlib</userinput></screen>
    6361
    6462    <para>Note that for other languages, there are some prerequisites that
     
    107105    <para>To receive a summary of the test suite results, run:</para>
    108106
    109 <screen><userinput remap="test">../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
     107<screen><userinput remap="test">../contrib/test_summary</userinput></screen>
    110108
    111109    <para>For only the summaries, pipe the output through
  • chapter06/glibc.xml

    rb6ceddb rdd30a4b  
    7676<screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen>
    7777
    78     <para>The Glibc documentation recommends building Glibc outside of the source
    79     directory in a dedicated build directory:</para>
    80 
    81 <screen><userinput remap="pre">mkdir -v ../glibc-build
    82 cd ../glibc-build</userinput></screen>
     78    <para>The Glibc documentation recommends building Glibc
     79    in a dedicated build directory:</para>
     80
     81<screen><userinput remap="pre">mkdir -v build
     82cd       build</userinput></screen>
    8383
    8484    <para>Prepare Glibc for compilation:</para>
    8585
    86 <screen><userinput remap="configure">../glibc-&glibc-version;/configure    \
    87     --prefix=/usr          \
    88     --disable-profile      \
    89     --enable-kernel=&min-kernel; \
    90     --enable-obsolete-rpc</userinput></screen>
     86<screen><userinput remap="configure">../configure --prefix=/usr          \
     87             --disable-profile      \
     88             --enable-kernel=&min-kernel; \
     89             --enable-obsolete-rpc</userinput></screen>
    9190
    9291    <para>Compile the package:</para>
     
    169168    <command>nscd</command>:</para>
    170169
    171 <screen><userinput remap="install">cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
     170<screen><userinput remap="install">cp -v ../nscd/nscd.conf /etc/nscd.conf
    172171mkdir -pv /var/cache/nscd</userinput></screen>
    173172
     
    278277
    279278    <para>Install and set up the time zone data with the following:</para>
    280 <screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
     279<screen><userinput>tar -xf ../../tzdata&tzdata-version;.tar.gz
    281280
    282281ZONEINFO=/usr/share/zoneinfo
  • general.ent

    rb6ceddb rdd30a4b  
    1 <!ENTITY version         "20160125-systemd">
     1<!ENTITY version         "20160128-systemd">
    22<!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
    3 <!ENTITY releasedate     "January 25, 2016">
     3<!ENTITY releasedate     "January 28, 2016">
    44<!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
    55<!ENTITY milestone       "7.9">
Note: See TracChangeset for help on using the changeset viewer.