[nautilus/gnome-40] Switch to meson for gnome-autoar
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/gnome-40] Switch to meson for gnome-autoar
- Date: Mon, 11 Oct 2021 06:46:15 +0000 (UTC)
commit 83d0922d4a28f726b04dac0eb43fe285b545891a
Author: Ondrej Holy <oholy redhat com>
Date: Tue Aug 10 10:08:01 2021 +0200
Switch to meson for gnome-autoar
Relates: https://gitlab.gnome.org/GNOME/gnome-autoar/-/merge_requests/11
(cherry picked from commit 82f4d0cd94e1b2cd9cbe47580304989f78ccebab)
.gitlab/Dockerfile | 6 +++---
build-aux/flatpak/org.gnome.Nautilus.json | 2 ++
build-aux/flatpak/org.gnome.Nautilus.yml | 2 ++
build-aux/flatpak/org.gnome.NautilusMaster.yml | 2 ++
4 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 8043417d4..def405d43 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -9,9 +9,9 @@ RUN dnf install --nogpg -y gnome-common \
&& dnf clean all \
&& git clone --depth 1 https://gitlab.gnome.org/GNOME/gnome-autoar.git \
&& cd gnome-autoar \
- && ./autogen.sh --prefix /usr \
- && make \
- && make install \
+ && meson . _build --prefix=/usr \
+ && ninja -C _build \
+ && ninja -C _build install \
&& cd .. \
&& rm -rf gnome-autoar
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index 52e6333a7..747291a29 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -100,6 +100,8 @@
},
{
"name": "gnome-autoar",
+ "buildsystem": "meson",
+ "builddir": true,
"sources": [
{
"type": "git",
diff --git a/build-aux/flatpak/org.gnome.Nautilus.yml b/build-aux/flatpak/org.gnome.Nautilus.yml
index 4a15c4c53..5c8dfae03 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.yml
+++ b/build-aux/flatpak/org.gnome.Nautilus.yml
@@ -73,6 +73,8 @@ modules:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
- name: gnome-autoar
+ buildsystem: meson
+ builddir: true
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml
index bc1771627..982cbbdc4 100644
--- a/build-aux/flatpak/org.gnome.NautilusMaster.yml
+++ b/build-aux/flatpak/org.gnome.NautilusMaster.yml
@@ -72,6 +72,8 @@ modules:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-desktop.git
- name: gnome-autoar
+ buildsystem: meson
+ builddir: true
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-autoar.git
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]