From e6fb2f9afe2ba6b676c46d1eb297ca9cc532d405 Mon Sep 17 00:00:00 2001 From: Max Eliaser Date: Thu, 1 May 2014 13:00:28 -0700 Subject: Add texinfo.bbclass; recipes that use texinfo utils at build-time inherit it. The class itself currently does nothing. The idea is to mark all recipes that make use of the texinfo utilities. In the future, this class could be used to suppress the generation/formatting of documentation for performance, explicitly track dependencies on these utilities, and eliminate Yocto's current dependency on the host system's texinfo utilities. Signed-off-by: Max Eliaser Signed-off-by: Richard Purdie --- meta/recipes-extended/bash/bash.inc | 2 +- meta/recipes-extended/bc/bc_1.06.bb | 2 +- meta/recipes-extended/cpio/cpio_v2.inc | 2 +- meta/recipes-extended/diffutils/diffutils.inc | 2 +- meta/recipes-extended/ed/ed_0.5.bb | 2 +- meta/recipes-extended/ed/ed_1.9.bb | 2 ++ meta/recipes-extended/findutils/findutils.inc | 2 +- meta/recipes-extended/gawk/gawk_3.1.5.bb | 2 +- meta/recipes-extended/gawk/gawk_4.0.2.bb | 2 +- meta/recipes-extended/grep/grep_2.18.bb | 2 +- meta/recipes-extended/grep/grep_2.5.1a.bb | 2 +- meta/recipes-extended/groff/groff_1.18.1.4.bb | 2 +- meta/recipes-extended/groff/groff_1.22.2.bb | 2 +- meta/recipes-extended/gzip/gzip.inc | 2 +- meta/recipes-extended/libidn/libidn_0.6.14.bb | 2 +- meta/recipes-extended/libidn/libidn_1.28.bb | 2 +- meta/recipes-extended/parted/parted_3.1.bb | 2 +- meta/recipes-extended/screen/screen_4.0.3.bb | 2 +- meta/recipes-extended/sed/sed_4.1.2.bb | 2 +- meta/recipes-extended/sed/sed_4.2.2.bb | 2 +- meta/recipes-extended/tar/tar.inc | 2 +- meta/recipes-extended/texi2html/texi2html_5.0.bb | 2 +- meta/recipes-extended/time/time.inc | 2 +- meta/recipes-extended/wget/wget.inc | 2 +- meta/recipes-extended/which/which_2.18.bb | 2 +- meta/recipes-extended/which/which_2.20.bb | 2 +- 26 files changed, 27 insertions(+), 25 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 2bb2df9584..2fe0c6b574 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -4,7 +4,7 @@ SECTION = "base/shell" DEPENDS = "ncurses bison-native" -inherit autotools-brokensep gettext update-alternatives ptest +inherit autotools-brokensep gettext texinfo update-alternatives ptest PARALLEL_MAKE = "" diff --git a/meta/recipes-extended/bc/bc_1.06.bb b/meta/recipes-extended/bc/bc_1.06.bb index 89d8bee667..b116052c7d 100644 --- a/meta/recipes-extended/bc/bc_1.06.bb +++ b/meta/recipes-extended/bc/bc_1.06.bb @@ -18,7 +18,7 @@ SRC_URI = "${GNU_MIRROR}/bc/bc-${PV}.tar.gz \ SRC_URI[md5sum] = "d44b5dddebd8a7a7309aea6c36fda117" SRC_URI[sha256sum] = "4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33" -inherit autotools-brokensep update-alternatives +inherit autotools-brokensep texinfo update-alternatives ALTERNATIVE_${PN} = "dc" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/cpio/cpio_v2.inc b/meta/recipes-extended/cpio/cpio_v2.inc index 30446b0ced..93de4bb92b 100644 --- a/meta/recipes-extended/cpio/cpio_v2.inc +++ b/meta/recipes-extended/cpio/cpio_v2.inc @@ -10,7 +10,7 @@ SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ file://statdef.patch \ " -inherit autotools gettext +inherit autotools gettext texinfo S = "${WORKDIR}/cpio-${PV}" diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index 613b538557..243341aa9c 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -4,7 +4,7 @@ sdiff, and cmp utilities. These programs are usually \ used for creating patch files." SECTION = "base" -inherit autotools update-alternatives gettext +inherit autotools texinfo update-alternatives gettext # diffutils assumes non-glibc compilation with uclibc and # this causes it to generate its own implementations of diff --git a/meta/recipes-extended/ed/ed_0.5.bb b/meta/recipes-extended/ed/ed_0.5.bb index a696c0c8fb..a075780e93 100644 --- a/meta/recipes-extended/ed/ed_0.5.bb +++ b/meta/recipes-extended/ed/ed_0.5.bb @@ -11,7 +11,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases-noredirect/ed/ed-${PV}.tar. SRC_URI[md5sum] = "4ee21e9dcc9b5b6012c23038734e1632" SRC_URI[sha256sum] = "edef2bbde0fbf0d88232782a0eded323f483a0519d6fde9a3b1809056fd35f3e" -inherit autotools +inherit autotools texinfo EXTRA_OECONF = "'CC=${CC}' 'CXX=${CXX}' 'CFLAGS=${CFLAGS}' 'CXXFLAGS=${CXXFLAGS}' 'CPPFLAGS=${CPPFLAGS}' 'LDFLAGS=${LDFLAGS}'" diff --git a/meta/recipes-extended/ed/ed_1.9.bb b/meta/recipes-extended/ed/ed_1.9.bb index d1621548dc..8e94eedea6 100644 --- a/meta/recipes-extended/ed/ed_1.9.bb +++ b/meta/recipes-extended/ed/ed_1.9.bb @@ -16,6 +16,8 @@ SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz" SRC_URI[md5sum] = "565b6d1d5a9a8816b9b304fc4ed9405d" SRC_URI[sha256sum] = "d5b372cfadf073001823772272fceac2cfa87552c5cd5a8efc1c8aae61f45a88" +inherit texinfo + do_configure() { ${S}/configure } diff --git a/meta/recipes-extended/findutils/findutils.inc b/meta/recipes-extended/findutils/findutils.inc index 4edb127ba5..4f4068a091 100644 --- a/meta/recipes-extended/findutils/findutils.inc +++ b/meta/recipes-extended/findutils/findutils.inc @@ -9,7 +9,7 @@ SECTION = "console/utils" SRC_URI = "${GNU_MIRROR}/findutils/findutils-${PV}.tar.gz" -inherit autotools gettext update-alternatives +inherit autotools gettext texinfo update-alternatives ALTERNATIVE_${PN} = "find xargs" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/gawk/gawk_3.1.5.bb b/meta/recipes-extended/gawk/gawk_3.1.5.bb index 4d9d6e4c43..48e8939a89 100644 --- a/meta/recipes-extended/gawk/gawk_3.1.5.bb +++ b/meta/recipes-extended/gawk/gawk_3.1.5.bb @@ -21,7 +21,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ SRC_URI[md5sum] = "4760325489479cac17fe0114b8f62f30" SRC_URI[sha256sum] = "463dcb9d0ca398b1d4f5a332f6cd9cec56441265fca616f2ea1b44d459e9f0f8" -inherit autotools gettext update-alternatives +inherit autotools gettext texinfo update-alternatives PACKAGES += "gawk-common pgawk" diff --git a/meta/recipes-extended/gawk/gawk_4.0.2.bb b/meta/recipes-extended/gawk/gawk_4.0.2.bb index eb86af39da..cb2f9c0468 100644 --- a/meta/recipes-extended/gawk/gawk_4.0.2.bb +++ b/meta/recipes-extended/gawk/gawk_4.0.2.bb @@ -23,7 +23,7 @@ SRC_URI = "${GNU_MIRROR}/gawk/gawk-${PV}.tar.gz \ SRC_URI[md5sum] = "4d505dc2c9f1eb3e9f8d6cac87d4bd1a" SRC_URI[sha256sum] = "6e0de117c3713aa8d7fa347fc9fd645b10038ae49d8cf947d8c1d51cbb76141a" -inherit autotools gettext update-alternatives +inherit autotools gettext texinfo update-alternatives PACKAGES += "gawk-common pgawk dgawk" diff --git a/meta/recipes-extended/grep/grep_2.18.bb b/meta/recipes-extended/grep/grep_2.18.bb index 5ffeaf0d99..99337f7679 100644 --- a/meta/recipes-extended/grep/grep_2.18.bb +++ b/meta/recipes-extended/grep/grep_2.18.bb @@ -10,7 +10,7 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.xz" SRC_URI[md5sum] = "7439f8266f50844b56cc3e2721606541" SRC_URI[sha256sum] = "e6436e5077fa1497feccc8feaabd3f507b172369bf120fbc9e4874bba81be720" -inherit autotools gettext +inherit autotools gettext texinfo EXTRA_OECONF = "--disable-perl-regexp" diff --git a/meta/recipes-extended/grep/grep_2.5.1a.bb b/meta/recipes-extended/grep/grep_2.5.1a.bb index 088959c9ca..79842baac8 100644 --- a/meta/recipes-extended/grep/grep_2.5.1a.bb +++ b/meta/recipes-extended/grep/grep_2.5.1a.bb @@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/grep/grep-${PV}.tar.bz2 \ SRC_URI[md5sum] = "52202fe462770fa6be1bb667bd6cf30c" SRC_URI[sha256sum] = "38c8a2bb9223d1fb1b10bdd607cf44830afc92fd451ac4cd07619bf92bdd3132" -inherit autotools gettext +inherit autotools gettext texinfo EXTRA_OECONF = "--disable-perl-regexp --disable-ncurses" diff --git a/meta/recipes-extended/groff/groff_1.18.1.4.bb b/meta/recipes-extended/groff/groff_1.18.1.4.bb index 28105f8b43..85357c56bf 100644 --- a/meta/recipes-extended/groff/groff_1.18.1.4.bb +++ b/meta/recipes-extended/groff/groff_1.18.1.4.bb @@ -13,7 +13,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://man-local.patch \ file://mdoc-local.patch" -inherit autotools +inherit autotools texinfo EXTRA_OECONF="--without-x --prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}info --with-appresdir=${D}${datadir}" diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb index 9d2a3c75bd..227f9fa621 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.2.bb @@ -18,7 +18,7 @@ SRC_URI[sha256sum] = "380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a1 DEPENDS = "groff-native" DEPENDS_class-native = "" -inherit autotools +inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc index 6ec1dae0fd..920b256d43 100644 --- a/meta/recipes-extended/gzip/gzip.inc +++ b/meta/recipes-extended/gzip/gzip.inc @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz" -inherit autotools +inherit autotools texinfo do_install_append () { # Rename and move files into /bin (FHS), which is typical place for gzip diff --git a/meta/recipes-extended/libidn/libidn_0.6.14.bb b/meta/recipes-extended/libidn/libidn_0.6.14.bb index a13ed27135..ff8d345ccb 100644 --- a/meta/recipes-extended/libidn/libidn_0.6.14.bb +++ b/meta/recipes-extended/libidn/libidn_0.6.14.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ file://src/idn.c;beginline=6;endline=18;md5=56c89e359652a71cda128d75f0ffdac4" PR = "r1" -inherit pkgconfig autotools gettext +inherit pkgconfig autotools gettext texinfo SRC_URI = "http://alpha.gnu.org/gnu/libidn/${BPN}-${PV}.tar.gz" diff --git a/meta/recipes-extended/libidn/libidn_1.28.bb b/meta/recipes-extended/libidn/libidn_1.28.bb index effd5ea0bd..bd079c1fe2 100644 --- a/meta/recipes-extended/libidn/libidn_1.28.bb +++ b/meta/recipes-extended/libidn/libidn_1.28.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3231f57e8fce0f62f81b03107e788888 \ file://lib/idna.h;endline=21;md5=f73089b7f52dd2cb3540e274bd76106d \ file://src/idn.c;endline=20;md5=d7797e6cc3a7b48e6050fc0d27104595" -inherit pkgconfig autotools gettext +inherit pkgconfig autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ file://libidn_fix_for_automake-1.12.patch \ diff --git a/meta/recipes-extended/parted/parted_3.1.bb b/meta/recipes-extended/parted/parted_3.1.bb index 8344ea82ce..9057463c7e 100644 --- a/meta/recipes-extended/parted/parted_3.1.bb +++ b/meta/recipes-extended/parted/parted_3.1.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b942 EXTRA_OECONF = "--disable-device-mapper" -inherit autotools pkgconfig gettext ptest +inherit autotools pkgconfig gettext texinfo ptest BBCLASSEXTEND = "native" diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb index 6fd02a07cb..5850560fe4 100644 --- a/meta/recipes-extended/screen/screen_4.0.3.bb +++ b/meta/recipes-extended/screen/screen_4.0.3.bb @@ -30,7 +30,7 @@ SRC_URI[tarball.sha256sum] = "78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceec SRC_URI[patch.md5sum] = "5960bdae6782ee9356b7e0e0a1fa7c19" SRC_URI[patch.sha256sum] = "10acb274b2fb0bb7137a0d66e52fa0f18125bc5198c7a8d5af381b4b30636316" -inherit autotools +inherit autotools texinfo EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" diff --git a/meta/recipes-extended/sed/sed_4.1.2.bb b/meta/recipes-extended/sed/sed_4.1.2.bb index 5607b0ac62..fe242e16bd 100644 --- a/meta/recipes-extended/sed/sed_4.1.2.bb +++ b/meta/recipes-extended/sed/sed_4.1.2.bb @@ -14,7 +14,7 @@ SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz \ SRC_URI[md5sum] = "928f0e06422f414091917401f1a834d0" SRC_URI[sha256sum] = "638e837ba765d5da0a30c98b57c2953cecea96827882f594612acace93ceeeab" -inherit autotools update-alternatives gettext +inherit autotools texinfo update-alternatives gettext do_configure_prepend () { cp ${WORKDIR}/Makevars ${S}/po/ diff --git a/meta/recipes-extended/sed/sed_4.2.2.bb b/meta/recipes-extended/sed/sed_4.2.2.bb index cf8347c2d5..47c8b5b14f 100644 --- a/meta/recipes-extended/sed/sed_4.2.2.bb +++ b/meta/recipes-extended/sed/sed_4.2.2.bb @@ -10,7 +10,7 @@ SRC_URI = "${GNU_MIRROR}/sed/sed-${PV}.tar.gz" SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056" SRC_URI[sha256sum] = "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff" -inherit autotools update-alternatives gettext +inherit autotools texinfo update-alternatives gettext EXTRA_OECONF = "--disable-acl" diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc index 30a1373fef..51d49340a1 100644 --- a/meta/recipes-extended/tar/tar.inc +++ b/meta/recipes-extended/tar/tar.inc @@ -6,7 +6,7 @@ SECTION = "base" SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" -inherit autotools gettext +inherit autotools gettext texinfo EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" diff --git a/meta/recipes-extended/texi2html/texi2html_5.0.bb b/meta/recipes-extended/texi2html/texi2html_5.0.bb index a22b981a5d..d488465751 100644 --- a/meta/recipes-extended/texi2html/texi2html_5.0.bb +++ b/meta/recipes-extended/texi2html/texi2html_5.0.bb @@ -12,7 +12,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/texi2html/${BPN}-${PV}. SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54" SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa" -inherit autotools gettext +inherit autotools gettext texinfo do_configure_prepend() { # Make a directory for the old gettext setup diff --git a/meta/recipes-extended/time/time.inc b/meta/recipes-extended/time/time.inc index 028da7cd02..85862177b7 100644 --- a/meta/recipes-extended/time/time.inc +++ b/meta/recipes-extended/time/time.inc @@ -6,7 +6,7 @@ SECTION = "utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" -inherit update-alternatives +inherit texinfo update-alternatives ALTERNATIVE_${PN} = "time" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/wget/wget.inc b/meta/recipes-extended/wget/wget.inc index 4eeef708c4..a778bca614 100644 --- a/meta/recipes-extended/wget/wget.inc +++ b/meta/recipes-extended/wget/wget.inc @@ -7,7 +7,7 @@ DEPENDS = "openssl zlib libpcre" INC_PR = "r16" -inherit autotools gettext update-alternatives +inherit autotools gettext texinfo update-alternatives EXTRA_OECONF = "--enable-ipv6 --with-libssl-prefix=${STAGING_DIR_HOST} \ --with-ssl=openssl --disable-rpath --disable-iri \ diff --git a/meta/recipes-extended/which/which_2.18.bb b/meta/recipes-extended/which/which_2.18.bb index 4f780100b3..5fa5d9e8eb 100644 --- a/meta/recipes-extended/which/which_2.18.bb +++ b/meta/recipes-extended/which/which_2.18.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "9445cd7e02ec0c26a44fd56098464ded064ba5d93dd2e15ec12410ba56 DEPENDS = "cwautomacros-native" -inherit autotools update-alternatives +inherit autotools texinfo update-alternatives do_configure_prepend() { OLD="@ACLOCAL_CWFLAGS@" diff --git a/meta/recipes-extended/which/which_2.20.bb b/meta/recipes-extended/which/which_2.20.bb index f4e87de76b..f3c6037786 100644 --- a/meta/recipes-extended/which/which_2.20.bb +++ b/meta/recipes-extended/which/which_2.20.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ file://which.c;beginline=1;endline=17;md5=a9963693af2272e7a8df6f231164e7a2" DEPENDS = "cwautomacros-native" -inherit autotools update-alternatives +inherit autotools texinfo update-alternatives PR = "r3" -- cgit 1.2.3-korg