El 27/10/24 a las 17:20, Andrea Pappacoda escribió:
Try to replace "$dir/muon" with "$dir/muon-bootstrap", as suggested by Vincent
Torri;
I believe it should fix the issue (of course the build/muon invocations in
dh_auto_build need to be changed too).
Ok, I confirm that the attached patch works for me (and I also agree that
it makes sense).
Thanks.
diff -Nru muon-meson-0.3.0/debian/changelog muon-meson-0.3.0/debian/changelog
--- muon-meson-0.3.0/debian/changelog 2024-09-28 01:00:55.000000000 +0200
+++ muon-meson-0.3.0/debian/changelog 2024-10-27 18:14:00.000000000 +0100
@@ -1,3 +1,12 @@
+muon-meson (0.3.0-4) unstable; urgency=low
+
+ * bootstrap.sh: Create build/muon-boostrap (instead of just muon).
+ * debian/rules: Use muon-bootstrap here to build muon. This fixes a
+ FTBFS problem where muon was being used before it was ready.
+ Closes: #1085124.
+
+ -- Andrea Pappacoda <and...@pappacoda.it> Sun, 27 Oct 2024 18:14:00 +0100
+
muon-meson (0.3.0-3) unstable; urgency=low
* Upload to unstable
diff -Nru muon-meson-0.3.0/debian/patches/0005-create-muon-bootstrap.patch
muon-meson-0.3.0/debian/patches/0005-create-muon-bootstrap.patch
--- muon-meson-0.3.0/debian/patches/0005-create-muon-bootstrap.patch
1970-01-01 01:00:00.000000000 +0100
+++ muon-meson-0.3.0/debian/patches/0005-create-muon-bootstrap.patch
2024-10-27 18:12:07.000000000 +0100
@@ -0,0 +1,8 @@
+--- a/bootstrap.sh
++++ b/bootstrap.sh
+@@ -30,4 +30,4 @@
+ fi
+
+ # shellcheck disable=SC2086
+-${CC:-c99} ${CFLAGS:-} ${LDFLAGS:-} -Iinclude $pkgconf_cflags "src/amalgam.c"
$pkgconf_libs -o "$dir/muon"
++${CC:-c99} ${CFLAGS:-} ${LDFLAGS:-} -Iinclude $pkgconf_cflags "src/amalgam.c"
$pkgconf_libs -o "$dir/muon-bootstrap"
diff -Nru muon-meson-0.3.0/debian/patches/series
muon-meson-0.3.0/debian/patches/series
--- muon-meson-0.3.0/debian/patches/series 2024-09-28 01:00:55.000000000
+0200
+++ muon-meson-0.3.0/debian/patches/series 2024-10-27 18:12:06.000000000
+0100
@@ -2,3 +2,4 @@
0002-Never-use-git.patch
0003-Make-meson_reference.3-generation-reproducible.patch
0004-Fix-has_function-test-on-hurd.patch
+0005-create-muon-bootstrap.patch
diff -Nru muon-meson-0.3.0/debian/rules muon-meson-0.3.0/debian/rules
--- muon-meson-0.3.0/debian/rules 2024-09-28 01:00:55.000000000 +0200
+++ muon-meson-0.3.0/debian/rules 2024-10-27 18:12:32.000000000 +0100
@@ -15,7 +15,7 @@
override_dh_auto_build:
ln -s ../meson-docs subprojects/
CC="$(CC_FOR_BUILD)" CFLAGS="$(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)"
LDFLAGS="$(LDFLAGS_FOR_BUILD)" ./bootstrap.sh build
- build/muon setup -Dprefix=/usr -Dsamurai=disabled -Dreadline=bestline
build
+ build/muon-bootstrap setup -Dprefix=/usr -Dsamurai=disabled
-Dreadline=bestline build
ninja -C build --verbose
# Meson's fs module tests require HOME to be a valid directory
