Build libzsupport with Ninja

fangerer · fangerer · commit 21445a81ffdf · 2023-06-29T10:32:47.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/setup.py b/graalpython/com.oracle.graal.python.cext/setup.py
@@ -629,10 +629,6 @@ def stripped_object_filenames(*args, **kwargs):
         if WIN32:
             return # TODO: ...
         build_libposix(capi_home)
-        build_nativelibsupport(capi_home,
-                                subdir="zlib",
-                                libname="libzsupport",
-                                libs=['z'])
         build_nativelibsupport(capi_home,
                                 subdir="bz2",
                                 libname="libbz2support",
diff --git a/graalpython/python-libzsupport/src/zlib.c b/graalpython/python-libzsupport/src/zlib.c
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -1610,13 +1610,21 @@ def py_version_short(*args):
 def graal_version_short(*args):
     return GRAAL_VERSION
 
+def graalpy_ext(arg):
+    if arg == "soabi":
+        # TODO(fa): do properly
+        return ".graalpy231-310-native-x86_64-darwin.so"
+    raise ValueError("unknown ext type requested: " + arg)
+
 
 mx_subst.path_substitutions.register_with_arg('suite', _get_suite_dir)
 mx_subst.path_substitutions.register_with_arg('src_dir', _get_src_dir)
 mx_subst.path_substitutions.register_with_arg('output_root', _get_output_root)
 mx_subst.path_substitutions.register_with_arg('py_ver', py_version_short)
 mx_subst.path_substitutions.register_with_arg('graal_ver', graal_version_short)
 
+mx_subst.string_substitutions.register_with_arg('ext', graalpy_ext)
+
 
 def delete_self_if_testdownstream(args):
     """
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -519,6 +519,30 @@
             },
         },
 
+        "python-libzsupport": {
+            "subDir": "graalpython",
+            "native": "shared_lib",
+            "deliverable": "zsupport",
+            "buildDependencies": [],
+            "cflags": [
+                "-DNDEBUG", "-g", "-O3", "-Werror",
+            ],
+            "ldlibs": ["-lz"],
+            "os_arch": {
+                "windows": {
+                    "<others>": {
+                        # "/Z7", "/O2", "/WX", # cflags to replace -g -O3 -Werror
+                        "defaultBuild": False,
+                    },
+                },
+                "<others>": {
+                    "<others>": {
+                        "defaultBuild" : True,
+                    },
+                },
+            },
+        },
+
         "python-lib": {
             "class": "ArchiveProject",
             "outputDir": "graalpython/lib-python/3",
@@ -714,6 +738,7 @@
             ],
             "dependencies": [
                 "com.oracle.graal.python.cext",
+                "python-libzsupport",
             ],
             "os_arch": {
                 "windows": {
@@ -733,6 +758,11 @@
                                     "dependency": "graalpython:com.oracle.graal.python.cext",
                                     "path": "*",
                                 },
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "graalpython:python-libzsupport",
+                                    "path": "*",
+                                },
                             ],
                             "./lib-graalpython/modules/graalpy_virtualenv": [
                                 "file:graalpy_virtualenv/graalpy_virtualenv",
@@ -761,6 +791,11 @@
                                     "path": "*",
                                     "exclude": ["CEXT-WINDOWS-README.md"],
                                 },
+                                {
+                                    "source_type": "dependency",
+                                    "dependency": "graalpython:python-libzsupport",
+                                    "path": "*",
+                                },
                             ],
                             "./lib/graalpy<graal_ver:major_minor_nodot>/modules/graalpy_virtualenv": [
                                 "file:graalpy_virtualenv/graalpy_virtualenv",
