From d94bd7f471c30552fa04a662f08ce1e8f58caef2 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Mon, 16 Mar 2020 02:17:27 +0000
Subject: [PATCH] add python3-lib-suffix, and use it instead of hardcoding
 cpython-38 everywhere

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22845 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/gobject-introspection.xml | 2 +-
 general/genlib/talloc.xml                | 4 ++--
 general/prog/pycairo.xml                 | 2 +-
 general/prog/pygobject3.xml              | 2 +-
 packages.ent                             | 1 +
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/general/genlib/gobject-introspection.xml b/general/genlib/gobject-introspection.xml
index 38b3001eb8..ea5ba0a3e5 100644
--- a/general/genlib/gobject-introspection.xml
+++ b/general/genlib/gobject-introspection.xml
@@ -159,7 +159,7 @@ ninja</userinput></screen>
         </seg>
         <seg>
           libgirepository-1.0.so and
-          _giscanner.cpython-37m-x86_64-linux-gnu.so
+          _giscanner.&python3-lib-suffix;.so
         </seg>
         <seg>
           /usr/include/gobject-introspection-1.0,
diff --git a/general/genlib/talloc.xml b/general/genlib/talloc.xml
index b2538fa1b6..5f399ada40 100644
--- a/general/genlib/talloc.xml
+++ b/general/genlib/talloc.xml
@@ -134,12 +134,12 @@ make</userinput></screen>
           None
         </seg>
         <seg>
-          libpytalloc-util.cpython-35m-x86-64-linux-gnu.so,
+          libpytalloc-util.&python3-lib-suffix;.so,
           libpytalloc-util.so,
           libtalloc.so,
           <!-- NOTE: The below is Optional now. -->
           talloc.so (Python-2 Module) and
-          talloc.cpython-35m-x86_64-linux-gnu.so (Python-3 Module)
+          talloc.&python3-lib-suffix;.so (Python-3 Module)
         </seg>
         <seg>
           None
diff --git a/general/prog/pycairo.xml b/general/prog/pycairo.xml
index ec190d1663..05cdd67649 100644
--- a/general/prog/pycairo.xml
+++ b/general/prog/pycairo.xml
@@ -137,7 +137,7 @@ python2 setup.py install_pkgconfig      &amp;&amp;-->
           </seg>
           <seg>
             <!--_cairo.so (python2) and -->
-            _cairo.cpython-38m-x86_64-linux-gnu.so 
+            _cairo.&python3-lib-suffix;.so 
           </seg>
           <seg>
             /usr/include/pycairo,
diff --git a/general/prog/pygobject3.xml b/general/prog/pygobject3.xml
index d1327daf03..858f339d8d 100644
--- a/general/prog/pygobject3.xml
+++ b/general/prog/pygobject3.xml
@@ -178,7 +178,7 @@ popd</userinput></screen>
            </seg>
           <seg>
             /usr/lib/python&python2-majorver;/site-packages/gi/_gi{,_cairo}.so and/or
-            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.cpython-38m-&lt;arch&gt;-linux-gnu.so
+            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.&python3-lib-suffix;.so
            </seg>
           <seg>
             /usr/include/pygobject-3.0, and
diff --git a/packages.ent b/packages.ent
index 6dabaaedeb..45cddd4e13 100644
--- a/packages.ent
+++ b/packages.ent
@@ -366,6 +366,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 
 <!ENTITY python2-majorver             "2.7">
 <!ENTITY python3-majorver             "3.8">
+<!ENTITY python3-lib-suffix           "cpython-38-&lt;arch&gt;-linux-gnu">
 
 <!-- Perl module versions used in the Perl Modules instructions
      Please read the Changes file before updating a module.