summaryrefslogtreecommitdiffstats
path: root/meta/packages/gettext
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/gettext
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/gettext')
-rw-r--r--meta/packages/gettext/gettext-0.17/autotools.patch62
-rw-r--r--meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch13
-rw-r--r--meta/packages/gettext/gettext-0.17/m4fix.patch50
-rw-r--r--meta/packages/gettext/gettext-0.17/use_open_properly.patch15
-rw-r--r--meta/packages/gettext/gettext-0.17/wchar-uclibc.patch96
-rw-r--r--meta/packages/gettext/gettext_0.17.bb55
6 files changed, 0 insertions, 291 deletions
diff --git a/meta/packages/gettext/gettext-0.17/autotools.patch b/meta/packages/gettext/gettext-0.17/autotools.patch
deleted file mode 100644
index 9f16b1881f..0000000000
--- a/meta/packages/gettext/gettext-0.17/autotools.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Index: gettext-0.17/gettext-runtime/man/Makefile.am
2===================================================================
3--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200
4+++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
5@@ -158,8 +158,7 @@
6 $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
7 mv t-$@ $@
8
9-install-html-local:
10- $(mkdir_p) $(DESTDIR)$(htmldir)
11+install-html: installdirs-html
12 for file in $(man_HTML); do \
13 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
14 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
15Index: gettext-0.17/gettext-tools/man/Makefile.am
16===================================================================
17--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200
18+++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
19@@ -186,8 +186,7 @@
20 $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
21 mv t-$@ $@
22
23-install-html-local:
24- $(mkdir_p) $(DESTDIR)$(htmldir)
25+install-html: installdirs-html
26 for file in $(man_HTML); do \
27 if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
28 $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
29Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
30===================================================================
31--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200
32+++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200
33@@ -1,5 +1,5 @@
34 dnl Configuration for the GNU libasprintf library
35-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
36+dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
37 dnl
38 dnl This program is free software: you can redistribute it and/or modify
39 dnl it under the terms of the GNU General Public License as published by
40@@ -54,8 +54,7 @@
41 dnl Checks for typedefs, structures, and compiler characteristics.
42 AC_C_INLINE
43 AC_TYPE_SIZE_T
44-gl_AC_TYPE_LONG_LONG
45-gt_TYPE_LONGDOUBLE
46+AC_TYPE_LONG_LONG_INT
47 gt_TYPE_WCHAR_T
48 gt_TYPE_WINT_T
49 AC_CHECK_TYPE([ptrdiff_t], ,
50@@ -79,8 +78,11 @@
51 AC_SUBST([ALLOCA_H])
52
53 AC_CHECK_FUNCS([snprintf vasprintf wcslen])
54-AC_CHECK_DECLS([_snprintf])
55+dnl Use the _snprintf function only if it is declared (because on NetBSD it
56+dnl is defined as a weak alias of snprintf; we prefer to use the latter).
57+AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
58 gt_PRINTF_POSIX
59+gl_EOVERFLOW
60
61 dnl Check for tools needed for formatting the documentation.
62 ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
diff --git a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch b/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch
deleted file mode 100644
index 0f67cd0b2e..0000000000
--- a/meta/packages/gettext/gettext-0.17/gettext-error_print_progname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gettext-0.17/gettext-tools/libgettextpo/error.h
2===================================================================
3--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
4+++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
5@@ -49,7 +49,7 @@
6 /* If NULL, error will flush stdout, then print on stderr the program
7 name, a colon and a space. Otherwise, error will call this
8 function without parameters instead. */
9-extern DLL_VARIABLE void (*error_print_progname) (void);
10+void (*error_print_progname) (void);
11
12 /* This variable is incremented each time `error' is called. */
13 extern DLL_VARIABLE unsigned int error_message_count;
diff --git a/meta/packages/gettext/gettext-0.17/m4fix.patch b/meta/packages/gettext/gettext-0.17/m4fix.patch
deleted file mode 100644
index a02457fab8..0000000000
--- a/meta/packages/gettext/gettext-0.17/m4fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1When I try to `./autogen.sh --quick' CVS gettext, using git Autoconf,
2things fall over like this (several instances):
3
4| gnulib-m4/openmp.m4:29: error: m4_copy: won't overwrite defined macro:
5_AC_LANG_OPENMP(C++)
6| gnulib-m4/openmp.m4:29: the top level
7| autom4te: /usr/bin/m4 failed with exit status: 1
8| aclocal: autom4te failed with exit status: 1
9
10I'm not quite sure whether an Autoconf bug/incompatibility is involved
11here (therefore the Cc: to bug-autoconf). m4_copy wasn't documented in
12earlier Autoconf releases, but there may still have been problematic
13semantic changes, I don't know.
14
15Anyway, the following patch seems to fix it. OK to apply?
16
17Cheers,
18Ralf
19
202008-12-03 Ralf Wildenhues <[EMAIL PROTECTED]>
21
22 * m4/openmp.m4 (AC_OPENMP): Do not define with Autoconf 2.62 or
23 newer.
24
25Index: gettext-0.17/gettext-tools/gnulib-m4/openmp.m4
26===================================================================
27--- gettext-0.17.orig/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:00.437788710 +0000
28+++ gettext-0.17/gettext-tools/gnulib-m4/openmp.m4 2010-02-01 10:51:50.697789220 +0000
29@@ -1,11 +1,13 @@
30-# openmp.m4 serial 4
31-dnl Copyright (C) 2006-2007 Free Software Foundation, Inc.
32+# openmp.m4 serial 5
33+dnl Copyright (C) 2006-2008 Free Software Foundation, Inc.
34 dnl This file is free software; the Free Software Foundation
35 dnl gives unlimited permission to copy and/or distribute it,
36 dnl with or without modifications, as long as this notice is preserved.
37
38 dnl This file can be removed once we assume autoconf >= 2.62.
39
40+m4_version_prereq([2.62],, [
41+
42 # _AC_LANG_OPENMP
43 # ---------------
44 # Expands to some language dependent source code for testing the presence of
45@@ -90,3 +92,5 @@
46 fi
47 AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
48 ])
49+
50+])
diff --git a/meta/packages/gettext/gettext-0.17/use_open_properly.patch b/meta/packages/gettext/gettext-0.17/use_open_properly.patch
deleted file mode 100644
index 111714b543..0000000000
--- a/meta/packages/gettext/gettext-0.17/use_open_properly.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Index: gettext-0.17/gettext-tools/src/write-catalog.c
2===================================================================
3--- gettext-0.17.orig/gettext-tools/src/write-catalog.c 2008-10-16 15:18:16.000000000 +0200
4+++ gettext-0.17/gettext-tools/src/write-catalog.c 2008-10-16 18:17:13.000000000 +0200
5@@ -220,7 +220,9 @@
6 /* Open the output file. */
7 if (!to_stdout)
8 {
9- fd = open (filename, O_WRONLY | O_CREAT);
10+ fd = open (filename, O_WRONLY | O_CREAT,
11+ /* 0666 in portable POSIX notation: */
12+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
13 if (fd < 0)
14 {
15 const char *errno_description = strerror (errno);
diff --git a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch b/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch
deleted file mode 100644
index 7b3880bf77..0000000000
--- a/meta/packages/gettext/gettext-0.17/wchar-uclibc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
1Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
2===================================================================
3--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200
4+++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200
5@@ -1,6 +1,6 @@
6 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
7
8- Copyright (C) 2007 Free Software Foundation, Inc.
9+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
10
11 This program is free software; you can redistribute it and/or modify
12 it under the terms of the GNU General Public License as published by
13@@ -26,6 +26,14 @@
14 * the declaration of wcwidth().
15 */
16
17+#ifdef __need_mbstate_t
18+/* Special invocation convention inside uClibc header files. */
19+
20+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
21+
22+#else
23+/* Normal invocation convention. */
24+
25 #ifndef _GL_WCHAR_H
26
27 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
28@@ -80,3 +88,4 @@
29
30 #endif /* _GL_WCHAR_H */
31 #endif /* _GL_WCHAR_H */
32+#endif
33Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
34===================================================================
35--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200
36+++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200
37@@ -1,6 +1,6 @@
38 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
39
40- Copyright (C) 2007 Free Software Foundation, Inc.
41+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
42
43 This program is free software; you can redistribute it and/or modify
44 it under the terms of the GNU General Public License as published by
45@@ -26,6 +26,14 @@
46 * the declaration of wcwidth().
47 */
48
49+#ifdef __need_mbstate_t
50+/* Special invocation convention inside uClibc header files. */
51+
52+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
53+
54+#else
55+/* Normal invocation convention. */
56+
57 #ifndef _GL_WCHAR_H
58
59 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
60@@ -80,3 +88,4 @@
61
62 #endif /* _GL_WCHAR_H */
63 #endif /* _GL_WCHAR_H */
64+#endif
65Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
66===================================================================
67--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200
68+++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200
69@@ -1,6 +1,6 @@
70 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
71
72- Copyright (C) 2007 Free Software Foundation, Inc.
73+ Copyright (C) 2007-2008 Free Software Foundation, Inc.
74
75 This program is free software; you can redistribute it and/or modify
76 it under the terms of the GNU General Public License as published by
77@@ -26,6 +26,14 @@
78 * the declaration of wcwidth().
79 */
80
81+#ifdef __need_mbstate_t
82+/* Special invocation convention inside uClibc header files. */
83+
84+#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
85+
86+#else
87+/* Normal invocation convention. */
88+
89 #ifndef _GL_WCHAR_H
90
91 /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
92@@ -80,3 +88,4 @@
93
94 #endif /* _GL_WCHAR_H */
95 #endif /* _GL_WCHAR_H */
96+#endif
diff --git a/meta/packages/gettext/gettext_0.17.bb b/meta/packages/gettext/gettext_0.17.bb
deleted file mode 100644
index c945891e26..0000000000
--- a/meta/packages/gettext/gettext_0.17.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1DESCRIPTION = "The GNU internationalization library."
2HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
3SECTION = "libs"
4LICENSE = "GPLv3"
5PR = "r5"
6DEPENDS = "gettext-native virtual/libiconv ncurses expat"
7DEPENDS_virtclass-native = ""
8PROVIDES = "virtual/libintl"
9PROVIDES_virtclass-native = ""
10
11SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
12 file://autotools.patch;patch=1 \
13 file://wchar-uclibc.patch;patch=1 \
14 file://use_open_properly.patch;patch=1 \
15 file://m4fix.patch;patch=1 \
16 "
17
18SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
19SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
20
21PARALLEL_MAKE = ""
22
23inherit autotools
24
25EXTRA_OECONF += "--without-lispdir \
26 --disable-csharp \
27 --disable-libasprintf \
28 --disable-java \
29 --disable-native-java \
30 --disable-openmp \
31 --with-included-glib \
32 --with-libncurses-prefix=${STAGING_LIBDIR}/.. \
33 --without-emacs \
34 "
35
36acpaths = '-I ${S}/autoconf-lib-link/m4/ \
37 -I ${S}/gettext-runtime/m4 \
38 -I ${S}/gettext-tools/m4'
39
40
41# these lack the .x behind the .so, but shouldn't be in the -dev package
42# Otherwise you get the following results:
43# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
44# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
45# because gettext depends on gettext-dev, which pulls in more -dev packages:
46# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
47# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
48# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
49# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
50
51PACKAGES =+ "libgettextlib libgettextsrc"
52FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
53FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
54
55BBCLASSEXTEND = "native nativesdk"