Build libposix with Ninja

Author: fangerer

graalpython/com.oracle.graal.python.cext/setup.py

@@ -562,29 +562,6 @@ def build_nativelibsupport(capi_home, subdir, libname, deps=[], **kwargs):
             ext_modules=[module],
         )
 
-def build_libposix(capi_home):
-    src_dir = os.path.join(__dir__, "posix")
-    files = [os.path.abspath(os.path.join(src_dir, f)) for f in os.listdir(src_dir) if f.endswith(".c")]
-    no_gnu_source = get_config_var("USE_GNU_SOURCE")
-    if no_gnu_source:
-        get_config_vars()["CFLAGS"] = get_config_var("CFLAGS_DEFAULT")
-    module = Extension(libposix_name,
-                       sources=files,
-                       libraries=['crypt'] if not darwin_native else [],
-                       extra_compile_args=cflags_warnings + ['-Wall', '-Werror'])
-    args = [verbosity, 'build', 'install_lib', '-f', '--install-dir=%s' % capi_home, "clean", "--all"]
-    setup(
-        script_name='setup' + libposix_name,
-        script_args=args,
-        name=libposix_name,
-        version='1.0',
-        description="Graal Python's Native support for the POSIX library",
-        ext_modules=[module],
-    )
-    if no_gnu_source:
-        get_config_vars()["CFLAGS"] = get_config_var("CFLAGS_DEFAULT") + " " + get_config_var("USE_GNU_SOURCE")
-
-
 def build_builtin_exts(capi_home):
     args = [verbosity, 'build', 'install_lib', '-f', '--install-dir=%s/modules' % capi_home, "clean", "--all"]
     distutil_exts = [(ext, ext()) for ext in builtin_exts]
@@ -628,7 +605,6 @@ def stripped_object_filenames(*args, **kwargs):
         build_libhpy(capi_home)
         if WIN32:
             return # TODO: ...
-        build_libposix(capi_home)
         build_nativelibsupport(capi_home,
                                 subdir="bz2",
                                 libname="libbz2support",

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java

@@ -335,7 +335,7 @@ public byte callByte(NFIPosixSupport posix, PosixNativeFunction function, Object
         // Temporary - will be replaced with something else when we move this to Truffle
         private static String getLibPath(PythonContext context) {
             CompilerAsserts.neverPartOfCompilation();
-            String libPythonName = NFIPosixSupport.SUPPORTING_NATIVE_LIB_NAME + context.getSoAbi().toJavaStringUncached();
+            String libPythonName = NFIPosixSupport.SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt();
             TruffleFile homePath = context.getEnv().getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
             TruffleFile file = homePath.resolve(libPythonName);
             return file.getPath();

graalpython/com.oracle.graal.python.cext/posix/fork_exec.c renamed to graalpython/python-libposix/src/fork_exec.c

@@ -908,7 +908,7 @@ int32_t set_sockaddr_un_members(int8_t *addr, int8_t *path, int32_t pathLen) {
 int64_t call_crypt(const char *word, const char *salt, int32_t *len) {
     const char *result = crypt(word, salt);
     if (result == NULL) {
-        return NULL;
+        return 0;
     }
     *len = strlen(result);
     return (int64_t)(uintptr_t)result;

graalpython/com.oracle.graal.python.cext/posix/posix.c renamed to graalpython/python-libposix/src/posix.c

@@ -543,6 +543,35 @@
             },
         },
 
+        "python-libposix": {
+            "subDir": "graalpython",
+            "native": "shared_lib",
+            "deliverable": "posix",
+            "buildDependencies": [],
+            "cflags": [
+                "-DNDEBUG", "-g", "-O3", "-Wall", "-Werror",
+            ],
+            "os_arch": {
+                "windows": {
+                    "<others>": {
+                        # "/Z7", "/O2", "/WX", # cflags to replace -g -O3 -Werror
+                        "defaultBuild": False,
+                    },
+                },
+                "darwin": {
+                    "<others>": {
+                        "defaultBuild": True,
+                    },
+                },
+                "<others>": {
+                    "<others>": {
+                        "ldlibs": ["-lcrypt"],
+                        "defaultBuild" : True,
+                    },
+                },
+            },
+        },
+
         "python-lib": {
             "class": "ArchiveProject",
             "outputDir": "graalpython/lib-python/3",
@@ -739,6 +768,7 @@
             "dependencies": [
                 "com.oracle.graal.python.cext",
                 "python-libzsupport",
+                "python-libposix",
             ],
             "os_arch": {
                 "windows": {
@@ -763,6 +793,11 @@
                                     "dependency": "graalpython:python-libzsupport",
                                     "path": "*",
                                 },
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "graalpython:python-libposix",
+                                    "path": "*",
+                                },
                             ],
                             "./lib-graalpython/modules/graalpy_virtualenv": [
                                 "file:graalpy_virtualenv/graalpy_virtualenv",
@@ -796,6 +831,11 @@
                                     "dependency": "graalpython:python-libzsupport",
                                     "path": "*",
                                 },
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "graalpython:python-libposix",
+                                    "path": "*",
+                                },
                             ],
                             "./lib/graalpy<graal_ver:major_minor_nodot>/modules/graalpy_virtualenv": [
                                 "file:graalpy_virtualenv/graalpy_virtualenv",