Skip to contentSkip to conversation

netperf: Inherit texinfo to get makeinfo

PATCH New Khem Raj 1 participant 3 messages Jan 30, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 netperf: Inherit texinfo to get makeinfo

---
 meta-networking/recipes-support/netperf/netperf_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-support/netperf/netperf_git.bb +1 -1
index f1f62df066..d48f3aeabd 100644
@@ -19,7 +19,7 @@ SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13"
 
 S = "${WORKDIR}/git"
 
-inherit update-rc.d autotools
+inherit update-rc.d autotools texinfo
 
 # cpu_set.patch plus _GNU_SOURCE makes src/netlib.c compile with CPU_ macros
 CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE"
Signature · 1 line
2.25.0
author
#1 lore raw

PATCH 2/3 recipes: Inherit missing texinfo for makeinfo program

---
 meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb         | 2 +-
 meta-oe/recipes-extended/indent/indent_2.2.12.bb    | 3 +--
 meta-oe/recipes-extended/nana/nana_2.5.bb           | 2 +-
 meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb | 2 +-
 meta-oe/recipes-support/gpm/gpm_git.bb              | 2 +-
 meta-oe/recipes-support/iksemel/iksemel_1.5.bb      | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)
meta-oe/recipes-devtools/cgdb/cgdb_0.7.1.bb +1 -1
index 57e364e1ca..9d373fc989 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "flex-native readline ncurses"
 
-inherit autotools
+inherit autotools texinfo
 
 SRC_URI = "http://cgdb.me/files/${BP}.tar.gz \
            file://0001-Avoid-use-of-mips-which-is-reserved-on-mips.patch \
meta-oe/recipes-extended/indent/indent_2.2.12.bb +1 -2
index f8d63d43ce..0a866574bd 100644
@@ -9,7 +9,6 @@ Install the indent package if you are developing applications in C and \
 you want a program to format your code."
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-DEPENDS = "virtual/gettext"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-src-indent.c-correct-the-check-for-locale.h.patch \
@@ -19,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
 SRC_URI[md5sum] = "4764b6ac98f6654a35da117b8e5e8e14"
 SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b"
 
-inherit autotools gettext
+inherit autotools gettext texinfo
 
 CFLAGS_class-native += " -Wno-error=unused-value"
 
meta-oe/recipes-extended/nana/nana_2.5.bb +1 -1
index 595852a9f6..4235006984 100644
@@ -15,7 +15,7 @@ LICENSE = "BSD-2-Clause"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=16aa57f3b7fdda870cee597275bd5d11"
 
-inherit autotools-brokensep pkgconfig
+inherit autotools-brokensep pkgconfig texinfo
 
 EXTRA_OEMAKE = "DESTDIR=${D}"
 
meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb +1 -1
index a31ad0d676..118e3c50c8 100644
@@ -11,6 +11,6 @@ SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz"
 SRC_URI[md5sum] = "ea165d618640dbdecb42ae4491337965"
 SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac"
 
-inherit autotools
+inherit autotools texinfo
 
 BBCLASSEXTEND = "native nativesdk"
meta-oe/recipes-support/gpm/gpm_git.bb +1 -1
index 7034d33858..3800d147f9 100644
@@ -21,7 +21,7 @@ SRC_URI = "git://github.com/telmich/gpm;protocol=git \
 
 S = "${WORKDIR}/git"
 
-inherit autotools-brokensep update-rc.d systemd
+inherit autotools-brokensep update-rc.d systemd texinfo
 
 INITSCRIPT_NAME = "gpm"
 INITSCRIPT_PARAMS = "defaults"
meta-oe/recipes-support/iksemel/iksemel_1.5.bb +1 -1
index 0903e90d7d..986984d1ff 100644
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https \
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig lib_package
+inherit autotools pkgconfig lib_package texinfo
 
 # TLS support requires either openssl or gnutls (if both are enabled openssl will be used).
 PACKAGECONFIG ?= "gnutls"
Signature · 1 line
2.25.0
author
#2 lore raw

PATCH 3/3 indent: Do not build docs

In reply to Khem Raj

It fails to build currently, with texinfo-dummy

| File "/mnt/a/tmp-yoe/work/riscv64-yoe-linux-musl/indent/2.2.12-r0/recipe-sysroot-native/usr/bin/makeinfo", line 100, in <module>
| stub_msg | AssertionError: Don't know how to get default output file name from input file
!

| This stand-in version of makeinfo is not yet fully capable of emulating
| the real version from the GNU texinfo suite. If you see this message, file a
| bug report with details on the recipe that failed.
|                                                                               | make[2]: *** [Makefile:814: indent.html] Error 1
---
 .../0001-Fix-builds-with-recent-gettext.patch      | 14 +++++++++++---
 meta-oe/recipes-extended/indent/indent_2.2.12.bb   |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)
meta-oe/recipes-extended/indent/indent/0001-Fix-builds-with-recent-gettext.patch +11 -3
index e48dfb33c0..e9dadace02 100644
@@ -9,8 +9,6 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 548fea7..cf01c5e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
@@ -18,7 +16,17 @@ index 548fea7..cf01c5e 100644
  AUTOMAKE_OPTIONS = no-texinfo.tex
  
 -SUBDIRS = intl src doc po man
-+SUBDIRS = src doc po man
++SUBDIRS = src po man
  
  BUILT_SOURCES = 
  
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,7 +58,6 @@ fi
+ AC_HEADER_DIRENT
+ 
+ AC_OUTPUT([ 
+-   intl/Makefile
+    po/Makefile.in
+    Makefile
+    src/Makefile
meta-oe/recipes-extended/indent/indent_2.2.12.bb +3 -1
index 0a866574bd..0f4f4c2206 100644
@@ -10,6 +10,8 @@ you want a program to format your code."
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
+DEPENDS = "virtual/gettext"
+
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
            file://0001-src-indent.c-correct-the-check-for-locale.h.patch \
            file://0001-Makefile.am-remove-regression-dir.patch \
@@ -20,7 +22,7 @@ SRC_URI[sha256sum] = "e77d68c0211515459b8812118d606812e300097cfac0b4e9fb34726642
 
 inherit autotools gettext texinfo
 
-CFLAGS_class-native += " -Wno-error=unused-value"
+CFLAGS_append_class-native = " -Wno-error=unused-value"
 
 FILES_${PN}-doc += "/usr/doc/indent/indent.html"
 
Signature · 1 line
2.25.0