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

This commit is contained in:
xargon 2022-06-14 10:08:32 +02:00
parent 381f59013b
commit 3276fa3581

View file

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