Skip to contentSkip to conversation

packagegroup-core-sdk: remove intltool

PATCH New Ross Burton 1 participant 4 messages Nov 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 packagegroup-core-sdk: remove intltool

Intltool is deprecated these days, as gettext can handle almost everything intltool could. Remove it from the SDK packagegroups, if it is needed then the user can add it explicitly.

---
 meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +0 -1
index 8854ec4801f..03fa5296c15 100644
@@ -16,7 +16,6 @@ RDEPENDS_packagegroup-core-sdk = "\
     coreutils \
     ccache \
     diffutils \
-    intltool \
     perl-module-re \
     perl-module-text-wrap \
     findutils \
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 packagegroup-core-self-hosted: remove intltool

Very little software needs intltool to build, and we don't need it on the host to build Poky.

---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +0 -1
index 0aab23e3e0d..7f40e56a19b 100644
@@ -75,7 +75,6 @@ RDEPENDS_packagegroup-self-hosted-sdk = "\
     g++-symlinks \
     gcc \
     gcc-symlinks \
-    intltool \
     ldd \
     less \
     libstdc++ \
Signature · 1 line
2.20.1
#2 lore raw

PATCH 3/4 packagegroup-self-hosted: texi2html isn't a build requirement

In reply to Ross Burton

texi2html isn't a build requirement and hasn't been since 2012 (oe-core aa1c451).

---
 meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +0 -1
index 7f40e56a19b..996757f7e13 100644
@@ -167,7 +167,6 @@ RDEPENDS_packagegroup-self-hosted-extended = "\
     sysstat \
     tar \
     tcl \
-    texi2html \
     texinfo \
     unzip \
     usbutils \
Signature · 1 line
2.20.1
#3 lore raw

PATCH 4/4 texi2html: remove

In reply to Ross Burton

The last user of this obsolete recipe (abandoned upstream in 2010, removed from oe-core build dependencies in 2012) has now been deleted from oe-core, so delete the recipe too.

---
 meta/conf/distro/include/maintainers.inc      |  1 -
 .../0001-Allow-compiling-out-of-source.patch  | 39 -------------------
 .../texi2html/texi2html_5.0.bb                | 31 ---------------
 3 files changed, 71 deletions(-)
 delete mode 100644 meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch
 delete mode 100644 meta/recipes-extended/texi2html/texi2html_5.0.bb
meta/conf/distro/include/maintainers.inc +0 -1
index a289008b8c1..79404dfbdb7 100644
@@ -677,7 +677,6 @@ RECIPE_MAINTAINER_pn-tcf-agent = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-tcl = "Yi Zhao <[email protected]>"
 RECIPE_MAINTAINER_pn-tcp-wrappers = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-testexport-tarball = "Richard Purdie <[email protected]>"
-RECIPE_MAINTAINER_pn-texi2html = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-texinfo = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-texinfo-dummy-native = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-tiff = "Alexander Kanavin <[email protected]>"
meta/recipes-extended/texi2html/files/0001-Allow-compiling-out-of-source.patch deleted +0 -39
deleted file mode 100644
index 0cf025ff4a5..00000000000
@@ -1,39 +0,0 @@
-From: Olaf Mandel <[email protected]>
-Date: Fri, 21 Oct 2016 13:04:44 +0000
-Subject: [PATCH] Allow compiling out-of-source
-
-Upstream-Status: Backport of [svn://svn.sv.gnu.org/texinfo/trunk r3602]
----
- Makefile.am | 2 +-
- Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 3447463..c9b5b5c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -208,7 +208,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
- 	  done; \
- 	  msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
- 	else \
--	  cp -p i18n_ref/*.thl i18n; \
-+	  cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \
- 	fi
- 
- i18n_ref:
-diff --git a/Makefile.in b/Makefile.in
-index 4264b37..a13f84d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1126,7 +1126,7 @@ i18n/en.thl i18n/: $(po_document_dir)/po_document/$(PACKAGE)_document.pot
- 	  done; \
- 	  msgexec -i $< "$(srcdir)/gettext_to_separated.pl" | "$(srcdir)/separated_to_hash.pl" en > i18n/en.thl; \
- 	else \
--	  cp -p i18n_ref/*.thl i18n; \
-+	  cp -p "$(srcdir)/i18n_ref/"*.thl i18n; \
- 	fi
- 
- i18n_ref:
--- 
-2.1.4
-
meta/recipes-extended/texi2html/texi2html_5.0.bb deleted +0 -31
deleted file mode 100644
index afd125b08fa..00000000000
@@ -1,31 +0,0 @@
-SUMMARY = "Perl script that converts Texinfo to HTML"
-HOMEPAGE    = "http://www.nongnu.org/texi2html/"
-SECTION     = "console/utils"
-LICENSE     = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
-
-PR = "r2"
-
-SRC_URI     = "${SAVANNAH_GNU_MIRROR}/texi2html/${BPN}-${PV}.tar.bz2 \
-               file://0001-Allow-compiling-out-of-source.patch \
-               "
-
-SRC_URI[md5sum] = "f15ac876fcdc8be865b16535f480aa54"
-SRC_URI[sha256sum] = "e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa"
-
-inherit autotools gettext texinfo
-
-do_configure_prepend() {
-	# autotools_do_configure updates po/Makefile.in.in, we also need
-	# update po_document.
-	cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_document/
-	cp -f ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/po_messages/
-}
-
-do_install_append () {
-	sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/texi2html
-}
-
-FILES_${PN}-doc += "${datadir}/texinfo"
-
-RDEPENDS_${PN} = "perl"
Signature · 1 line
2.20.1