Răsfoiți Sursa

Fix shiboken shared library load issue on Linux when using the ShaderManagementConsole (#17699)

- Update packages for pyside2 with rpath fixes
- Add linker flags to exes to disable 'new-dtags' in order to set RPATH over RUNPATH
- Add disable dtags to arm64/clang and x64_64/snap

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 1 an în urmă
părinte
comite
8749168e1f

+ 1 - 1
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux_aarch64.cmake

@@ -42,7 +42,7 @@ ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-linux-aarch64
 ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev3-linux-aarch64                        TARGETS astc-encoder                PACKAGE_HASH 60ef2a8adc15767dc263860e1e3befc2f3acea26987442a7e80783f1b2158c73)
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev2-linux-aarch64                     TARGETS ISPCTexComp                 PACKAGE_HASH c29aafa32f13839a394424cf674b5cdb323fab22bcca43c38b43adfe13fc415c)
 ly_associate_package(PACKAGE_NAME lz4-1.9.4-rev2-linux-aarch64                               TARGETS lz4                         PACKAGE_HASH 725ca4a02bcf961dc68fb525d0509c311536b5a0f0f9885244fab282cdc55d1f)
-ly_associate_package(PACKAGE_NAME pyside2-5.15.2.1-py3.10-rev4-linux-aarch64                 TARGETS pyside2                     PACKAGE_HASH cc54c4783a645003a74e6a276c75b64b3eaee39f576423f4ebce0130621e2916)
+ly_associate_package(PACKAGE_NAME pyside2-5.15.2.1-py3.10-rev7-linux-aarch64                 TARGETS pyside2                     PACKAGE_HASH 3210d697299d9c943ac4dfddb95513a7781d8505da0f241f445bd15101529e69)
 ly_associate_package(PACKAGE_NAME SQLite-3.37.2-rev1-linux-aarch64                           TARGETS SQLite                      PACKAGE_HASH 5cc1fd9294af72514eba60509414e58f1a268996940be31d0ab6919383f05118)
 ly_associate_package(PACKAGE_NAME AwsIotDeviceSdkCpp-1.15.2-rev1-linux-aarch64               TARGETS AwsIotDeviceSdkCpp          PACKAGE_HASH 0bac80fc09094c4fd89a845af57ebe4ef86ff8d46e92a448c6986f9880f9ee62)
 ly_associate_package(PACKAGE_NAME vulkan-validationlayers-1.2.198-rev1-linux-aarch64         TARGETS vulkan-validationlayers     PACKAGE_HASH e67a15a95e14397ccdffd70d17f61079e5720fea22b0d21e135497312419a23f)

+ 1 - 1
cmake/3rdParty/Platform/Linux/BuiltInPackages_linux_x86_64.cmake

@@ -42,7 +42,7 @@ ly_associate_package(PACKAGE_NAME squish-ccr-deb557d-rev1-linux
 ly_associate_package(PACKAGE_NAME astc-encoder-3.2-rev2-linux                       TARGETS astc-encoder                PACKAGE_HASH 71549d1ca9e4d48391b92a89ea23656d3393810e6777879f6f8a9def2db1610c)
 ly_associate_package(PACKAGE_NAME ISPCTexComp-36b80aa-rev1-linux                    TARGETS ISPCTexComp                 PACKAGE_HASH 065fd12abe4247dde247330313763cf816c3375c221da030bdec35024947f259)
 ly_associate_package(PACKAGE_NAME lz4-1.9.4-rev2-linux                              TARGETS lz4                         PACKAGE_HASH 5d7e5d087c224dd26edb19deaa73673eefa2dc73f40d0709739e60f2ad35060b)
-ly_associate_package(PACKAGE_NAME pyside2-5.15.2.1-py3.10-rev6-linux                TARGETS pyside2                     PACKAGE_HASH 0e39a7f775e87516bf241acec2fbc437ed6b1fd2b99282d2490e0df7882ec567)
+ly_associate_package(PACKAGE_NAME pyside2-5.15.2.1-py3.10-rev7-linux                TARGETS pyside2                     PACKAGE_HASH bae4598cb5579d835e90e8435181bb3c5222449ce9c2665143a618dac6122be7)
 ly_associate_package(PACKAGE_NAME SQLite-3.37.2-rev1-linux                          TARGETS SQLite                      PACKAGE_HASH bee80d6c6db3e312c1f4f089c90894436ea9c9b74d67256d8c1fb00d4d81fe46)
 ly_associate_package(PACKAGE_NAME AwsIotDeviceSdkCpp-1.15.2-rev1-linux              TARGETS AwsIotDeviceSdkCpp          PACKAGE_HASH 83fc1711404d3e5b2faabb1134e97cc92b748d8b87ff4ea99599d8c750b8eff0)
 ly_associate_package(PACKAGE_NAME vulkan-validationlayers-1.2.198-rev1-linux        TARGETS vulkan-validationlayers     PACKAGE_HASH 9195c7959695bcbcd1bc1dc5c425c14639a759733b3abe2ffa87eb3915b12c71)

+ 2 - 0
cmake/Platform/Linux/Configurations_linux_aarch64.cmake

@@ -26,6 +26,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             -fpie
             -Wl,-z,relro,-z,now
             -Wl,-z,noexecstack
+            -Wl,--disable-new-dtags
     )
 
     ly_set(CMAKE_CXX_EXTENSIONS OFF)
@@ -52,6 +53,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             ${LY_GCC_GPROF_LFLAGS}
             -Wl,--no-undefined
             -lpthread
+            -Wl,--disable-new-dtags
     )
     ly_set(CMAKE_CXX_EXTENSIONS OFF)
 

+ 2 - 0
cmake/Platform/Linux/Configurations_linux_x86_64.cmake

@@ -37,6 +37,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
                 -fpie
                 -Wl,-z,relro,-z,now
                 -Wl,-z,noexecstack
+                -Wl,--disable-new-dtags
                 -L$ENV{SNAP}/lib/x86_64-linux-gnu
                 -L$ENV{SNAP}/usr/lib/x86_64-linux-gnu
         )
@@ -59,6 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
                 -fpie
                 -Wl,-z,relro,-z,now
                 -Wl,-z,noexecstack
+                -Wl,--disable-new-dtags
         )
     endif()