Continue battling meson

Signed-off-by: falkTX <[email protected]>
DISTRHO · Dec 9, 2023 · 51ffd3c · 51ffd3c
1 parent 9b05819
commit 51ffd3c
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,10 +43,11 @@ jobs:
           ./.github/workflows/bootstrap-deps.sh ${{ matrix.target }}
       - name: Build
         env:
-          #LDFLAGS: -static-libgcc -static-libstdc++
+          LDFLAGS: -static-libgcc -static-libstdc++
           PKG_CONFIG_PATH: /usr/lib/${{ matrix.pkgprefix }}/pkgconfig
         run: |
-          meson setup build --buildtype=release --prefix=/usr --cross-file scripts/meson/${{ matrix.target }}.ini
+          meson setup build --buildtype=release --prefix=/usr --cross-file scripts/meson/${{ matrix.target }}.ini \
+            -Dbuild-lv2=true -Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-juce61-only=true -Doptimizations=false
           ninja -C build
       - name: Install
         run: |
@@ -59,23 +60,23 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/') != true
         run: |
           echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
-      - name: Pack binaries
-        run: |
-          tar czf ${{ github.event.repository.target }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C ${{ env.DESTDIR }}/usr/lib lv2 vst vst3
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.event.repository.target }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
-          path: |
-            *.tar.gz
-      - uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: false
-          files: |
-            *.tar.gz
+      #- name: Pack binaries
+        #run: |
+          #tar czf ${{ github.event.repository.target }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C ${{ env.DESTDIR }}/usr/lib lv2 vst vst3
+      #- uses: actions/upload-artifact@v3
+        #with:
+          #name: ${{ github.event.repository.target }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
+          #path: |
+            #*.tar.gz
+      #- uses: softprops/action-gh-release@v1
+        #if: startsWith(github.ref, 'refs/tags/')
+        #with:
+          #tag_name: ${{ github.ref_name }}
+          #name: ${{ github.ref_name }}
+          #draft: false
+          #prerelease: false
+          #files: |
+            #*.tar.gz
 
   windows:
     strategy:

diff --git a/.github/workflows/irc.yml b/.github/workflows/irc.yml
diff --git a/scripts/generate-ttl.sh b/scripts/generate-ttl.sh
@@ -18,27 +18,27 @@ if [ -z "${MESON_EXE_WRAPPER}" ]; then
 
     elif echo "${fileout}" | grep -q "ARM aarch64"; then
         if [ "$(uname -m)" != "aarch64" ]; then
-            MESON_EXE_WRAPPER="qemu-aarch64-static"
+            MESON_EXE_WRAPPER="qemu-aarch64-static -L /usr/lib/aarch64-linux-gnu"
         fi
 
     elif echo "${fileout}" | grep -q "ARM"; then
         if [ "$(uname -m)" != "arm" ] && [ "$(uname -m)" != "armv7l" ]; then
-            MESON_EXE_WRAPPER="qemu-arm-static"
+            MESON_EXE_WRAPPER="qemu-arm-static -L /usr/lib/arm-linux-gnueabihf"
         fi
 
     elif echo "${fileout}" | grep -q "Intel 80386"; then
         if [ "$(uname -m)" != "i386" ] && [ "$(uname -m)" != "i686" ]; then
-            MESON_EXE_WRAPPER="qemu-i386-static"
+            MESON_EXE_WRAPPER="qemu-i386-static -L /usr/lib/i386-linux-gnu"
         fi
 
     elif echo "${fileout}" | grep -q "RISC-V"; then
         if [ "$(uname -m)" != "riscv64" ]; then
-            MESON_EXE_WRAPPER="qemu-riscv64-static"
+            MESON_EXE_WRAPPER="qemu-riscv64-static -L /usr/lib/riscv64-linux-gnu"
         fi
 
     elif echo "${fileout}" | grep -q "x86-64"; then
         if [ "$(uname -m)" != "x86_64" ]; then
-            MESON_EXE_WRAPPER="qemu-x86_64-static"
+            MESON_EXE_WRAPPER="qemu-x86_64-static -L /usr/lib/x86_64-linux-gnu"
         fi
 
     else

diff --git a/scripts/meson/linux-aarch64.ini b/scripts/meson/linux-aarch64.ini
@@ -7,7 +7,7 @@ nm = 'aarch64-linux-gnu-gcc-nm'
 ld = 'aarch64-linux-gnu-ld'
 strip = 'aarch64-linux-gnu-strip'
 pkgconfig = 'pkg-config'
-exe_wrapper = 'qemu-aarch64-static'
+exe_wrapper = 'qemu-aarch64-static -L /usr/lib/aarch64-linux-gnu'
 
 [host_machine]
 system = 'linux'

diff --git a/scripts/meson/linux-armhf.ini b/scripts/meson/linux-armhf.ini
@@ -7,7 +7,7 @@ nm = 'arm-linux-gnueabihf-gcc-nm'
 ld = 'arm-linux-gnueabihf-ld'
 strip = 'arm-linux-gnueabihf-strip'
 pkgconfig = 'pkg-config'
-exe_wrapper = 'qemu-arm-static'
+exe_wrapper = 'qemu-arm-static -L /usr/lib/arm-linux-gnueabihf'
 
 [host_machine]
 system = 'linux'

diff --git a/scripts/meson/linux-i686.ini b/scripts/meson/linux-i686.ini
@@ -7,7 +7,7 @@ nm = 'i686-linux-gnu-gcc-nm'
 ld = 'i686-linux-gnu-ld'
 strip = 'i686-linux-gnu-strip'
 pkgconfig = 'pkg-config'
-exe_wrapper = 'qemu-i386-static'
+exe_wrapper = 'qemu-i386-static -L /usr/lib/i386-linux-gnu'
 
 [host_machine]
 system = 'linux'

diff --git a/scripts/meson/linux-riscv64.ini b/scripts/meson/linux-riscv64.ini
@@ -7,7 +7,7 @@ nm = 'riscv64-linux-gnu-gcc-nm'
 ld = 'riscv64-linux-gnu-ld'
 strip = 'riscv64-linux-gnu-strip'
 pkgconfig = 'pkg-config'
-exe_wrapper = 'qemu-riscv64-static'
+exe_wrapper = 'qemu-riscv64-static -L /usr/lib/riscv64-linux-gnu'
 
 [host_machine]
 system = 'linux'

diff --git a/scripts/meson/linux-x86_64.ini b/scripts/meson/linux-x86_64.ini
@@ -7,7 +7,7 @@ nm = 'x86_64-linux-gnu-gcc-nm'
 ld = 'x86_64-linux-gnu-ld'
 strip = 'x86_64-linux-gnu-strip'
 pkgconfig = 'pkg-config'
-exe_wrapper = 'qemu-x86_64-static'
+exe_wrapper = 'qemu-x86_64-static -L /usr/lib/x86_64-linux-gnu'
 
 [host_machine]
 system = 'linux'