From 2158899d5b94dc7171701ee49df439def0d7b1c1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Fri, 21 Jul 2023 19:11:32 +0300 Subject: [PATCH 15/15] Flatpak: Switch to autotools buildsystem Stop defining individual build commands for buildsystem: simple, by switching to buildsystem: autotools See osdn #48430 Signed-off-by: Marko Lindqvist --- platforms/flatpak/org.freeciv.gtk322.yml | 11 +++++++---- platforms/flatpak/org.freeciv.gtk4.yml | 11 +++++++---- platforms/flatpak/org.freeciv.mp.gtk3.yml | 12 ++++++++---- platforms/flatpak/org.freeciv.mp.gtk4.yml | 12 ++++++++---- platforms/flatpak/org.freeciv.qt.yml | 13 +++++++++---- platforms/flatpak/org.freeciv.ruledit.yml | 14 ++++++++++---- platforms/flatpak/org.freeciv.sdl2.yml | 11 +++++++---- 7 files changed, 56 insertions(+), 28 deletions(-) diff --git a/platforms/flatpak/org.freeciv.gtk322.yml b/platforms/flatpak/org.freeciv.gtk322.yml index f1ff23022a..9d7f4341b3 100644 --- a/platforms/flatpak/org.freeciv.gtk322.yml +++ b/platforms/flatpak/org.freeciv.gtk322.yml @@ -13,10 +13,13 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-gtk3.22 - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --enable-client=gtk3.22 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --enable-client=gtk3.22 + - --disable-fcmp + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.gtk4.yml b/platforms/flatpak/org.freeciv.gtk4.yml index 3abfabed92..4588a59afc 100644 --- a/platforms/flatpak/org.freeciv.gtk4.yml +++ b/platforms/flatpak/org.freeciv.gtk4.yml @@ -13,10 +13,13 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-gtk4 - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --enable-client=gtk4 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --enable-client=gtk4 + - --disable-fcmp + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.mp.gtk3.yml b/platforms/flatpak/org.freeciv.mp.gtk3.yml index 9023f02b7c..e8b347727e 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk3.yml +++ b/platforms/flatpak/org.freeciv.mp.gtk3.yml @@ -12,10 +12,14 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-mp-gtk3 - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --enable-fcmp=gtk3 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --enable-fcmp=gtk3 + - --disable-client + - --disable-server + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.mp.gtk4.yml b/platforms/flatpak/org.freeciv.mp.gtk4.yml index e7c7314107..ab52ca2851 100644 --- a/platforms/flatpak/org.freeciv.mp.gtk4.yml +++ b/platforms/flatpak/org.freeciv.mp.gtk4.yml @@ -12,10 +12,14 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-mp-gtk4 - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --enable-fcmp=gtk4 --disable-client --disable-server --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --enable-fcmp=gtk4 + - --disable-client + - --disable-server + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.qt.yml b/platforms/flatpak/org.freeciv.qt.yml index fda69ddf0b..52bdfc33a6 100644 --- a/platforms/flatpak/org.freeciv.qt.yml +++ b/platforms/flatpak/org.freeciv.qt.yml @@ -13,10 +13,15 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-qt - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --with-qtver=qt6 --enable-client=qt --disable-fcmp --disable-ruledit --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --with-qtver=qt6 + - --enable-client=qt + - --disable-fcmp + - --disable-ruledit + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.ruledit.yml b/platforms/flatpak/org.freeciv.ruledit.yml index 76d3b90344..ebcd5abb61 100644 --- a/platforms/flatpak/org.freeciv.ruledit.yml +++ b/platforms/flatpak/org.freeciv.ruledit.yml @@ -11,10 +11,16 @@ finish-args: - --filesystem=~/.freeciv:create modules: - name: freeciv-ruledit - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --with-qtver=qt6 --enable-ruledit --disable-client --disable-fcmp --disable-freeciv-manual --disable-server && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --with-qtver=qt6 + - --enable-ruledit + - --disable-client + - --disable-server + - --disable-fcmp + - --disable-freeciv-manual sources: - type: dir path: ../.. diff --git a/platforms/flatpak/org.freeciv.sdl2.yml b/platforms/flatpak/org.freeciv.sdl2.yml index 26dc977699..0c38124c30 100644 --- a/platforms/flatpak/org.freeciv.sdl2.yml +++ b/platforms/flatpak/org.freeciv.sdl2.yml @@ -19,10 +19,13 @@ modules: url: https://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz sha256: 63e0e01addedc9df2f85b93a248f06e8a04affa014a835c2ea34bfe34e576262 - name: freeciv-sdl2 - buildsystem: simple - build-commands: - - mkdir build - - cd build && ../configure --prefix=/app --enable-client=sdl2 --disable-fcmp --disable-freeciv-manual && make -j$(nproc) && make install + buildsystem: autotools + no-autogen: true + builddir: true + config-opts: + - --enable-client=sdl2 + - --disable-fcmp + - --disable-freeciv-manual sources: - type: dir path: ../.. -- 2.40.1