Rename stdlib _queue init if gevent present

Author: jayvdb

pyoxidizer/Cargo.toml

@@ -36,6 +36,7 @@ hex = "0.3"
 itertools = "0.8"
 lazy_static = "1.3"
 libc = "0.2"
+memmap = "0.7"
 object = { version = "0.15.0", features = ["read", "std", "write"] }
 regex = "1"
 reqwest = "0.9"

pyoxidizer/src/pyrepackager/repackage.rs

@@ -13,6 +13,7 @@ use std::fs;
 use std::fs::create_dir_all;
 use std::io::{BufRead, BufReader, Cursor, Error as IOError, Read, Write};
 use std::path::{Path, PathBuf};
+use memmap::{Mmap};
 
 use super::bytecode::{BytecodeCompiler, CompileMode};
 use super::config::{
@@ -1121,8 +1122,12 @@ fn make_config_c(
             if init_fn == "NULL" {
                 continue;
             }
-
-            lines.push(format!("extern PyObject* {}(void);", init_fn));
+            if init_fn == "PyInit__queue" && built_extension_modules.contains_key("gevent._queue") {
+                lines.push("extern PyObject* PyInit_stdlib_queue(void);".to_string());
+            }
+            else {
+                lines.push(format!("extern PyObject* {}(void);", init_fn));
+            }
         }
     }
 
@@ -1146,9 +1151,13 @@ fn make_config_c(
             if init_fn == "NULL" {
                 continue;
             }
-
-            lines.push(format!("{{\"{}\", {}}},", em.module, init_fn));
-            ambiguous_init_fns.push(init_fn.to_string());
+            if init_fn == "PyInit__queue" && built_extension_modules.contains_key("gevent._queue") {
+                lines.push("{\"_queue\", PyInit_stdlib_queue},".to_string());
+            }
+            else {
+                lines.push(format!("{{\"{}\", {}}},", em.module, init_fn));
+                ambiguous_init_fns.push(init_fn.to_string());
+            }
         }
     }
 
@@ -1310,7 +1319,10 @@ pub fn link_libpython(
     );
     for (name, em) in extension_modules {
         if let Some(init_fn) = &em.init_fn {
-            if init_fn != "NULL" {
+            if init_fn == "PyInit__queue" && built_extension_modules.contains_key("gevent._queue") {
+                ambiguous_init_fns.push("PyInit_stdlib_queue".to_string());
+            }
+            else if init_fn != "NULL" {
                 ambiguous_init_fns.push(init_fn.to_string());
             }
         }
@@ -1326,8 +1338,23 @@ pub fn link_libpython(
             name,
             em.object_paths
         );
+
         for path in &em.object_paths {
-            build.object(path);
+            let mut out_path = path.clone();
+            if path.ends_with("_queuemodule.o") && built_extension_modules.contains_key("gevent._queue") {
+                out_path = temp_dir_path.join(format!("{}_stdlib_prefixed.o", path.display()));
+
+                let file = fs::File::open(&path).unwrap();
+                let object_data = unsafe { Mmap::map(&file).unwrap() };
+
+                match rename_init(logger, &"stdlib_queue".to_string(), &object_data) {
+                    Ok(val) => fs::write(&out_path, val).expect("unable to write object file"),
+                    Err(err) => {
+                        println!("Failed to rename symbol in '{}': {}", path.display(), err);
+                    }
+                };
+            }
+            build.object(out_path);
         }
 
         for entry in &em.links {