From 2fc046772926661438c91a3211daccbef45f2e4b Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Sat, 8 Apr 2023 10:58:58 +0200 Subject: [PATCH 1/3] Update to LLVM 16 --- net.rpcs3.RPCS3.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 30f5e49..37d895b 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -3,7 +3,7 @@ runtime: org.kde.Platform runtime-version: 5.15-22.08 sdk: org.kde.Sdk sdk-extensions: - - org.freedesktop.Sdk.Extension.llvm15 + - org.freedesktop.Sdk.Extension.llvm16 command: rpcs3 rename-desktop-file: rpcs3.desktop rename-appdata-file: rpcs3.metainfo.xml @@ -58,8 +58,8 @@ modules: buildsystem: cmake-ninja builddir: true build-options: - append-ld-library-path: /usr/lib/sdk/llvm15/lib - append-path: /usr/lib/sdk/llvm15/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 From f14ebdf51cd425078ede0bfb251d74327bb3f2bf Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Sat, 6 May 2023 22:17:11 +0200 Subject: [PATCH 2/3] Disable LLVM build --- net.rpcs3.RPCS3.yaml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 37d895b..7f4a9e6 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -74,15 +74,13 @@ modules: ldflags: -fuse-ld=lld config-opts: - -DCMAKE_BUILD_TYPE=RelWithDebInfo - - -DBUILD_LLVM=ON - - -DSTATIC_LINK_LLVM=ON + - -DBUILD_LLVM=OFF - -DUSE_NATIVE_INSTRUCTIONS=OFF - -DUSE_PRECOMPILED_HEADERS=OFF - -DUSE_SYSTEM_CURL=ON - -DUSE_SYSTEM_FFMPEG=ON - -DUSE_SYSTEM_LIBPNG=ON - -DUSE_SYSTEM_ZLIB=ON - - -DITTAPI_SOURCE_DIR=/run/build/rpcs3/ittapi - -Wno-dev post-install: - |- @@ -97,14 +95,3 @@ modules: url: https://github.com/RPCS3/rpcs3.git branch: master commit: 195de818b686c598ee83cf7bac687f9a963074b6 - - type: git - url: https://github.com/intel/ittapi.git - branch: master - commit: 4a3762fbc517475bfb0586efc513e51c164108c9 - dest: ittapi/ittapi - disable-shallow-clone: true - # remove git-lfs hook - - type: inline - dest: ittapi/ittapi/.git/hooks - dest-filename: post-checkout - contents: From 6262695563c4fcf95d496eabb2bef60ef813421d Mon Sep 17 00:00:00 2001 From: Julien Reichardt Date: Sun, 7 May 2023 14:17:21 +0200 Subject: [PATCH 3/3] Update rpcs3.git --- net.rpcs3.RPCS3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.rpcs3.RPCS3.yaml b/net.rpcs3.RPCS3.yaml index 7f4a9e6..79f6400 100644 --- a/net.rpcs3.RPCS3.yaml +++ b/net.rpcs3.RPCS3.yaml @@ -94,4 +94,4 @@ modules: - type: git url: https://github.com/RPCS3/rpcs3.git branch: master - commit: 195de818b686c598ee83cf7bac687f9a963074b6 + commit: ead8e5e0c35c817da21fb7710adf912af42b9b96