From bc96321f0ce57043bd277ae471ac6d0a913885a0 Mon Sep 17 00:00:00 2001
From: xargon <xargonwan@gmail.com>
Date: Tue, 14 Jun 2022 10:35:10 +0200
Subject: [PATCH] Removed rpcs3-llvm as llvm is already included in flatpak
 enviro - fix1

---
 net.retrodeck.retrodeck.yml | 100 ++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 06fbdb23..efad30ed 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -880,61 +880,61 @@ modules:
 
   # llvm13 is already included in the flathub enviornment, letś see if it's working correctly as this module fails
 
-  # - name: rpcs3-llvm
-  #   buildsystem: cmake-ninja
-  #   builddir: true
-  #   build-options:
-  #     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
-  #     cflags-override: true
-  #     cxxflags: -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 -msse -msse2 -mcx16
-  #     cxxflags-override: true
-  #     env:
-  #       AR: llvm-ar
-  #       CC: clang
-  #       CXX: clang++
-  #       RANLIB: llvm-ranlib
-  #     ldflags: -fuse-ld=lld
-  #     prepend-ld-library-path: /usr/lib/sdk/llvm14/lib
-  #     prepend-path: /usr/lib/sdk/llvm14/bin
-  #   config-opts:
-  #     - -DCMAKE_BUILD_TYPE=Release
-  #     - -DBUILD_SHARED_LIBS=OFF
-  #     - -DLLVM_CCACHE_BUILD=ON
-  #     - -DLLVM_TARGETS_TO_BUILD='X86'
-  #     - -DLLVM_BUILD_RUNTIME=OFF
-  #     - -DLLVM_BUILD_TOOLS=OFF
-  #     - -DLLVM_INCLUDE_DOCS=OFF
-  #     - -DLLVM_INCLUDE_EXAMPLES=OFF
-  #     - -DLLVM_INCLUDE_TESTS=OFF
-  #     - -DLLVM_INCLUDE_TOOLS=OFF
-  #     - -DLLVM_INCLUDE_UTILS=OFF
-  #     - -DLLVM_USE_INTEL_JITEVENTS=ON
-  #     - -DLLVM_USE_PERF=ON
-  #     - -DLLVM_ENABLE_Z3_SOLVER=OFF
-  #     - -DCMAKE_CXX_STANDARD=17
-  #     - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi
-  #     - -Wno-dev
-  #   cleanup:
-  #     - '*'
-  #   sources:
-  #     - type: git
-  #       url: https://github.com/RPCS3/llvm-mirror.git
-  #       commit: c725f494c91611018f5d830eca22c0a1662c0f31
-  #     - type: git
-  #       url: https://github.com/intel/ittapi.git
-  #       dest: ittapi/ittapi
-  #       disable-shallow-clone: true
+  #  - name: rpcs3-llvm
+  #    buildsystem: cmake-ninja
+  #    builddir: true
+  #    build-options:
+  #      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
+  #      cflags-override: true
+  #      cxxflags: -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 -msse -msse2 -mcx16
+  #      cxxflags-override: true
+  #      env:
+  #        AR: llvm-ar
+  #        CC: clang
+  #        CXX: clang++
+  #        RANLIB: llvm-ranlib
+  #      ldflags: -fuse-ld=lld
+  #      prepend-ld-library-path: /usr/lib/sdk/llvm14/lib
+  #      prepend-path: /usr/lib/sdk/llvm14/bin
+  #    config-opts:
+  #      - -DCMAKE_BUILD_TYPE=Release
+  #      - -DBUILD_SHARED_LIBS=OFF
+  #      - -DLLVM_CCACHE_BUILD=ON
+  #      - -DLLVM_TARGETS_TO_BUILD='X86'
+  #      - -DLLVM_BUILD_RUNTIME=OFF
+  #      - -DLLVM_BUILD_TOOLS=OFF
+  #      - -DLLVM_INCLUDE_DOCS=OFF
+  #      - -DLLVM_INCLUDE_EXAMPLES=OFF
+  #      - -DLLVM_INCLUDE_TESTS=OFF
+  #      - -DLLVM_INCLUDE_TOOLS=OFF
+  #      - -DLLVM_INCLUDE_UTILS=OFF
+  #      - -DLLVM_USE_INTEL_JITEVENTS=ON
+  #      - -DLLVM_USE_PERF=ON
+  #      - -DLLVM_ENABLE_Z3_SOLVER=OFF
+  #      - -DCMAKE_CXX_STANDARD=17
+  #      - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi
+  #      - -Wno-dev
+  #    cleanup:
+  #      - '*'
+  #    sources:
+  #      - type: git
+  #        url: https://github.com/RPCS3/llvm-mirror.git
+  #        commit: c725f494c91611018f5d830eca22c0a1662c0f31
+  #      - type: git
+  #        url: https://github.com/intel/ittapi.git
+  #        dest: ittapi/ittapi
+  #        disable-shallow-clone: true
 
   - name: rpcs3
     buildsystem: cmake-ninja
     builddir: true
     build-options:
-      append-ld-library-path: /usr/lib/sdk/llvm14/lib
-      append-path: /usr/lib/sdk/llvm14/bin
+      append-ld-library-path: /usr/lib/sdk/llvm13/lib
+      append-path: /usr/lib/sdk/llvm13/bin
       cflags: *optflags
       cflags-override: true
       cxxflags: *optflags