From 5a7d53cbd3f3722a984b6e4716c20393eb908b1d Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 12 Aug 2021 16:12:31 +0100 Subject: [PATCH] Add a few more dev packages to workflow, setup PKG_CONFIG_PATH Signed-off-by: falkTX --- .github/workflows/example-plugins.yml | 13 ++++++++----- .github/workflows/makefile.yml | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/example-plugins.yml b/.github/workflows/example-plugins.yml index 3ff00eba..e6a1b730 100644 --- a/.github/workflows/example-plugins.yml +++ b/.github/workflows/example-plugins.yml @@ -25,12 +25,13 @@ jobs: echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-arm64.list sudo apt-get update -qq - sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxext-dev:arm64 qemu-user-static + sudo apt-get install -yq g++-aarch64-linux-gnu libasound2-dev:arm64 libcairo2-dev:arm64 libgl1-mesa-dev:arm64 liblo-dev:arm64 libpulse-dev:arm64 libx11-dev:arm64 libxcursor-dev:arm64 libxext-dev:arm64 libxrandr-dev:arm64 qemu-user-static - name: Build linux arm64 cross-compiled env: CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ LDFLAGS: -static-libgcc -static-libstdc++ + PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig run: | make features make -j $(nproc) @@ -57,12 +58,13 @@ jobs: echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list echo "deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports bionic-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list.d/ports-armhf.list sudo apt-get update -qq - sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxext-dev:armhf qemu-user-static + sudo apt-get install -yq g++-arm-linux-gnueabihf libasound2-dev:armhf libcairo2-dev:armhf libgl1-mesa-dev:armhf liblo-dev:armhf libpulse-dev:armhf libx11-dev:armhf libxcursor-dev:armhf libxext-dev:armhf libxrandr-dev:armhf qemu-user-static - name: Build linux armhf cross-compiled env: CC: arm-linux-gnueabihf-gcc CXX: arm-linux-gnueabihf-g++ LDFLAGS: -static-libgcc -static-libstdc++ + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig run: | make features make -j $(nproc) @@ -85,12 +87,13 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update -qq - sudo apt-get install -yq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxext-dev:i386 + sudo apt-get install -yq g++-multilib libasound2-dev:i386 libcairo2-dev:i386 libgl1-mesa-dev:i386 liblo-dev:i386 libpulse-dev:i386 libx11-dev:i386 libxcursor-dev:i386 libxext-dev:i386 libxrandr-dev:i386 - name: Build linux x86 env: CFLAGS: -m32 CXXFLAGS: -m32 LDFLAGS: -m32 -static-libgcc -static-libstdc++ + PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig run: | make features make -j $(nproc) @@ -111,7 +114,7 @@ jobs: submodules: recursive - name: Set up dependencies run: | - sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev + sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev - name: Build linux x86_64 env: LDFLAGS: -static-libgcc -static-libstdc++ @@ -144,7 +147,7 @@ jobs: LDFLAGS: -arch x86_64 -arch arm64 -mmacosx-version-min=10.12 run: | make features - make -j $(sysctl -n hw.logicalcpu) + make NOOPT=true -j $(sysctl -n hw.logicalcpu) ./utils/package-osx-bundles.sh - name: Set sha8 id: slug diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index e9d12d3a..36dccc7e 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -19,7 +19,7 @@ jobs: submodules: recursive - name: Set up dependencies run: | - sudo apt-get install -yq libasound2-dev libgl1-mesa-dev liblo-dev libpulse-dev xvfb + sudo apt-get install -yq libasound2-dev libcairo2-dev libgl1-mesa-dev liblo-dev libpulse-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev xvfb - name: Without any warnings env: CFLAGS: -Werror