Changeset e6035d6

Timestamp:

07/07/2018 04:30:13 AM (5 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 8.3, 8.3-rc1, 8.3-rc2, 8.4, 8.4-rc1, 9.0, 9.0-rc1, 9.1, 9.1-rc1, arm, cross-chap5, ml-11.0, multilib, old-trunk, s6-init, trunk, xry111/arm64, xry111/clfs-ng, xry111/git-transition, xry111/glibc-2.34, xry111/glibc-2.37, xry111/kcfg-revise, xry111/lfs-next, xry111/pip3, xry111/queue-11.3, xry111/rust-wip-20221008, xry111/tester-nohack, xry111/usr-move

Children:

b8b65b7

Parents:

403b39c

Message:

Ensure references to python minor version are correct

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11434 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter06/meson.xml (modified) (2 diffs)
• chapter06/python.xml (modified) (2 diffs)
• packages.ent (modified) (1 diff)

chapter06/meson.xml

@@ -53 +53 @@
     <para>At last, move Meson man pages to correct location:</para>
 
-<screen><userinput remap="install">mv -v /usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share/man/man1/*.1 \
+<screen><userinput remap="install">mv -v /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share/man/man1/*.1 \
       /usr/share/man/man1
-rm -r /usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share</userinput></screen>
+rm -r /usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg/share</userinput></screen>
 
   </sect2>
@@ -69 +69 @@
       <seglistitem>
         <seg>meson, mesonconf, mesonintrospect, mesontest, and wraptool</seg>
-                <seg>/usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg</seg>
+                <seg>/usr/lib/python&python-minor;/site-packages/meson-&meson-version;-py&python-minor;.egg</seg>
       </seglistitem>
     </segmentedlist>

chapter06/python.xml

@@ -90 +90 @@
 
 <screen><userinput remap="install">make install
-chmod -v 755 /usr/lib/libpython3.7m.so
+chmod -v 755 /usr/lib/libpython&python-minor;m.so
 chmod -v 755 /usr/lib/libpython3.so</userinput></screen>
 
     <variablelist>
       <title>The meaning of the install commands:</title>
-
-    <varlistentry>
-      <term><command>chmod -v 755 /usr/lib/libpython3.{6m.,}so</command></term>
+<!-- ======  Change 7m if Python minor version changes ======= -->
+    <varlistentry>
+      <term><command>chmod -v 755 /usr/lib/libpython3.{7m.,}so</command></term>
       <listitem>
         <para>Fix permissions for libraries to be consistent with other
@@ -146 +146 @@
         </seg>
         <seg>
-          libpython3.6m.so and libpython3.so
+          libpython&python-minor;m.so and libpython3.so
         </seg>
         <seg>
-          /usr/include/python3.6m, /usr/lib/python3 and
+          /usr/include/python&python-minor;m, /usr/lib/python3 and
           /usr/share/doc/python-&python-version;
         </seg>

packages.ent

@@ -569 +569 @@
 
 <!ENTITY python-version "3.7.0">
+<!ENTITY python-minor "3.7">
 <!ENTITY python-size "16,526 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">