Ver Fonte

Script updates for png-1.6.37 on Linux aarch64 (ARM64) (#134)

* Update 3P configs for linux-aarch64 support for libpng
* Update Linux cmake generators to use Ninja for consistency

Signed-off-by: Steve Pham <[email protected]>
Steve Pham há 2 anos atrás
pai
commit
60e417faa5

+ 14 - 1
package-system/libpng/build_config.json

@@ -103,7 +103,20 @@
                 ],
                 "cmake_generate_args_release": [
                     "-G",
-                    "Unix\\ Makefiles",
+                    "Ninja",
+                    "-DCMAKE_BUILD_TYPE=Release"
+                ],
+                "custom_test_cmd": [
+                    "./test_png_linux.sh"
+                ]
+            },
+            "Linux-aarch64": {
+                "depends_on_packages" :[
+                    ["zlib-1.2.11-rev5-linux-aarch64", "ce9d1ed2883d77ffc69c7982c078595c1f89ca55ec19d89fe7e6beb05f774775", ""]
+                ],
+                "cmake_generate_args_release": [
+                    "-G",
+                    "Ninja",
                     "-DCMAKE_BUILD_TYPE=Release"
                 ],
                 "custom_test_cmd": [

+ 2 - 0
package_build_list_host_linux-aarch64.json

@@ -5,10 +5,12 @@
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
 	"freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean",
+	"png-1.6.37-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libpng --platform-name Linux-aarch64 --clean",
         "zlib-1.2.11-rev5-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux-aarch64 --clean"
     },
     "build_from_folder": {
 	"freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64",
+        "png-1.6.37-rev2-linux-aarch64":  "package-system/libpng/temp/png-linux-aarch64",
         "zlib-1.2.11-rev5-linux-aarch64": "package-system/zlib/temp/zlib-linux-aarch64"
     }
 }