Add lib64 dir as a lib directory with -L if it exists

Author: jwiltse

src/portable_python/__init__.py

@@ -507,9 +507,20 @@ def deps(self):
         return self.setup.folders.deps
 
     @property
-    def deps_lib(self):
+    def deps_lib_dir(self):
         return self.deps / "lib"
 
+    @property
+    def deps_lib64_dir(self):
+        return self.deps / "lib64"
+
+    @property
+    def deps_lib_dirs(self):
+        lib_dirs = [self.deps_lib_dir]
+        if self.deps_lib64_dir.exists():
+            lib_dirs.append(self.deps_lib64_dir)
+        return lib_dirs
+
     def xenv_CPATH(self):
         folder = self.deps / "include"
         if folder.exists():
@@ -522,7 +533,7 @@ def xenv_CPATH(self):
 
     def xenv_LDFLAGS(self):
         if self.modules.selected:
-            yield f"-L{self.deps_lib}"
+            yield from (f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
 
     def xenv_PATH(self):
         yield f"{self.deps}/bin"
@@ -536,7 +547,7 @@ def xenv_LD_LIBRARY_PATH(self):
     def xenv_PKG_CONFIG_PATH(self):
         yield from os.environ.get("PKG_CONFIG_PATH", "").split(":")
         if self.modules.selected:
-            yield f"{self.deps_lib}/pkgconfig"
+            yield f"{self.deps_lib_dir}/pkgconfig"
 
     def _do_run(self, program, *args, fatal=True, env=None):
         return runez.run(program, *args, passthrough=self._log_handler, stdout=None, stderr=None, fatal=fatal, env=env)
@@ -747,10 +758,12 @@ def _prepare(self):
         # Some libs get funky permissions for some reason
         super()._prepare()
         self.setup.ensure_clean_folder(self.install_folder)
-        for path in runez.ls_dir(self.deps_lib):
-            if not path.name.endswith(".la"):
-                expected = 0o755 if path.is_dir() else 0o644
-                current = path.stat().st_mode & 0o777
-                if current != expected:
-                    LOG.info("Corrected permissions for %s (was %s)", runez.short(path), oct(current))
-                    path.chmod(expected)
+
+        for lib_dir in self.deps_lib_dirs:
+            for path in runez.ls_dir(lib_dir):
+                if not path.name.endswith(".la"):
+                    expected = 0o755 if path.is_dir() else 0o644
+                    current = path.stat().st_mode & 0o777
+                    if current != expected:
+                        LOG.info("Corrected permissions for %s (was %s)", runez.short(path), oct(current))
+                        path.chmod(expected)

src/portable_python/cpython.py

@@ -107,7 +107,7 @@ def url(self):
         return f"https://www.python.org/ftp/python/{self.version.main}/Python-{self.version}.tar.xz"
 
     def xenv_LDFLAGS_NODIST(self):
-        yield f"-L{self.deps_lib}"
+        yield from (f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
         if PPG.target.is_linux:
             yield "-Wl,-z,origin"
             # rpath intentionally long to give 'patchelf' some room
@@ -139,7 +139,7 @@ def c_configure_args(self):
 
         if not self.has_configure_opt("--with-system-ffi"):
             if self.active_module(LibFFI):
-                yield f"LIBFFI_INCLUDEDIR={self.deps_lib}"
+                yield f"LIBFFI_INCLUDEDIR={self.deps_lib_dir}"
                 yield "--with-system-ffi=no"
 
             else:
@@ -163,7 +163,9 @@ def c_configure_args(self):
             # TODO: this doesn't seem to be enough, on macos cpython's ./configure still picks up the shared macos tcl/tk libs
             version = Version(tkinter.version)
             yield f"--with-tcltk-includes=-I{self.deps}/include"
-            yield f"--with-tcltk-libs=-L{self.deps_lib} -ltcl{version.mm} -ltk{version.mm}"
+
+            lib_dir_flags = " ".join(f"-L{lib_dir}" for lib_dir in self.deps_lib_dirs)
+            yield f"--with-tcltk-libs={lib_dir_flags} -ltcl{version.mm} -ltk{version.mm}"
 
     @runez.cached_property
     def prefix_lib_folder(self):

src/portable_python/external/tkinter.py

@@ -53,7 +53,7 @@ def xenv_CFLAGS(self):
     def c_configure_args(self):
         yield "--enable-shared=no"
         yield "--enable-threads"
-        yield f"--with-tcl={self.deps_lib}"
+        yield f"--with-tcl={self.deps_lib_dir}"
         yield "--without-x"
         if PPG.target.is_macos:  # pragma: no cover, tcl/tk is "best effort"
             yield "--enable-aqua=yes"
@@ -89,8 +89,8 @@ def xenv_CFLAGS(self):
     def c_configure_args(self):
         yield "--enable-shared=no"
         yield "--enable-threads"
-        yield f"--with-tcl={self.deps_lib}"
-        yield f"--with-tk={self.deps_lib}"
+        yield f"--with-tcl={self.deps_lib_dir}"
+        yield f"--with-tk={self.deps_lib_dir}"
         yield "--without-x"
 
     def _do_linux_compile(self):