From: Tom Rini Date: Thu, 10 Mar 2011 16:00:25 +0000 (-0700) Subject: Revert "help2man: Update to use 'inherit gettext'" X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81abfc6b78c5c48545a885b329b5c2eb5b23691f;p=openembedded.git Revert "help2man: Update to use 'inherit gettext'" This reverts commit bccf626b1428d7087d261bf4ad91744b5b5d5418. --- diff --git a/recipes/help2man/help2man_1.36.4.bb b/recipes/help2man/help2man_1.36.4.bb index fdb0c7a436..1ec7eea6a4 100644 --- a/recipes/help2man/help2man_1.36.4.bb +++ b/recipes/help2man/help2man_1.36.4.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNU utility to convert program --help output to a man page" HOMEPAGE = "http://www.gnu.org/software/help2man" SECTION = "console/utils" LICENSE = "GPLv2" -DEPENDS = "perl-native liblocale-gettext-perl-native" +DEPENDS = "gettext-native perl-native liblocale-gettext-perl-native" DEPENDS_virtclass-native = "perl-native autoconf-native automake-native" RDEPENDS_${PN} = "gettext perl liblocale-gettext-perl" @@ -10,11 +10,11 @@ TARGET_CC_ARCH += "${LDFLAGS}" SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -inherit autotools gettext +inherit autotools BBCLASSEXTEND = "native" -PR = "r4" +PR = "r5" # We don't want to reconfigure things do_configure() { diff --git a/recipes/help2man/help2man_1.38.2.bb b/recipes/help2man/help2man_1.38.2.bb index 9f00408d67..ab06186d61 100644 --- a/recipes/help2man/help2man_1.38.2.bb +++ b/recipes/help2man/help2man_1.38.2.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Program to create simple man pages" SECTION = "devel" LICENSE = "GPLv3" -DEPENDS = "perl-native liblocale-gettext-perl-native" +DEPENDS = "gettext-native perl-native liblocale-gettext-perl-native" DEPENDS_virtclass-native = "perl-native autoconf-native automake-native" RDEPENDS_${PN} = "gettext perl liblocale-gettext-perl" RDEPENDS_${PN}_virtclass-native = "" @@ -12,7 +12,9 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "426671c6fe79e5ef2233303367eab5a6" SRC_URI[sha256sum] = "952c29561bce8b233aa10af7f0e0c79c8243712810bf8ddf01e6efd82ce250d1" -inherit autotools gettext +inherit autotools + +EXTRA_OECONF = "--disable-nls" BBCLASSEXTEND = "native"