Forráskód Böngészése

Script updates for AwsIotDeviceSdkCpp-1.15.2 on Linux aarch64 (ARM64) (#140)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 éve
szülő
commit
b8ef402dda

+ 4 - 50
package-system/AwsIotDeviceSdkCpp/build_config.json

@@ -28,14 +28,6 @@
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\"",
                "-DCMAKE_BUILD_TYPE=\"Release\""
             ],
-            "cmake_build_args":[
-               "-j"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-            ],
             "custom_additional_libraries": [
                "Bcrypt",
                "Secur32",
@@ -67,19 +59,11 @@
                "-DBUILD_DEPS=ON",
                "-DS2N_NO_PQ_ASM=ON",
                "-DCMAKE_BUILD_TYPE=Release"
-            ],
-            "custom_additional_compile_definitions":[
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          }
       },
       "Darwin":{
-         "Mac":{,
+         "Mac":{
             "package_version":"1.15.2-rev2",
             "build_configs":[
                "Release"
@@ -96,15 +80,6 @@
             "cmake_build_args":[
                "-j",
                "8"
-            ],
-            "custom_additional_compile_definitions":[
-               
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          },
          "iOS":{
@@ -117,17 +92,6 @@
                "-DCMAKE_OSX_ARCHITECTURES=arm64",
                "-DCMAKE_THREAD_LIBS_INIT=-pthread",
                "-DCMAKE_CXX_FLAGS=\"-fPIC -fno-aligned-allocation\""
-            ],
-            "cmake_build_args":[
-               
-            ],
-            "custom_additional_compile_definitions":[
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
          }
       },
@@ -153,19 +117,9 @@
                "-DCMAKE_CXX_STANDARD=17",
                "-DCMAKE_BUILD_TYPE=Release",
                "-DCMAKE_INSTALL_LIBDIR=\"lib/Release\""
-            ],
-            "cmake_build_args":[
-               "-j"
-            ],
-            "custom_additional_compile_definitions":[
-            ],
-            "custom_additional_link_options":[
-               
-            ],
-            "custom_additional_libraries":[
-               
             ]
-         }
+         },
+         "Linux-aarch64": "@Linux"
       }
    }
-}
+}

+ 2 - 0
package_build_list_host_linux-aarch64.json

@@ -4,6 +4,7 @@
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
     "build_from_source": {
+        "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux-aarch64 --clean",
         "freetype-2.11.1-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux-aarch64 --clean",
         "googlebenchmark-1.5.0-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux-aarch64 --clean",
         "googletest-1.8.1-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux-aarch64 --clean",
@@ -14,6 +15,7 @@
         "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": {
+        "AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64": "package-system/AwsIotDeviceSdkCpp/temp/AwsIotDeviceSdkCpp-linux-aarch64",
         "freetype-2.11.1-rev1-linux-aarch64": "package-system/freetype/temp/freetype-linux-aarch64",
         "googlebenchmark-1.5.0-rev2-linux-aarch64": "package-system/googlebenchmark/temp/googlebenchmark-linux-aarch64",
         "googletest-1.8.1-rev4-linux-aarch64": "package-system/googletest/temp/googletest-linux-aarch64",