Merge pull request #313 from cgwalters/drop-autotools

build-sys: Remove autotools
containers · Aug 20, 2024 · bbda399 · bbda399
2 parents 8e9ea44 + 3255cb5
commit bbda399
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 567 deletions.
diff --git a/.github/workflows/test-meson.yaml b/.github/workflows/test-meson.yaml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1,4 +1,4 @@
-name: Test with autotools
+name: Test with meson
 
 on: [push, pull_request]
 
@@ -8,22 +8,24 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    name: "Build"
+    name: "Build with ASAN"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install dependencies
         run: sudo ./hacking/installdeps.sh
       - name: Install fsck.erofs
         run: sudo apt install erofs-utils
+      - name: Install go-md2man
+        run: sudo apt install go-md2man
       - name: Configure
-        run: ./autogen.sh && ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
+        run: meson setup build --prefix=/usr --werror -Db_sanitize=address,undefined
       - name: Build
-        run: make -j $(nproc) CFLAGS='-fsanitize=address -fsanitize=undefined'
+        run: meson compile -C build
       - name: Unit tests
-        run: make check
+        run: meson test -C build
       - name: Capture build
-        run: make install DESTDIR=$(pwd)/instroot && tar -C instroot -czf composefs.tar .
+        run: DESTDIR=$(pwd)/instroot meson install -C build && tar -C instroot -czf composefs.tar .
       - name: Upload binary
         uses: actions/upload-artifact@v2
         with:
@@ -32,18 +34,18 @@ jobs:
   # This build doesn't enable ASAN, which e.g. makes it easier to use with Rust
   build-noasan:
     runs-on: ubuntu-latest
-    name: "Build"
+    name: "Build without ASAN"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Install dependencies
         run: sudo ./hacking/installdeps.sh
       - name: Configure
-        run: ./autogen.sh && ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
+        run: meson setup build --prefix=/usr --werror
       - name: Build
-        run: make -j $(nproc)
+        run: meson compile -C build
       - name: Capture build
-        run: make install DESTDIR=$(pwd)/instroot && tar -C instroot -czf composefs.tar .
+        run: DESTDIR=$(pwd)/instroot meson install -C build && tar -C instroot -czf composefs.tar .
       - name: Upload binary
         uses: actions/upload-artifact@v2
         with:
@@ -61,11 +63,10 @@ jobs:
           apt-get update -y
           ALLOW_MISSING="libfsverity-dev" ./hacking/installdeps.sh
       - name: Configure
-        run: |
-          ./autogen.sh
-          ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH) CFLAGS='-Wall -Werror'
+        run: meson setup build --werror
       - name: Build
-        run: make -j $(nproc) CFLAGS='-fsanitize=address -fsanitize=undefined'
+        # focal's meson is too old for 'meson compile'
+        run: ninja -C build
   build-unit-cross:
     runs-on: ubuntu-latest
     name: Build on ${{ matrix.arch }}
@@ -99,10 +100,9 @@ jobs:
           run: |
             apt-get update -y
             ./hacking/installdeps.sh
-            ./autogen.sh
-            ./configure CFLAGS='-Wall -Werror'
-            make -j $(nproc)
-            make check
+            meson setup build --werror
+            meson compile -C build
+            meson test -C build --timeout-multiplier 10
   integration:
     needs: build
     runs-on: ubuntu-latest
@@ -163,6 +163,6 @@ jobs:
       - name: Install dependencies
         run: sudo ./hacking/installdeps.sh
       - name: Configure
-        run: ./autogen.sh && ./configure CFLAGS='-Wall -Werror'
+        run: meson setup build --werror
       - name: Run make distcheck
-        run: make -j$(nproc) distcheck
+        run: meson dist -C build
diff --git a/Makefile.am b/Makefile.am
diff --git a/autogen.sh b/autogen.sh
diff --git a/composefs.spec.in b/composefs.spec.in
@@ -11,7 +11,7 @@ License:        GPL-3.0-or-later AND LGPL-2.0-or-later AND Apache-2.0
 URL:            https://github.com/containers/composefs
 Source0:        https://github.com/containers/composefs/releases/download/v%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gcc automake libtool openssl-devel fuse3-devel
+BuildRequires:  gcc meson openssl-devel fuse3-devel
 %if %{with man}
 BuildRequires:  go-md2man
 %endif
@@ -43,6 +43,8 @@ Library files for %{name}.
 %autosetup
 
 %build
+%meson
+%meson_build
 %configure \
            --disable-static \
 %if %{with man}
@@ -52,8 +54,7 @@ Library files for %{name}.
 %make_build
 
 %install
-%make_install
-rm -rf %{buildroot}%{_libdir}/libcomposefs.la
+%meson_install
 
 %files devel
 %{_includedir}/libcomposefs