diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2018-07-07 04:30:13 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2018-07-07 04:30:13 +0000 |
| commit | e6035d688f8fc461d9d5dff81c1fdb9bb7bd27fc (patch) | |
| tree | b4861206486956cfaf8c63aeb343b16fd88138b7 | |
| parent | 403b39cadb9f22161360eca483cebedd13c66fbc (diff) | |
Ensure references to python minor version are correct
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11434 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter06/meson.xml | 6 | ||||
| -rw-r--r-- | chapter06/python.xml | 10 | ||||
| -rw-r--r-- | packages.ent | 1 |
3 files changed, 9 insertions, 8 deletions
diff --git a/chapter06/meson.xml b/chapter06/meson.xml index 884ce847d..fed402f46 100644 --- a/chapter06/meson.xml +++ b/chapter06/meson.xml @@ -52,9 +52,9 @@ <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> @@ -68,7 +68,7 @@ rm -r /usr/lib/python3.7/site-packages/meson-&meson-version;-py3.7.egg/share</us <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> diff --git a/chapter06/python.xml b/chapter06/python.xml index 3aafa110e..e044f339f 100644 --- a/chapter06/python.xml +++ b/chapter06/python.xml @@ -89,14 +89,14 @@ <para>Install the package:</para> <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> - +<!-- ====== Change 7m if Python minor version changes ======= --> <varlistentry> - <term><command>chmod -v 755 /usr/lib/libpython3.{6m.,}so</command></term> + <term><command>chmod -v 755 /usr/lib/libpython3.{7m.,}so</command></term> <listitem> <para>Fix permissions for libraries to be consistent with other libraries.</para> @@ -145,10 +145,10 @@ tar --strip-components=1 \ 2to3, idle3, pydoc3, python3, python3-config, pyvenv </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> </seglistitem> diff --git a/packages.ent b/packages.ent index 4a2fba1b2..f1c324b4d 100644 --- a/packages.ent +++ b/packages.ent @@ -568,6 +568,7 @@ meson pages will be needed: python3.6 and python3.6m --> <!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"> <!ENTITY python-md5 "eb8c2a6b1447d50813c02714af4681f3"> |