Fix bug in generator/Makefile.am which causes builds to fail on i686.

This commit is contained in:
Richard W.M. Jones 2023-12-19 17:10:25 +00:00
parent 67fcbe599b
commit 7e6c7ba0d6
2 changed files with 32 additions and 3 deletions

View File

@ -0,0 +1,26 @@
From 11372ab9801f69b48404246cd3f9ec65b41b473b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 19 Dec 2023 17:08:07 +0000
Subject: [PATCH] generator/Makefile.am: Fix missing continuation backslash
Fixes: commit 2829b92aefb89a098e11a36b252383563a4e543a
---
generator/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generator/Makefile.am b/generator/Makefile.am
index c9555f5269..38509124d0 100644
--- a/generator/Makefile.am
+++ b/generator/Makefile.am
@@ -111,7 +111,7 @@ stamp-generator:
echo; \
echo "Install the OCaml bytecode compiler (the program called ocamlc)"; \
echo "and rerun ./configure && make"; \
- echo;
+ echo; \
echo "OR build from the tarballs at https://download.libguestfs.org/libnbd/"; \
echo "which include generated files."; \
echo; \
--
2.43.0

View File

@ -2,14 +2,14 @@
%global verify_tarball_signature 1 %global verify_tarball_signature 1
# If there are patches which touch autotools files, set this to 1. # If there are patches which touch autotools files, set this to 1.
%global patches_touch_autotools %{nil} %global patches_touch_autotools 1
# The source directory. # The source directory.
%global source_directory 1.19-development %global source_directory 1.19-development
Name: libnbd Name: libnbd
Version: 1.19.3 Version: 1.19.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: NBD client library in userspace Summary: NBD client library in userspace
License: LGPL-2.0-or-later AND BSD-3-Clause License: LGPL-2.0-or-later AND BSD-3-Clause
@ -25,6 +25,9 @@ Source2: libguestfs.keyring
# Maintainer script which helps with handling patches. # Maintainer script which helps with handling patches.
Source3: copy-patches.sh Source3: copy-patches.sh
# Fixes bug in generator/Makefile.am which causes builds to fail on i686.
Patch: 0001-generator-Makefile.am-Fix-missing-continuation-backs.patch
%if 0%{patches_touch_autotools} %if 0%{patches_touch_autotools}
BuildRequires: autoconf, automake, libtool BuildRequires: autoconf, automake, libtool
%endif %endif
@ -375,7 +378,7 @@ make %{?_smp_mflags} check || {
%changelog %changelog
* Tue Dec 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.3-1 * Tue Dec 19 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.3-2
- New upstream development version 1.19.3 - New upstream development version 1.19.3
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-4 * Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 1.19.2-4