makepanda: fix ABI flags not being stripped from PYTHONVERSION

makepanda/makepackage.py

@@ -867,7 +867,7 @@ def MakeInstallerFreeBSD(version, runtime=False, python_versions=[], **kwargs):
         oscmd("rm -f %s/tmp/python_dep" % outputdir)
 
         if "PYTHONVERSION" in SDK:
-            pyver_nodot = SDK["PYTHONVERSION"][6:].replace('.', '')
+            pyver_nodot = SDK["PYTHONVERSION"][6:].rstrip('dmu').replace('.', '')
         else:
             pyver_nodot = "%d%d" % (sys.version_info[:2])
 

makepanda/makepandacore.py

@@ -3586,7 +3586,7 @@ def GetCurrentPythonVersionInfo():
 
     from distutils.sysconfig import get_python_lib
     return {
-        "version": SDK["PYTHONVERSION"][6:],
+        "version": SDK["PYTHONVERSION"][6:].rstrip('dmu'),
         "soabi": GetPythonABI(),
         "ext_suffix": GetExtensionSuffix(),
         "executable": sys.executable,