From 53237b2aa093bca3385ccd765810bbb259f68afd Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Wed, 12 Jan 2022 05:14:06 +0000
Subject: [PATCH] Headless build tweaks

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9c5e93b..c7d0edb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env linux-aarch64; popd
           make features
-          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true -j $(nproc)
           make unzipfx
       - name: Set sha8
         id: slug
@@ -102,7 +102,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env linux-armhf; popd
           make features
-          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true -j $(nproc)
           make unzipfx
       - name: Set sha8
         id: slug
@@ -149,7 +149,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env linux-i686; popd
           make features
-          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true -j $(nproc)
           make unzipfx
       - name: Set sha8
         id: slug
@@ -188,7 +188,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env linux; popd
           make features
-          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true SKIP_RTAUDIO_FALLBACK=true WITH_LTO=true -j $(nproc)
           make unzipfx
       - name: Set sha8
         id: slug
@@ -239,7 +239,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
+          sudo apt-get install -yqq liblo-dev
       - name: Build linux x86_64 (headless)
         run: |
           make features
@@ -285,7 +285,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env macos-universal; popd
           make features
-          make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(sysctl -n hw.logicalcpu)
+          make NOOPT=true WITH_LTO=true -j $(sysctl -n hw.logicalcpu)
           ./dpf/utils/package-osx-bundles.sh
       - name: Set sha8
         id: slug
@@ -326,19 +326,22 @@ jobs:
           sudo apt-get install -yqq g++-aarch64-linux-gnu libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static
       - name: Build extra dependencies
         env:
+          EXTRA_FLAGS: -mcpu=cortex-a72.cortex-a53 -mtune=cortex-a72.cortex-a53 -mfix-cortex-a53-835769 -mfix-cortex-a53-843419
           PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig
         run: |
           ./deps/PawPaw/bootstrap-cardinal.sh linux-aarch64
       - name: Build linux arm64 cross-compiled
+        env:
+          EXTRA_FLAGS: -mcpu=cortex-a72.cortex-a53 -mtune=cortex-a72.cortex-a53 -mfix-cortex-a53-835769 -mfix-cortex-a53-843419
         run: |
           pushd deps/PawPaw; source local.env linux-aarch64; popd
           make features
           # fancy dance to skip building Standalone and VSTs
-          make HEADLESS=true NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) carla deps plugins dpf/utils/lv2_ttl_generator
-          make HEADLESS=true NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) -C src rack.a
-          make HEADLESS=true NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) -C src/CardinalFX lv2
-          make HEADLESS=true NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) -C src/CardinalSynth lv2
-          make HEADLESS=true NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc) -C plugins resources
+          make HEADLESS=true NOOPT=true WITH_LTO=true -j $(nproc) carla deps plugins dpf/utils/lv2_ttl_generator
+          make HEADLESS=true NOOPT=true WITH_LTO=true -j $(nproc) -C src rack.a
+          make HEADLESS=true NOOPT=true WITH_LTO=true -j $(nproc) -C src/CardinalFX lv2 resources
+          make HEADLESS=true NOOPT=true WITH_LTO=true -j $(nproc) -C src/CardinalSynth lv2
+          make HEADLESS=true NOOPT=true WITH_LTO=true -j $(nproc) -C plugins resources
           ./dpf/utils/generate-ttl.sh
       - name: Set sha8
         id: slug
@@ -352,6 +355,9 @@ jobs:
           path: |
             *.tar.gz
 
+  # modduo: -mcpu=cortex-a7 -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard -mvectorize-with-neon-quad
+  # moddwarf: -mcpu=cortex-a35 -mtune=cortex-a35
+
   win32:
     runs-on: ubuntu-20.04
     steps:
@@ -383,7 +389,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win32; popd
           make features
-          make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"
@@ -426,7 +432,7 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win64; popd
           make features
-          make NOOPT=true WITH_LTO=true WITH_PAWPAW=true -j $(nproc)
+          make NOOPT=true WITH_LTO=true -j $(nproc)
       - name: Set sha8
         id: slug
         run: echo "::set-output name=sha8::$(echo ${{ github.sha }} | cut -c1-8)"