console-tools: Clean up recipe
PATCH 1/1 console-tools: Clean up recipe
This cleans up various bits of nastiness in this recipe:
* Drop unneeded m4 macros
* Update to a recent version of gettext (needs addition of Makevars file)
* Drop split do_compile and SUBDIRS hacks, just patch out the docs
* Remove some of the configure.in hacks since they seem unneeded now and break gettext (the AC_OUTPUT change).
* Wipe out acinclude.m4 since it has corrosive contents
Signed-off-by Richard Purdie <[email protected]>
---
meta/recipes-core/console-tools/console-tools-0.3.2/Makevars renamed from dev/null +41 -0
@@ -0,0 +1,41 @@ +# Makefile variables for PO directory in any package using GNU gettext. + +# Usually the message domain is the same as the package name. +DOMAIN = $(PACKAGE) + +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + +# These options get passed to xgettext. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ + +# This is the copyright holder that gets inserted into the header of the +# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding +# package. (Note that the msgstr strings, extracted from the package's +# sources, belong to the copyright holder of the package.) Translators are +# expected to transfer the copyright for their translations to this person +# or entity, or to disclaim their copyright. The empty string stands for +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Free Software Foundation, Inc. + +# This is the email address or URL to which the translators shall report +# bugs in the untranslated strings: +# - Strings which are not entire sentences, see the maintainer guidelines +# in the GNU gettext documentation, section 'Preparing Strings'. +# - Strings which use unclear terms or require additional context to be +# understood. +# - Strings which make invalid assumptions about notation of date, time or +# money. +# - Pluralisation problems. +# - Incorrect English spelling. +# - Incorrect formatting. +# It can be your email address, or a mailing list address where translators +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = + +# This is the list of locale categories, beyond LC_MESSAGES, for which the +# message catalogs shall be used. It is usually empty. +EXTRA_LOCALE_CATEGORIES =
dev/null renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/codeset.m4 +0 -17
@@ -1,17 +0,0 @@ -#serial AM1 - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include <langinfo.h>], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) - fi -])
dev/null renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/gettext.m4 +0 -370
370 lines not on this page · raw message
dev/null renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/glibc21.m4 +0 -26
@@ -1,26 +0,0 @@ -#serial 2 - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include <features.h> -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -)
dev/null renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/iconv.m4 +0 -69
69 lines not on this page · raw message
dev/null renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/progtest.m4 +0 -51
51 lines not on this page · raw message
meta/recipes-core/console-tools/console-tools-0.3.2/configure.patch +1 -19
@@ -1,9 +1,5 @@ Upstream-Status: Pending -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - --- console-tools-0.3.2/configure.in~configure +++ console-tools-0.3.2/configure.in @@ -2,13 +2,14 @@
@@ -23,25 +19,11 @@ Upstream-Status: Pending AM_INIT_AUTOMAKE(console-tools, 0.3.2) # Defaults -@@ -25,7 +26,7 @@ +@@ -25,7 +26,6 @@ # i18n stuff ALL_LINGUAS="cs de ru ga fr" AM_GNU_GETTEXT -AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]) -+AC_CONFIG_COMMANDS([default-1],[[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile]],[[]]) AC_DEFINE_UNQUOTED(LOCALEDIR, "/usr/share/locale") -@@ -172,10 +173,11 @@ - AC_SUBST(CHARMAPDIR) - - # Output --AC_OUTPUT([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile -+AC_CONFIG_FILES([Makefile lib/Makefile lib/console/Makefile lib/cfont/Makefile - lib/ctutils/Makefile lib/ctlocal/Makefile lib/generic/Makefile - fontfiletools/Makefile vttools/Makefile - kbdtools/Makefile screenfonttools/Makefile contrib/Makefile - include/Makefile include/lct/Makefile compat/Makefile - doc/Makefile doc/man/Makefile examples/Makefile - po/Makefile.in intl/Makefile]) -+AC_OUTPUT
meta/recipes-core/console-tools/console-tools-0.3.2/lcmessage.m4 renamed from meta/recipes-core/console-tools/console-tools-0.3.2/config/lcmessage.m4 +0 -0
meta/recipes-core/console-tools/console-tools-0.3.2/nodocs.patch renamed from dev/null +19 -0
@@ -0,0 +1,19 @@ +The docs need tools we don't have to build so disable them. + +Upstream-Status: Inappropriate [configuration] +RP 2012/10/17 + +Index: console-tools-0.3.2/Makefile.am +=================================================================== +--- console-tools-0.3.2.orig/Makefile.am 1999-04-15 01:33:24.000000000 +0000 ++++ console-tools-0.3.2/Makefile.am 2012-10-17 11:48:14.107069145 +0000 +@@ -1,7 +1,7 @@ + # -*- makefile -*- + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib doc \ +- compat include examples po intl ++SUBDIRS = lib fontfiletools vttools kbdtools screenfonttools contrib \ ++ compat include examples po intl + + EXTRA_DIST = BUGS RELEASE CREDITS COPYING.kbd local-scripts/* debian/* *.lsm
meta/recipes-core/console-tools/console-tools_0.3.2.bb +7 -12
@@ -11,23 +11,18 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \ file://compile.patch \ file://kbdrate.patch \ file://uclibc-fileno.patch \ - file://config" + file://nodocs.patch \ + file://lcmessage.m4 \ + file://Makevars" SRC_URI[md5sum] = "bf21564fc38b3af853ef724babddbacd" SRC_URI[sha256sum] = "eea6b441672dacd251079fc85ed322e196282e0e66c16303ec64c3a2b1c126c2" -export SUBDIRS = "fontfiletools vttools kbdtools screenfonttools contrib \ - examples po intl compat" - -acpaths = "-I config" do_configure_prepend () { - mkdir -p config - cp ${WORKDIR}/config/*.m4 config/ -} - -do_compile () { - oe_runmake -C lib - oe_runmake 'SUBDIRS=${SUBDIRS}' + mkdir -p ${S}/m4 + cp ${WORKDIR}/lcmessage.m4 ${S}/m4/ + rm -f ${S}/acinclude.m4 + cp ${WORKDIR}/Makevars ${S}/po/ } inherit autotools gettext update-alternatives