Merge pull request #194 from aws-lumberyard-dev/lz4-1.9.4-linux-static-library-fix

Fixed lz4 linux build commands to build a static library

package-system/lz4/build_config.json

@@ -2,7 +2,7 @@
     "git_url": "https://github.com/lz4/lz4.git",
     "git_tag": "v1.9.4",
     "package_name": "lz4",
-    "package_version": "1.9.4-rev1",
+    "package_version": "1.9.4-rev2",
     "package_url": "http://lz4.github.io/lz4/",
     "package_license": "BSD-2-Clause",
     "package_license_file": "LICENSE",

package-system/lz4/docker_build_lz4_linux.sh

@@ -10,9 +10,8 @@ lib_name="lz4"
 build_configs=(Release)
 
 cmake_src_dir="src/build/cmake"
-
 # Configure using the Ninja Multi-Config generator
-cmake -S ${cmake_src_dir} -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-fPIC -O2" -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/data/workspace/package
+cmake -S ${cmake_src_dir} -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_FLAGS="-fPIC -O2" -DCMAKE_CXX_STANDARD=17 -DCMAKE_INSTALL_PREFIX=/data/workspace/package -DBUILD_SHARED_LIBS=OFF -DLZ4_BUILD_CLI=OFF -DLZ4_BUILD_LEGACY_LZ4C=OFF
 if [ $? -ne 0 ]; then
     echo "Error configuring cmake for ${lib_name}"
     exit 1

package_build_list_host_linux-aarch64.json

@@ -20,7 +20,7 @@
         "ISPCTexComp-36b80aa-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/ISPCTexComp --platform-name Linux-aarch64 --clean",
         "libsamplerate-0.2.1-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/libsamplerate --platform-name Linux-aarch64 --clean",
         "Lua-5.4.4-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux-aarch64 --clean",
-        "lz4-1.9.4-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py  ../../package-system/lz4 --platform-name Linux-aarch64 --clean",
+        "lz4-1.9.4-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py  ../../package-system/lz4 --platform-name Linux-aarch64 --clean",
         "mcpp-2.7.2_az.1-rev1-linux-aarch64": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
         "mikkelsen-1.0.0.4-linux-aarch64": "package-system/mikkelsen/build_package_image.py --platform linux-aarch64",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux-aarch64": "package-system/NvCloth/build_package_image.py --platform-name linux-aarch64",
@@ -59,7 +59,7 @@
         "ISPCTexComp-36b80aa-rev2-linux-aarch64": "package-system/ISPCTexComp/temp/ISPCTexComp-linux-aarch64",
         "libsamplerate-0.2.1-rev2-linux-aarch64": "package-system/libsamplerate/temp/libsamplerate-linux-aarch64",
         "Lua-5.4.4-rev1-linux-aarch64": "package-system/Lua/temp/Lua-linux-aarch64",
-        "lz4-1.9.4-rev1-linux-aarch64": "package-system/lz4/temp/lz4-linux-aarch64",
+        "lz4-1.9.4-rev2-linux-aarch64": "package-system/lz4/temp/lz4-linux-aarch64",
         "mikkelsen-1.0.0.4-linux-aarch64": "package-system/mikkelsen-linux-aarch64",
         "mcpp-2.7.2_az.1-rev1-linux-aarch64": "package-system/mcpp-linux-aarch64",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux-aarch64": "package-system/NvCloth-linux-aarch64",

package_build_list_host_linux.json

@@ -39,8 +39,7 @@
         "mikkelsen-1.0.0.4-linux": "package-system/mikkelsen/build_package_image.py",
         "qt-5.15.2-rev8-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Qt --platform-name Linux --package-root ../../package-system/Qt/temp --clean",
         "zlib-1.2.11-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
-        "lz4-1.9.4-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux --package-root ../../package-system/lz4/temp --clean",
-        "lz4-1.9.4-rev1-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux-aarch64 --package-root ../../package-system/lz4/temp --clean",
+        "lz4-1.9.4-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/lz4 --platform-name Linux --package-root ../../package-system/lz4/temp --clean",
         "expat-2.4.2-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/expat --platform-name Linux --package-root ../../package-system/expat/temp --clean",
         "vulkan-validationlayers-1.2.198-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/vulkan-validationlayers --platform-name Linux --package-root ../../package-system/vulkan-validationlayers/temp --clean"
     },
@@ -82,8 +81,7 @@
         "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
         "qt-5.15.2-rev8-linux": "package-system/Qt/temp/qt-linux",
         "zlib-1.2.11-rev5-linux": "package-system/zlib-linux",
-        "lz4-1.9.4-rev1-linux": "package-system/lz4/temp/lz4-linux",
-        "lz4-1.9.4-rev1-linux-aarch64": "package-system/lz4/temp/lz4-linux-aarch64",
+        "lz4-1.9.4-rev2-linux": "package-system/lz4/temp/lz4-linux",
         "expat-2.4.2-rev2-linux": "package-system/expat/temp/expat-linux",
         "vulkan-validationlayers-1.2.198-rev1-linux": "package-system/vulkan-validationlayers/temp/vulkan-validationlayers-linux"
     }