Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-23 14:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed rpcs3-llvm as llvm is already included in flatpak enviro - fix1

Browse source
This commit is contained in:
xargon 2022-06-14 10:35:10 +02:00
parent 1346c8cef9
commit bc96321f0c
1 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
net.retrodeck.retrodeck.yml
View file

@ -880,61 +880,61 @@ modules:
# llvm13 is already included in the flathub enviornment, letś see if it's working correctly as this module fails # llvm13 is already included in the flathub enviornment, letś see if it's working correctly as this module fails
# - name: rpcs3-llvm # - name: rpcs3-llvm
# buildsystem: cmake-ninja # buildsystem: cmake-ninja
# builddir: true # builddir: true
# build-options: # build-options:
# cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong # cflags: &optflags -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
# -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
# -fcf-protection -fno-omit-frame-pointer # -fcf-protection -fno-omit-frame-pointer
# cflags-override: true # cflags-override: true
# cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong # cxxflags: -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
# -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection # -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
# -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16 # -fcf-protection -fno-omit-frame-pointer -msse -msse2 -mcx16
# cxxflags-override: true # cxxflags-override: true
# env: # env:
# AR: llvm-ar # AR: llvm-ar
# CC: clang # CC: clang
# CXX: clang++ # CXX: clang++
# RANLIB: llvm-ranlib # RANLIB: llvm-ranlib
# ldflags: -fuse-ld=lld # ldflags: -fuse-ld=lld
# prepend-ld-library-path: /usr/lib/sdk/llvm14/lib # prepend-ld-library-path: /usr/lib/sdk/llvm14/lib
# prepend-path: /usr/lib/sdk/llvm14/bin # prepend-path: /usr/lib/sdk/llvm14/bin
# config-opts: # config-opts:
# - -DCMAKE_BUILD_TYPE=Release # - -DCMAKE_BUILD_TYPE=Release
# - -DBUILD_SHARED_LIBS=OFF # - -DBUILD_SHARED_LIBS=OFF
# - -DLLVM_CCACHE_BUILD=ON # - -DLLVM_CCACHE_BUILD=ON
# - -DLLVM_TARGETS_TO_BUILD='X86' # - -DLLVM_TARGETS_TO_BUILD='X86'
# - -DLLVM_BUILD_RUNTIME=OFF # - -DLLVM_BUILD_RUNTIME=OFF
# - -DLLVM_BUILD_TOOLS=OFF # - -DLLVM_BUILD_TOOLS=OFF
# - -DLLVM_INCLUDE_DOCS=OFF # - -DLLVM_INCLUDE_DOCS=OFF
# - -DLLVM_INCLUDE_EXAMPLES=OFF # - -DLLVM_INCLUDE_EXAMPLES=OFF
# - -DLLVM_INCLUDE_TESTS=OFF # - -DLLVM_INCLUDE_TESTS=OFF
# - -DLLVM_INCLUDE_TOOLS=OFF # - -DLLVM_INCLUDE_TOOLS=OFF
# - -DLLVM_INCLUDE_UTILS=OFF # - -DLLVM_INCLUDE_UTILS=OFF
# - -DLLVM_USE_INTEL_JITEVENTS=ON # - -DLLVM_USE_INTEL_JITEVENTS=ON
# - -DLLVM_USE_PERF=ON # - -DLLVM_USE_PERF=ON
# - -DLLVM_ENABLE_Z3_SOLVER=OFF # - -DLLVM_ENABLE_Z3_SOLVER=OFF
# - -DCMAKE_CXX_STANDARD=17 # - -DCMAKE_CXX_STANDARD=17
# - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi # - -DITTAPI_SOURCE_DIR=/run/build/rpcs3-llvm/ittapi
# - -Wno-dev # - -Wno-dev
# cleanup: # cleanup:
# - '*' # - '*'
# sources: # sources:
# - type: git # - type: git
# url: https://github.com/RPCS3/llvm-mirror.git # url: https://github.com/RPCS3/llvm-mirror.git
# commit: c725f494c91611018f5d830eca22c0a1662c0f31 # commit: c725f494c91611018f5d830eca22c0a1662c0f31
# - type: git # - type: git
# url: https://github.com/intel/ittapi.git # url: https://github.com/intel/ittapi.git
# dest: ittapi/ittapi # dest: ittapi/ittapi
# disable-shallow-clone: true # disable-shallow-clone: true
- name: rpcs3 - name: rpcs3
buildsystem: cmake-ninja buildsystem: cmake-ninja
builddir: true builddir: true
build-options: build-options:
append-ld-library-path: /usr/lib/sdk/llvm14/lib append-ld-library-path: /usr/lib/sdk/llvm13/lib
append-path: /usr/lib/sdk/llvm14/bin append-path: /usr/lib/sdk/llvm13/bin
cflags: *optflags cflags: *optflags
cflags-override: true cflags-override: true
cxxflags: *optflags cxxflags: *optflags