[oe-commits] org.oe.dev merge of '44147c36bbb2a3438d57b6293a393355eeffc48b'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 17:58:22 UTC 2008
merge of '44147c36bbb2a3438d57b6293a393355eeffc48b'
and 'b9301fc2fdf0a9d64d686b1bcffc18be39655752'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 2e4391863f9f723d62f14d315bb4bc6807683332
ViewMTN: http://monotone.openembedded.org/revision/info/2e4391863f9f723d62f14d315bb4bc6807683332
Files:
1
conf/distro/include/preferred-om-2008-versions.inc
packages/gettext/gettext-native_0.14.1.bb
packages/gettext/gettext-native_0.17.bb
packages/gettext/gettext_0.14.1.bb
packages/gettext/gettext_0.17.bb
packages/gettext/gettext-0.17
packages/gettext/gettext-0.17/autotools.patch
packages/gettext/gettext-0.17/gettext-error_print_progname.patch
packages/gettext/gettext-0.17/wchar-uclibc.patch
packages/xorg-xserver/xorg-xserver-common.inc
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:
#
# mt diff -r44147c36bbb2a3438d57b6293a393355eeffc48b -r2e4391863f9f723d62f14d315bb4bc6807683332
#
#
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [3f57cc1d9ccc38ec468bbbd65dd70825bc572a26]
# to [9e0f57874db1f0e2b3add955960a3e57eb754ea5]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 3f57cc1d9ccc38ec468bbbd65dd70825bc572a26
+++ conf/distro/include/preferred-om-2008-versions.inc 9e0f57874db1f0e2b3add955960a3e57eb754ea5
@@ -986,7 +986,6 @@ PREFERRED_VERSION_libperl6-junction-perl
PREFERRED_VERSION_libpcre ?= "4.4"
PREFERRED_VERSION_libpcre-native ?= "4.4"
PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
-PREFERRED_VERSION_libpixman ?= "0.9.6"
PREFERRED_VERSION_libpng ?= "1.2.20"
PREFERRED_VERSION_libpng-native ?= "1.2.20"
PREFERRED_VERSION_libpthread-stubs ?= "0.1"
@@ -1442,7 +1441,7 @@ PREFERRED_VERSION_pivotinit ?= "1.0.0"
PREFERRED_VERSION_pipeman ?= "1.0.0"
PREFERRED_VERSION_pipepanic ?= "0.1.1"
PREFERRED_VERSION_pivotinit ?= "1.0.0"
-PREFERRED_VERSION_pixman ?= "0.9.6"
+PREFERRED_VERSION_pixman ?= "0.10.0"
PREFERRED_VERSION_pixops-test ?= "1.0"
PREFERRED_VERSION_pkgconfig ?= "0.22"
PREFERRED_VERSION_pkgconfig-native ?= "0.22"
#
# mt diff -rb9301fc2fdf0a9d64d686b1bcffc18be39655752 -r2e4391863f9f723d62f14d315bb4bc6807683332
#
#
#
# rename "packages/gettext/gettext-native_0.14.1.bb"
# to "packages/gettext/gettext-native_0.17.bb"
#
# rename "packages/gettext/gettext_0.14.1.bb"
# to "packages/gettext/gettext_0.17.bb"
#
# add_dir "packages/gettext/gettext-0.17"
#
# add_file "packages/gettext/gettext-0.17/autotools.patch"
# content [ec263abf653b43c91d83157df78087f3f1523c85]
#
# add_file "packages/gettext/gettext-0.17/gettext-error_print_progname.patch"
# content [64a9f6d5686b4ab0c6a01a26c5ab3dec32843732]
#
# add_file "packages/gettext/gettext-0.17/wchar-uclibc.patch"
# content [73e1d5a5c03f5d656a1e636325b0fbce9d3def8d]
#
# add_file "packages/gettext/gettext-native_0.14.1.bb"
# content [2e903067b552793b23bc96c5ec738ada09f03316]
#
# add_file "packages/gettext/gettext_0.14.1.bb"
# content [3a0fa051089a75ecb61149ba3b56405116c60bb2]
#
# patch "packages/gettext/gettext-native_0.17.bb"
# from [2e903067b552793b23bc96c5ec738ada09f03316]
# to [ad61300cb0a81b7353a8eebc4f25857676cd22b9]
#
# patch "packages/gettext/gettext_0.17.bb"
# from [3a0fa051089a75ecb61149ba3b56405116c60bb2]
# to [d39e7c39ab4154e36e9937b5f173e7652e401999]
#
# patch "packages/xorg-xserver/xorg-xserver-common.inc"
# from [dc8d79997ec36fdb922741dc4c5ae140970f9e12]
# to [f246fbf0028822fd0a27404cfc02bb19da3ad7cb]
#
# patch "packages/xorg-xserver/xserver-xorg_1.4.bb"
# from [4390a6545e73aa1015da701f862ee96c21cca2b6]
# to [bfac91f5fae3ca879600e9617161fd20d17d8953]
#
============================================================
--- packages/gettext/gettext-0.17/autotools.patch ec263abf653b43c91d83157df78087f3f1523c85
+++ packages/gettext/gettext-0.17/autotools.patch ec263abf653b43c91d83157df78087f3f1523c85
@@ -0,0 +1,62 @@
+Index: gettext-0.17/gettext-runtime/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/man/Makefile.am 2007-10-07 21:37:36.000000000 +0200
++++ gettext-0.17/gettext-runtime/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
+@@ -158,8 +158,7 @@
+ $(MAN2HTML) $(srcdir)/bind_textdomain_codeset.3.in | sed -e '/CreationDate:/d' > t-$@
+ mv t-$@ $@
+
+-install-html-local:
+- $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ for file in $(man_HTML); do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-tools/man/Makefile.am
+===================================================================
+--- gettext-0.17.orig/gettext-tools/man/Makefile.am 2007-10-28 00:18:37.000000000 +0200
++++ gettext-0.17/gettext-tools/man/Makefile.am 2008-05-09 22:46:37.000000000 +0200
+@@ -186,8 +186,7 @@
+ $(MAN2HTML) `if test -f autopoint.1; then echo .; else echo $(srcdir); fi`/autopoint.1 | sed -e '/CreationDate:/d' > t-$@
+ mv t-$@ $@
+
+-install-html-local:
+- $(mkdir_p) $(DESTDIR)$(htmldir)
++install-html: installdirs-html
+ for file in $(man_HTML); do \
+ if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+ $(INSTALL_DATA) $$dir/$$file $(DESTDIR)$(htmldir)/$$file; \
+Index: gettext-0.17/gettext-runtime/libasprintf/configure.ac
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:42.000000000 +0200
++++ gettext-0.17/gettext-runtime/libasprintf/configure.ac 2008-05-09 22:53:54.000000000 +0200
+@@ -1,5 +1,5 @@
+ dnl Configuration for the GNU libasprintf library
+-dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
++dnl Copyright (C) 2002-2007 Free Software Foundation, Inc.
+ dnl
+ dnl This program is free software: you can redistribute it and/or modify
+ dnl it under the terms of the GNU General Public License as published by
+@@ -54,8 +54,7 @@
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
+ AC_TYPE_SIZE_T
+-gl_AC_TYPE_LONG_LONG
+-gt_TYPE_LONGDOUBLE
++AC_TYPE_LONG_LONG_INT
+ gt_TYPE_WCHAR_T
+ gt_TYPE_WINT_T
+ AC_CHECK_TYPE([ptrdiff_t], ,
+@@ -79,8 +78,11 @@
+ AC_SUBST([ALLOCA_H])
+
+ AC_CHECK_FUNCS([snprintf vasprintf wcslen])
+-AC_CHECK_DECLS([_snprintf])
++dnl Use the _snprintf function only if it is declared (because on NetBSD it
++dnl is defined as a weak alias of snprintf; we prefer to use the latter).
++AC_CHECK_DECLS([_snprintf], , , [#include <stdio.h>])
+ gt_PRINTF_POSIX
++gl_EOVERFLOW
+
+ dnl Check for tools needed for formatting the documentation.
+ ac_aux_dir_abs=`cd $ac_aux_dir && pwd`
============================================================
--- packages/gettext/gettext-0.17/gettext-error_print_progname.patch 64a9f6d5686b4ab0c6a01a26c5ab3dec32843732
+++ packages/gettext/gettext-0.17/gettext-error_print_progname.patch 64a9f6d5686b4ab0c6a01a26c5ab3dec32843732
@@ -0,0 +1,13 @@
+Index: gettext-0.17/gettext-tools/libgettextpo/error.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:25.561115527 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/error.h 2008-07-27 21:16:52.454440505 +0200
+@@ -49,7 +49,7 @@
+ /* If NULL, error will flush stdout, then print on stderr the program
+ name, a colon and a space. Otherwise, error will call this
+ function without parameters instead. */
+-extern DLL_VARIABLE void (*error_print_progname) (void);
++void (*error_print_progname) (void);
+
+ /* This variable is incremented each time `error' is called. */
+ extern DLL_VARIABLE unsigned int error_message_count;
============================================================
--- packages/gettext/gettext-0.17/wchar-uclibc.patch 73e1d5a5c03f5d656a1e636325b0fbce9d3def8d
+++ packages/gettext/gettext-0.17/wchar-uclibc.patch 73e1d5a5c03f5d656a1e636325b0fbce9d3def8d
@@ -0,0 +1,96 @@
+Index: gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:51:52.336394636 +0200
++++ gettext-0.17/gettext-runtime/gnulib-lib/wchar.in.h 2008-07-29 14:52:25.546430195 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+- Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+ * the declaration of wcwidth().
+ */
+
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files. */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention. */
++
+ #ifndef _GL_WCHAR_H
+
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:03.886393956 +0200
++++ gettext-0.17/gettext-tools/gnulib-lib/wchar.in.h 2008-07-29 14:52:50.876388000 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+- Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+ * the declaration of wcwidth().
+ */
+
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files. */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention. */
++
+ #ifndef _GL_WCHAR_H
+
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
+Index: gettext-0.17/gettext-tools/libgettextpo/wchar.in.h
+===================================================================
+--- gettext-0.17.orig/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:51:58.826395009 +0200
++++ gettext-0.17/gettext-tools/libgettextpo/wchar.in.h 2008-07-29 14:52:38.609723575 +0200
+@@ -1,6 +1,6 @@
+ /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
+
+- Copyright (C) 2007 Free Software Foundation, Inc.
++ Copyright (C) 2007-2008 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+@@ -26,6 +26,14 @@
+ * the declaration of wcwidth().
+ */
+
++#ifdef __need_mbstate_t
++/* Special invocation convention inside uClibc header files. */
++
++#@INCLUDE_NEXT@ @NEXT_WCHAR_H@
++
++#else
++/* Normal invocation convention. */
++
+ #ifndef _GL_WCHAR_H
+
+ /* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
+@@ -80,3 +88,4 @@
+
+ #endif /* _GL_WCHAR_H */
+ #endif /* _GL_WCHAR_H */
++#endif
============================================================
--- packages/gettext/gettext-native_0.14.1.bb 2e903067b552793b23bc96c5ec738ada09f03316
+++ packages/gettext/gettext-native_0.14.1.bb 2e903067b552793b23bc96c5ec738ada09f03316
@@ -0,0 +1,60 @@
+require gettext_${PV}.bb
+S = "${WORKDIR}/gettext-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
+inherit native
+DEPENDS = ""
+PROVIDES = ""
+
+M4 = "\
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4 \
+codeset.m4 \
+gettext.m4 \
+glibc21.m4 \
+iconv.m4 \
+intdiv0.m4 \
+intmax.m4 \
+inttypes.m4 \
+inttypes_h.m4 \
+inttypes-pri.m4 \
+isc-posix.m4 \
+lcmessage.m4 \
+longdouble.m4 \
+longlong.m4 \
+nls.m4 \
+po.m4 \
+printf-posix.m4 \
+progtest.m4 \
+signed.m4 \
+size_max.m4 \
+stdint_h.m4 \
+uintmax_t.m4 \
+ulonglong.m4 \
+wchar_t.m4 \
+wint_t.m4 \
+xsize.m4 \
+"
+
+do_stage_append() {
+ for i in ${M4}; do
+ src="gettext-runtime/m4/$i"
+ if [ ! -f $src ]; then
+ src="gettext-tools/m4/$i"
+ fi
+ if [ ! -f $src ]; then
+ src="autoconf-lib-link/m4/$i"
+ fi
+ if [ ! -f $src ]; then
+ echo "can't find $i" >&2
+ exit 1
+ fi
+ install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
+ done
+ # config.rpath is needed by some configure macros and needs to be autoinstalled.
+ # automake will do this but config.rpath needs to be visible to automake
+ for i in `ls -d ${STAGING_DATADIR}/automake*`
+ do
+ cp ${STAGING_DATADIR}/gettext/config.rpath $i
+ done
+}
============================================================
--- packages/gettext/gettext_0.14.1.bb 3a0fa051089a75ecb61149ba3b56405116c60bb2
+++ packages/gettext/gettext_0.14.1.bb 3a0fa051089a75ecb61149ba3b56405116c60bb2
@@ -0,0 +1,49 @@
+DESCRIPTION = "The GNU internationalization library."
+HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r9"
+DEPENDS = "virtual/libiconv"
+PROVIDES = "virtual/libintl"
+
+SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
+ file://gettext-vpath.patch;patch=1;pnum=1 \
+ file://fixchicken.patch;patch=1;pnum=1 \
+ file://linklib_from_0.17.patch;patch=1 \
+ file://getline.m4.patch;patch=1 \
+ file://disable_java.patch;patch=1"
+
+SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
+SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+EXTRA_OECONF += "--without-lisp --disable-csharp"
+acpaths = '-I ${S}/autoconf-lib-link/m4/ \
+ -I ${S}/gettext-runtime/m4 \
+ -I ${S}/gettext-tools/m4'
+
+do_configure_prepend() {
+ rm -f ${S}/config/m4/libtool.m4
+ install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
+}
+
+# these lack the .x behind the .so, but shouldn't be in the -dev package
+# Otherwise you get the following results:
+# 7.4M glibc/images/ep93xx/Angstrom-console-image-glibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# 25M uclibc/images/ep93xx/Angstrom-console-image-uclibc-ipk-2008.1-test-20080104-ep93xx.rootfs.tar.gz
+# because gettext depends on gettext-dev, which pulls in more -dev packages:
+# 15228 KiB /ep93xx/libstdc++-dev_4.2.2-r2_ep93xx.ipk
+# 1300 KiB /ep93xx/uclibc-dev_0.9.29-r8_ep93xx.ipk
+# 140 KiB /armv4t/gettext-dev_0.14.1-r6_armv4t.ipk
+# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
+
+PACKAGES =+ "libgettextlib libgettextsrc"
+FILES_libgettextlib = "${libdir}/libgettextlib-*.so*"
+FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gettext/gettext-native_0.14.1.bb 2e903067b552793b23bc96c5ec738ada09f03316
+++ packages/gettext/gettext-native_0.17.bb ad61300cb0a81b7353a8eebc4f25857676cd22b9
@@ -1,39 +1,44 @@ require gettext_${PV}.bb
require gettext_${PV}.bb
-S = "${WORKDIR}/gettext-${PV}"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
-inherit native
+
DEPENDS = ""
PROVIDES = ""
+inherit native
+
+S = "${WORKDIR}/gettext-${PV}"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gettext-${PV}"
+
M4 = "\
-lib-ld.m4 \
-lib-link.m4 \
-lib-prefix.m4 \
+ansi-c++.m4 \
codeset.m4 \
gettext.m4 \
glibc21.m4 \
+glibc2.m4 \
iconv.m4 \
intdiv0.m4 \
+intldir.m4 \
+intl.m4 \
+intlmacosx.m4 \
intmax.m4 \
-inttypes.m4 \
inttypes_h.m4 \
inttypes-pri.m4 \
-isc-posix.m4 \
lcmessage.m4 \
-longdouble.m4 \
+lock.m4 \
longlong.m4 \
nls.m4 \
po.m4 \
printf-posix.m4 \
progtest.m4 \
-signed.m4 \
size_max.m4 \
stdint_h.m4 \
uintmax_t.m4 \
-ulonglong.m4 \
+visibility.m4 \
wchar_t.m4 \
wint_t.m4 \
xsize.m4 \
+lib-ld.m4 \
+lib-link.m4 \
+lib-prefix.m4 \
"
do_stage_append() {
@@ -51,10 +56,4 @@ do_stage_append() {
fi
install -m 0644 $src ${STAGING_DATADIR}/aclocal/$i
done
- # config.rpath is needed by some configure macros and needs to be autoinstalled.
- # automake will do this but config.rpath needs to be visible to automake
- for i in `ls -d ${STAGING_DATADIR}/automake*`
- do
- cp ${STAGING_DATADIR}/gettext/config.rpath $i
- done
}
============================================================
--- packages/gettext/gettext_0.14.1.bb 3a0fa051089a75ecb61149ba3b56405116c60bb2
+++ packages/gettext/gettext_0.17.bb d39e7c39ab4154e36e9937b5f173e7652e401999
@@ -2,33 +2,42 @@ LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
SECTION = "libs"
LICENSE = "GPL"
-PR = "r9"
+PR = "r0"
+DEFAULT_PREFERENCE = "-1"
DEPENDS = "virtual/libiconv"
PROVIDES = "virtual/libintl"
SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
- file://gettext-vpath.patch;patch=1;pnum=1 \
- file://fixchicken.patch;patch=1;pnum=1 \
- file://linklib_from_0.17.patch;patch=1 \
- file://getline.m4.patch;patch=1 \
- file://disable_java.patch;patch=1"
+ file://autotools.patch;patch=1 \
+ file://wchar-uclibc.patch;patch=1 \
+ "
SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
+#gettext.class cant be inherit here so use this hack same as in libiconv
+DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+EXTRA_OECONF += "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
+
+
PARALLEL_MAKE = ""
inherit autotools
-EXTRA_OECONF += "--without-lisp --disable-csharp"
+EXTRA_OECONF += "--without-lispdir \
+ --disable-csharp \
+ --disable-libasprintf \
+ --disable-java \
+ --disable-native-java \
+ --disable-openmp \
+ --with-included-glib \
+ --without-emacs \
+ "
acpaths = '-I ${S}/autoconf-lib-link/m4/ \
-I ${S}/gettext-runtime/m4 \
-I ${S}/gettext-tools/m4'
-do_configure_prepend() {
- rm -f ${S}/config/m4/libtool.m4
- install -m 0644 ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/config/m4/
-}
# these lack the .x behind the .so, but shouldn't be in the -dev package
# Otherwise you get the following results:
============================================================
--- packages/xorg-xserver/xorg-xserver-common.inc dc8d79997ec36fdb922741dc4c5ae140970f9e12
+++ packages/xorg-xserver/xorg-xserv%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list