[Buildroot] [PATCH 1/1] package/freeipmi: fix build without makeinfo

* [Buildroot] [PATCH 1/1] package/freeipmi: fix build without makeinfo
@ 2022-11-02 18:18 Fabrice Fontaine
  2022-11-05 22:43 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-11-02 18:18 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

Disable documentation to avoid the following build failure without
makeinfo raised at least since bump to version 1.6.10 in commit
f0faa3b71c585cb70bcd6fa4bafb756b98130bd5 (and probably since the
addition of the package in commit
663f39c88c01593855c18355a4decdceeffd884b):

/home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found
WARNING: 'makeinfo' is missing on your system.
         You should only need it if you modified a '.texi' file, or
         any other file indirectly affecting the aspect of the manual.
         You might want to install the Texinfo package:
         <https://www.gnu.org/software/texinfo/>
         The spurious makeinfo call might also be the consequence of
         using a buggy 'make' (AIX, DU, IRIX), in which case you might
         want to install GNU make:
         <https://www.gnu.org/software/make/>
Makefile:442: recipe for target 'freeipmi-faq.info' failed

Fixes:
 - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/freeipmi/0001-add-disable-doc.patch | 72 +++++++++++++++++++++
 package/freeipmi/freeipmi.mk                |  2 +
 2 files changed, 74 insertions(+)
 create mode 100644 package/freeipmi/0001-add-disable-doc.patch

diff --git a/package/freeipmi/0001-add-disable-doc.patch b/package/freeipmi/0001-add-disable-doc.patch
new file mode 100644
index 0000000000..e410d2b52f
--- /dev/null
+++ b/package/freeipmi/0001-add-disable-doc.patch
@@ -0,0 +1,72 @@
+From 5324c88632c021a87251370b03067d857e9a9892 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 2 Nov 2022 19:02:42 +0100
+Subject: [PATCH] add --disable-doc
+
+Allow the user to disable documentation through --disable-doc to avoid
+the following build failure without makeinfo:
+
+/home/buildroot/autobuild/instance-0/output-1/build/freeipmi-1.6.10/config/missing: line 81: makeinfo: command not found
+WARNING: 'makeinfo' is missing on your system.
+         You should only need it if you modified a '.texi' file, or
+         any other file indirectly affecting the aspect of the manual.
+         You might want to install the Texinfo package:
+         <https://www.gnu.org/software/texinfo/>
+         The spurious makeinfo call might also be the consequence of
+         using a buggy 'make' (AIX, DU, IRIX), in which case you might
+         want to install GNU make:
+         <https://www.gnu.org/software/make/>
+Makefile:442: recipe for target 'freeipmi-faq.info' failed
+
+Fixes:
+ - http://autobuild.buildroot.org/results/ac6ff1c746a354f885fc1674d10e7bff9e536134
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/chu11/freeipmi-mirror/pull/61]
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 4 ++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cf757f634..d74952e30 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,7 +3,6 @@
+ ACLOCAL_AMFLAGS = -I config
+ 
+ SUBDIRS = \
+-	doc \
+ 	etc \
+ 	common \
+ 	libfreeipmi \
+@@ -33,6 +32,11 @@ SUBDIRS = \
+ 	rmcpping \
+ 	contrib
+ 
++if ENABLE_DOC
++SUBDIRS += \
++	doc
++endif
++
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+diff --git a/configure.ac b/configure.ac
+index 54fdf6367..7a94b958b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -341,6 +341,10 @@ else
+ fi
+ AC_SUBST(WITH_DEBUG)
+ 
++AC_ARG_ENABLE(doc,
++              AC_HELP_STRING([--disable-doc], [turn off documentation]))
++AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
++
+ dnl Allow advanced developers to compile with raw dumping
+ AC_ARG_ENABLE(rawdumps,
+    AC_HELP_STRING([--enable-rawdumps], [output raw packet dumps when debugging]))
+-- 
+2.35.1
+
diff --git a/package/freeipmi/freeipmi.mk b/package/freeipmi/freeipmi.mk
index 916f2eb68a..3e0ac0ffa9 100644
--- a/package/freeipmi/freeipmi.mk
+++ b/package/freeipmi/freeipmi.mk
@@ -12,6 +12,8 @@ FREEIPMI_LICENSE_FILES = \
 	COPYING.ipmidetect COPYING.ipmi-fru COPYING.ipmimonitoring \
 	COPYING.ipmiping COPYING.ipmipower COPYING.ipmiseld COPYING.pstdout \
 	COPYING.sunbmc COPYING.ZRESEARCH
+# We're patching configure.ac
+FREEIPMI_AUTORECONF = YES
 FREEIPMI_DEPENDENCIES = host-pkgconf
 FREEIPMI_INSTALL_STAGING = YES
 # Disable checking for /dev/urandom and /dev/random through AC_CHECK_FILE
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread