Author: ken
Date: Fri Aug 3 13:56:19 2018
New Revision: 20269
Log:
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.
Modified:
trunk/BOOK/general/prog/python2.xml
trunk/BOOK/general/prog/rust.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/xsoft/office/libreoffice.xml
Modified: trunk/BOOK/general/prog/python2.xml
==============================================================================
--- trunk/BOOK/general/prog/python2.xml Fri Aug 3 10:23:16 2018 (r20268)
+++ trunk/BOOK/general/prog/python2.xml Fri Aug 3 13:56:19 2018 (r20269)
@@ -129,13 +129,6 @@
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 \
--enable-shared \
--with-system-expat \
Modified: trunk/BOOK/general/prog/rust.xml
==============================================================================
--- trunk/BOOK/general/prog/rust.xml Fri Aug 3 10:23:16 2018 (r20268)
+++ trunk/BOOK/general/prog/rust.xml Fri Aug 3 13:56:19 2018 (r20269)
@@ -112,6 +112,7 @@
<para role="required">
<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
any obvious errors and with a good status. Also ,it ships with a configure
@@ -122,8 +123,6 @@
<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)
</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Aug 3 10:23:16
2018 (r20268)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Aug 3 13:56:19
2018 (r20269)
@@ -45,6 +45,15 @@
<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
tested, but without grokking what changed from DB-6 to DB-18 there
may possibly be breakage for some usage.
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Fri Aug 3 10:23:16 2018
(r20268)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Fri Aug 3 13:56:19 2018
(r20269)
@@ -145,6 +145,11 @@
<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>
+
<!--
<listitem>
<para>
@@ -353,6 +358,8 @@
patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler64-1.patch
&&
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-python37-1.patch
&&
+
./autogen.sh --prefix=$LO_PREFIX \
--sysconfdir=/etc \
--with-vendor=BLFS \
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
