linux-from-scratch/glfs
1
0
Fork 0
mirror of https://github.com/Zeckmathederg/glfs.git synced 2025-01-24 06:52:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade subversion-1.14.0; add py3c

Browse Source 
git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23213 af4574ff-66df-0310-9fd7-8a98e5e911e0
This commit is contained in:
Thomas Trepl 2020-05-29 09:43:04 +00:00
parent 26cceda543
commit 3aee187cf8
7 changed files with 205 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
general.ent
View File

@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
<!ENTITY day "28"> <!-- Always 2 digits -->
<!ENTITY day "29"> <!-- Always 2 digits -->
<!ENTITY month "05"> <!-- Always 2 digits -->
<!ENTITY year "2020">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
<!ENTITY releasedate "May 28th, &year;">
<!ENTITY releasedate "May 29th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->

149
general/prog/py3c.xml Normal file
View File

@ -0,0 +1,149 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
<!ENTITY py3c-download-http
"https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
<!ENTITY py3c-md5sum "95be2e17f0541de2ba3e1b68dee4a9da">
<!ENTITY py3c-size "44.7 KB">
<!ENTITY py3c-buildsize "229.5 KB">
<!ENTITY py3c-time "less than 0.1 SBU">
]>
<!-- Begin Py3c -->
<sect2 id="py3c" xreflabel="Py3c-&py3c-version;">
<title>Py3c-&py3c-version;</title>
<indexterm zone="py3c">
<primary sortas="a-Py3c">Py3c</primary>
</indexterm>
<sect3 role="package">
<title>Introduction to Py3c</title>
<para>
<application>Py3c</application> helps you port C extensions to
Python 3. It provides a detailed guide, and a set of macros to
make porting easy and reduce boilerplate.
</para>
&lfs91_checked;
<bridgehead renderas="sect4">Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
<para>
Download (HTTP): <ulink url="&py3c-download-http;"/>
</para>
</listitem>
<!--
<listitem>
<para>
Download (FTP): <ulink url="&py3c-download-ftp;"/>
</para>
</listitem>
-->
<listitem>
<para>
Download MD5 sum: &py3c-md5sum;
</para>
</listitem>
<listitem>
<para>
Download size: &py3c-size;
</para>
</listitem>
<listitem>
<para>
Estimated disk space required: &py3c-buildsize;
</para>
</listitem>
<listitem>
<para>
Estimated build time: &py3c-time;
</para>
</listitem>
</itemizedlist>
<!--
<bridgehead renderas="sect4">Py3c Dependencies</bridgehead>
<bridgehead renderas="sect5">Required</bridgehead>
<para role="required">
<xref linkend="pygobject3"/>
</para>
<bridgehead renderas="sect5">Recommended</bridgehead>
<para role="recommended">
<xref linkend="at-spi2-core"/>
</para>
<bridgehead renderas="sect5">Optional</bridgehead>
<para role="optional">
<xref linkend="python2"/>
</para>
-->
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/py3c"/>
</para>
</sect3>
<sect3 role="installation">
<title>Installation of Py3c</title>
<para>
The <application>Py3c</application> is a headers-only package
and because of that, no configuration and compilation is
required.
</para>
<para>
To test the package, issue: <command>make test-python3</command>.
</para>
<para>
To install the <application>Python 3</application> module,
run the following command as the
<systemitem class="username">root</systemitem> user:
</para>
<!-- Note:
When doing a DESTDIR install, use "make prefix=$DESTDIR/usr install"
but the installed py3c.pc file will contain an invalid path for the
includedir.
So either do a "sed -e "s:@includedir@:/usr/include:" -i py3c.pc.in
before exec the make-install or fix that path in the installed
file $DESTDIR/usr/share/pkgconfig/py3c.pc afterwards.
-->
<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
</sect3>
<sect3 role="content">
<title>Contents</title>
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
None
</seg>
<seg>
None
</seg>
<seg>
/usr/include/py3c
</seg>
</seglistitem>
</segmentedlist>
</sect3>
</sect2>
<!-- End Py3c -->

8
general/prog/python-modules.xml
View File

@ -44,6 +44,11 @@
<xref linkend="docutils"/>
</para>
</listitem>
<listitem>
<para>
<xref linkend="py3c"/>
</para>
</listitem>
<listitem>
<para>
<xref linkend="pyatspi2"/>
@ -161,6 +166,9 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="docutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="py3c.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="pyatspi2.xml"/>
<!--

47
general/prog/subversion.xml
View File

@ -128,6 +128,7 @@
<xref linkend="gnome-keyring"/>,
<xref linkend="libsecret"/>,
<!-- <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support), -->
<xref linkend="py3c"/> (for tests)
<xref linkend="python2"/> (with sqlite support for the tests),
<xref linkend="ruby"/>,
<xref linkend="swig"/> (for building Perl, Python and Ruby bindings),
@ -140,8 +141,7 @@
One of <xref linkend="openjdk"/>,
<ulink url="http://www.inet.no/dante/">Dante</ulink> or
<ulink url="http://jikes.sourceforge.net/">Jikes</ulink>,
and <ulink url="https://junit.org/junit4/">JUnit 4</ulink>
(to test the Java bindings). Note that JUnit is included with
<ulink url="https://junit.org/junit4/">JUnit 4</ulink> (to test the Java bindings) and
<xref linkend="apache-ant"/>.
</para>
@ -196,9 +196,15 @@ make</userinput></screen>
<screen remap="doc"><userinput>doxygen doc/doxygen.conf</userinput></screen>
<para>
If you passed the <option>--enable-javahl</option> parameter to
<command>configure</command> and wish to build the Java bindings, issue
the following command:
If you wish to build the Java bindings pass the <option>--enable-javahl</option>
parameter to the <command>configure</command> command. In addition, if
you want to run the Java test suite, you have to specify the location
of the <application>JUnit</application> file by adding
<option>--with-junit=&lt;path to junit jar&gt;</option> (for
instance <option>--with-junit=/usr/local/java/lib/junit-4.13.jar</option>)
to <command>configure</command>. The JUnit jar file is no longer
included in <xref linkend="apache-ant"/> and must be downloaded seperatly.
To build the Java bindings, issue the following command:
</para>
<para>
<screen><command>make javahl</command></screen>
@ -206,14 +212,14 @@ make</userinput></screen>
<para>
If you want to compile <application>Perl</application>,
<application>Python2</application>, or <application>Ruby</application>
<application>Python</application>, or <application>Ruby</application>
bindings, issue any of the following command:
</para>
<para>
<screen><command>make swig-pl</command> # for <application>Perl</application>
<command>make swig-py \
swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command> # for <application>Python</application>
swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command> # for <application>Python</application>
<command>make swig-rb</command> # for <application>Ruby</application></screen>
</para>
@ -224,14 +230,16 @@ make</userinput></screen>
<para>
To test the results of the Java bindings build,
issue <command>make check-javahl</command>. The
<application>JUnit</application> testing framework must be installed,
issue <command>LANG=C make check-javahl</command>.
<!-- ~~ This explanation is added to the configure above ~~
The <application>JUnit</application> testing framework must be installed,
and the location of the JUnit jar has to be specified by passing the
<option>--with-junit=&lt;path to junit jar&gt;</option> parameter to
<option>- -with-junit=&lt;path to junit jar&gt;</option> parameter to
<command>configure</command>. Note that <application>JUnit</application>
is included in <xref linkend="apache-ant"/>, and can be accessed by
passing <option>--with-junit=/opt/ant/lib/junit-4.12.jar</option>
passing <option>- -with-junit=/opt/ant/lib/junit-4.12.jar</option>
to <command>configure</command>.
-->
</para>
<para>
@ -241,13 +249,6 @@ make</userinput></screen>
<command>make check-swig-py</command>, or
<command>make check-swig-rb</command>.
</para>
<!-- I can no longer confirm this with 9.0-rc1 -renodr
<note><para>
The Python Bindings test suite (<command>make check-swig-py</command>)
is broken with SWIG-4.0.0, however the bindings themselves work as
expected.
</para></note>
-->
<para>
Now, as the <systemitem class="username">root</systemitem> user:
@ -268,7 +269,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></
<para>
If you built the <application>Perl</application>,
<application>Python2</application>, or
<application>Python</application>, or
<application>Ruby</application> bindings, issue any of the following
commands as the <systemitem class="username">root</systemitem> user
to install them:
@ -276,8 +277,8 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></
<para>
<screen><command>make install-swig-pl</command>
<command>make install-swig-py \
swig_pydir=/usr/lib/python&python2-majorver;/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python&python2-majorver;/site-packages/svn</command>
swig_pydir=/usr/lib/python&python3-majorver;/site-packages/libsvn \
swig_pydir_extra=/usr/lib/python&python3-majorver;/site-packages/svn</command>
<command>make install-swig-rb</command></screen>
</para>
@ -385,7 +386,7 @@ cp -v -R doc/* /usr/share/doc/subversion-&subversion-version;</userinput></
<seg>
/usr/include/subversion-1,
/usr/lib/perl5/site_perl/&lfs-perl-version;/{,auto/}SVN,
/usr/lib/python2.7/site-packages/{libsvn,svn},
/usr/lib/python&python3-majorver;/site-packages/{libsvn,svn},
/usr/lib/ruby/site_ruby/&lt;x.y.z&gt;/{,&lt;arch-linux&gt;-linux/}svn,
/usr/lib/svn-javahl, and
/usr/share/doc/subversion-&subversion-version;

7
general/prog/swig.xml
View File

@ -127,16 +127,17 @@
make</userinput></screen>
<para>
To test the results, issue: <command>make -k check TCL_INCLUDE=</command>.
To test the results, issue: <command>PY3=1 make -k check TCL_INCLUDE=</command>.
The unsetting of the variable <envar>TCL_INCLUDE</envar> is
necessary since it is not correctly set by
<emphasis>configure</emphasis>. The tests are only executed for the
languages installed on your machine, so the disk space and SBU values
given for the tests may vary, and should be considered as mere orders of
magnitude. If you have <xref linkend="python2"/> installed, the Python-3
magnitude. <!-- Phase out P2 support
If you have <xref linkend="python2"/> installed, the Python-3
tests are not run. You can run tests for Python-3 by issuing
<command>PY3=1 make check-python-examples</command> followed by
<command>PY3=1 make check-python-test-suite</command>. According to
<command>PY3=1 make check-python-test-suite</command>. --> According to
<application>SWIG</application>'s documentation, the failure of some
tests should not be considered harmful.
</para>

16
introduction/welcome/changelog.xml
View File

@ -41,6 +41,22 @@
</itemizedlist>
</listitem>
-->
<listitem>
<para>May 29th, 2020</para>
<itemizedlist>
<listitem>
<para>[thomas] - Upgrade subversion-1.14.0. Drop description of Python2 bindings. Fixes
<ulink url="&blfs-ticket-root;13584">#13584</ulink>.</para>
</listitem>
<listitem>
<para>[thomas] - Make swig using Python3.</para>
</listitem>
<listitem>
<para>[thomas] - Add Python module py3c-1.1 (needed by subversion).</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>May 28th, 2020</para>
<itemizedlist>

3
packages.ent
View File

@ -363,7 +363,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY rust-version "1.42.0">
<!ENTITY scons-version "3.1.2">
<!ENTITY slang-version "2.3.2">
<!ENTITY subversion-version "1.13.0">
<!ENTITY subversion-version "1.14.0">
<!ENTITY swig-version "4.0.1">
<!ENTITY tcl-version "8.6.10">
<!ENTITY tk-version "8.6.10">
@ -547,6 +547,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
<!ENTITY lxml-version "4.5.1">
<!ENTITY mako-version "1.1.2">
<!ENTITY MarkupSafe-version "1.1.1">
<!ENTITY py3c-version "1.1">
<!ENTITY pyatspi2-version "2.36.0">
<!--<!ENTITY py2cairo-version "1.10.0"> -->
<!ENTITY pycairo2-version "1.18.2">