Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into systemd

Conflicts:

BOOK/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/temp-system/common/patch.xml

    rec008670 r229ed25  
    2323    <title>Installation of Patch</title>
    2424
    25     <para os="cc1">When cross-compiling configure cannot properly detect the
    26     existance of certain features. Override this behaviour:</para>
    27 
    28 <screen os="cc2"><userinput>echo "ac_cv_func_strnlen_working=yes" > config.cache</userinput></screen>
    29 
    3025    <para os="a">Prepare Patch for compilation:</para>
    3126
    3227<screen os="b"><userinput>./configure --prefix=/tools \
    33     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    34     --cache-file=config.cache</userinput></screen>
     28    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    3529
    3630    <para os="c">Compile the package:</para>
Note: See TracChangeset for help on using the changeset viewer.