Changeset f4362f22

Timestamp:

08/03/2018 08:56:19 PM (5 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ac4d403

Parents:

ffdbde9c

Message:

Libreoffice - fix build breakage with recent LFS, apparently caused by python-3.7.
Python2 - remove the sed for _ssl which no-longer works, and require libssh2 in rustc.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20269 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general/prog/python2.xml (modified) (1 diff)
• general/prog/rust.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (2 diffs)

general/prog/python2.xml

@@ -129 +129 @@
       commands:
     </para>
-
-    <note><para>To build the python _ssl module, the file Modules/Setup.dist
-    must be edited.
-
-<screen><userinput>sed -i '/#SSL/,+3 s/^#//' Modules/Setup.dist</userinput></screen>
-
-    </para></note>
 
 <screen><userinput>./configure --prefix=/usr       \

general/prog/rust.xml

@@ -113 +113 @@
       <xref linkend="curl"/>,
       <xref linkend="cmake"/>,
+      <xref linkend="libssh2"/>
 <!-- Although this appears to build with python3, there are sometimes strange
  script errors in the compilation (i.e. it exits after the build, without
@@ -123 +124 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libssh2"/> (required by the libgit crate during
-      <emphasis>some</emphasis> stable installs, but not during others),
       <package>clang</package> from <xref linkend="llvm"/>
       (built with -DLLVM_LINK_LLVM_DYLIB=ON)

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>August 3rd, 2018</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Python-2.7.15 no longer installs the _ssl module, remove
+          the ineffective sed and instead require libssh2 in rustc.
+          Fixes <ulink url="&blfs-ticket-root;10899">#10899</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[ken] - patch libreoffice to build with recent LFS, the problem
+          was apparently caused by python-3.7.</para>
+        </listitem>
         <listitem>
           <para>[ken] - Fix postfix to build against Berkeley DB-18. Minimally

xsoft/office/libreoffice.xml

@@ -144 +144 @@
         <para>Required patch to fix building with system <xref linkend="poppler"/>:
          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler64-1.patch"/></para>
+      </listitem>
+
+      <listitem>
+        <para>Required patch to fix building with system <xref linkend="python3"/>:
+         <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-python37-1.patch"/></para>
       </listitem>
 
@@ -353 +358 @@
 
 patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler64-1.patch &amp;&amp;
+
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-python37-1.patch &amp;&amp;
 
 ./autogen.sh --prefix=$LO_PREFIX         \