From 978be508424f9854e829e32b6c538bdb532e8b16 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Tue, 10 May 2022 12:12:14 +0100 Subject: [PATCH] Allow xrdp to be built with --disable-static This PR allows xrdp to be built with --disable-static, which prevents 'make install' installing additional unwanted .a files. --- .github/workflows/build.yml | 4 +++- libpainter | 2 +- librfxcodec | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b02237d..eba7c1ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,12 +52,14 @@ jobs: DISTCHECK: true # Maximal debug 64-bit arch builds + # Check we can also do a static build without + # installing .a files - CC: gcc feature_set: max arch: amd64 os: ubuntu-latest name_extra: and DEBUG - CONF_FLAGS_EXTRA: "--enable-devel-all" + CONF_FLAGS_EXTRA: "--enable-devel-all --disable-static" # Maximal 32-bit arch builds - CC: gcc diff --git a/libpainter b/libpainter index b44f2fac..9a1fffa5 160000 --- a/libpainter +++ b/libpainter @@ -1 +1 @@ -Subproject commit b44f2fac46dc818c441dd540cafb1fdf332ab456 +Subproject commit 9a1fffa55e1dbb1fa6e68677afe366a4d55822eb diff --git a/librfxcodec b/librfxcodec index 79619b69..c77afab7 160000 --- a/librfxcodec +++ b/librfxcodec @@ -1 +1 @@ -Subproject commit 79619b699107a06fad5b3c50a619cb86ab48109e +Subproject commit c77afab7ce06f362b3e5184da78a4fb2396c498e