Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build-sys: Remove autotools #313

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Conversation

cgwalters
Copy link
Contributor

meson is better, basically.

Closes: #301

@alexlarsson
Copy link
Collaborator

LGTM.
Can we remove the spec file too, as we're not doing the version replace during dist anyway.

@cgwalters cgwalters marked this pull request as ready for review August 19, 2024 15:48
meson is better, basically.

Closes: containers#301
Signed-off-by: Colin Walters <walters@verbum.org>
@cgwalters
Copy link
Contributor Author

Can we remove the spec file too, as we're not doing the version replace during dist anyway.

Hmm...I personally don't like maintaining spec files in upstream (any more than debian/rules or bitbake recipes, etc...). But that said https://packit.dev/ which is used by other container projects seems to prefer this (although I think it can fetch from the relevant distro dist-gits too).

For now I just made a best effort to update it, but I actually tried updating the fedora spec, and I needed to do this FTR:

diff --git a/composefs.spec b/composefs.spec
index b638b0a..cda03ca 100644
--- a/composefs.spec
+++ b/composefs.spec
@@ -3,7 +3,7 @@
 %endif
 
 Name:           composefs
-Version:        1.0.4
+Version:        1.0.5
 Release:        2%{?dist}
 Summary:        Tools to handle creating and mounting composefs images
 
@@ -43,21 +43,14 @@ Library files for %{name}.
 
 %prep
 %autosetup -p1
-# for go-md2man patch
-autoreconf -fiv
 
 %build
-%configure \
-           --disable-static \
-%if %{with man}
-           --enable-man \
-%endif
-           --with-fuse
-%make_build
+%meson --default-library=shared -Dfuse=enabled -Dman=enabled 
+%meson_build
 
 %install
-%make_install
-rm -rf %{buildroot}%{_libdir}/libcomposefs.la
+%meson_install
+rm -v $RPM_BUILD_ROOT/%{_libdir}/libcomposefs*.a
 
 %files devel
 %{_includedir}/libcomposefs

I also stumbled on the fact that while we tried to do meson in 1.0.5, I built the release with autotools and we didn't dist the meson rules in the tarball...we could fix that of course, but probably better to just pull the trigger on this.

@alexlarsson alexlarsson merged commit bbda399 into containers:main Aug 20, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

dropping autotools build
2 participants