Changeset 4059afc


Ignore:
Timestamp:
07/02/2022 04:32:04 AM (6 weeks ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
xry111/clfs-ng
Children:
c51117e
Parents:
e395f06 (diff), af3cf8d (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 remote-tracking branch 'origin/trunk' into xry111/clfs-ng

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • chapter07/texinfo.xml

    re395f06 r4059afc  
    4444    <title>Installation of Texinfo</title>
    4545
    46     <para>First, fix an issue building the package with Glibc-2.34 or later:</para>
    47 
    48 <screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
    49     -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
    50 
    5146    <para>Prepare Texinfo for compilation:</para>
    5247
  • chapter08/python.xml

    re395f06 r4059afc  
    127127        meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
    128128        the command line.  If it's really necessary to downgrade a module or
    129         reinstall the same version for some reason, insert
    130         <parameter>--force-reinstall</parameter> into the command line.
     129        reinstall the same version for some reason, insert
     130        <parameter>--force-reinstall --no-deps</parameter> into the command
     131        line.
    131132      </para>
    132133    </important>
  • chapter08/texinfo.xml

    re395f06 r4059afc  
    6262    </variablelist>
    6363-->
    64 
    65     <para>Again, fix an issue building the package with Glibc-2.34 or later:</para>
    66 
    67 <screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
    68     -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
    6964
    7065    <para>Compile the package:</para>
Note: See TracChangeset for help on using the changeset viewer.