Skip to content

Commit 9db46bf

Browse files
committed
fix: remove patchelf relevant code
- after migrating to the new discord social SDk, no patchelf is needed anymore, as the SONAME is set correctly
1 parent 3778769 commit 9db46bf

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

.github/workflows/musl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Install dependencies
3333
run: |
3434
apk update
35-
apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev patchelf ${{ ( matrix.config.use-clang == true ) && 'clang19' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }}
35+
apk add wget meson ca-certificates samurai git openssl-dev openssl pkgconf sdl2 sdl2-dev sdl2_mixer-dev sdl2_ttf-dev sdl2_mixer-dev sdl2_image-dev dbus-dev ${{ ( matrix.config.use-clang == true ) && 'clang19' || 'gcc g++' }} ${{ ( matrix.config.use-clang == true && matrix.config.use-clang_stdlib == true ) && 'libc++ libc++-dev llvm-libunwind llvm-libunwind-dev ' || '' }}
3636
echo "CC=${{ matrix.config.use-clang == true && 'clang-19' || 'gcc' }}" >> "$GITHUB_ENV"
3737
echo "CXX=${{ matrix.config.use-clang == true && 'clang++-19' || 'g++' }}" >> "$GITHUB_ENV"
3838

io.github.openbrickprotocolfoundation.oopetris.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ runtime-version: '24.08'
44
sdk: org.freedesktop.Sdk
55
command: oopetris
66
modules:
7-
#TODO: remove after discord sets SONAME
8-
- name: patchelf
9-
buildsystem: simple
10-
sources:
11-
- type: archive
12-
url: https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0.tar.gz
13-
sha256: 64de10e4c6b8b8379db7e87f58030f336ea747c0515f381132e810dbf84a86e7
14-
build-commands:
15-
- ./configure --prefix=/app
16-
- make
17-
- make install
18-
197
- name: OOPetris
208
buildsystem: meson
219
config-opts:
@@ -42,13 +30,6 @@ cleanup:
4230
- /include
4331
- /lib/pkgconfig
4432
- /share/pkgconfig
45-
## all for the patchelf executable
46-
#TODO: remove after removing patchelf build
47-
- /bin/patchelf
48-
- /lib/debug
49-
- /share/doc
50-
- /share/man
51-
- /share/zsh
5233

5334
finish-args:
5435
- --socket=x11

0 commit comments

Comments
 (0)