From 0665fbaac23445e35e0ee6b3a1a3cc749f389571 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 5 Mar 2024 10:03:30 +0100 Subject: [PATCH] RPCS3: trying to build it with llvm16 --- net.retrodeck.retrodeck.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b2dffa18..d5455f10 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: "6.5" sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm17 # Needed for RPCS3 + - org.freedesktop.Sdk.Extension.llvm16 # Needed for RPCS3 (llvm17 actually) - org.freedesktop.Sdk.Extension.rust-stable # Needed for BoilR command: retrodeck.sh @@ -857,8 +857,11 @@ modules: buildsystem: cmake-ninja builddir: true build-options: - append-ld-library-path: /usr/lib/sdk/llvm17/lib - append-path: /usr/lib/sdk/llvm17/bin + # llvm17 is not available in framework 6.5 but in 6.6, so we're trying llvm16 and cross our fingers until Primehack is updated (as Primehack breaks on 6.6) + #append-ld-library-path: /usr/lib/sdk/llvm17/lib + #append-path: /usr/lib/sdk/llvm17/bin + append-ld-library-path: /usr/lib/sdk/llvm16/lib + append-path: /usr/lib/sdk/llvm16/bin cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fno-omit-frame-pointer @@ -884,7 +887,8 @@ modules: - -DUSE_SYSTEM_ZLIB=ON - -Wno-dev post-install: - - cp /usr/lib/sdk/llvm17/lib/libLLVM-17.so /app/lib/ + #- cp /usr/lib/sdk/llvm17/lib/libLLVM-17.so /app/lib/ + - cp /usr/lib/sdk/llvm16/lib/libLLVM-16.so /app/lib/ - |- set -eux COMM_TAG="$(awk -F'[\{,]' '/version{.*}/{printf "%d.%d.%d", $2, $3, $4}' ../rpcs3/rpcs3_version.cpp)"