[oe-commits] org.oe.dev merge of '2f5bd4fb087c959aaf282ec818451c284de8277c'
florian commit
openembedded-commits at lists.openembedded.org
Mon Aug 27 13:13:22 UTC 2007
merge of '2f5bd4fb087c959aaf282ec818451c284de8277c'
and 'b23b25b1fe0555089f3535775690edbf9ad885f0'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 6113cd3aa82bcb47774f0a89d931aedfe73e26ac
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6113cd3aa82bcb47774f0a89d931aedfe73e26ac
Files:
1
packages/xserver-common/xserver-common_1.10.bb
packages/xserver-common/xserver-common_1.3.bb
packages/xserver-common/xserver-common_1.8.bb
packages/xserver-common/xserver-common_1.9.bb
packages/xserver-common/xserver-common_1.17.bb
packages/xserver-common/xserver-common_1.18.bb
packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch
packages/fbreader/fbreader_0.8.2a.bb
packages/portmap/portmap-6.0
conf/distro/include/angstrom-package-deb.inc
conf/distro/include/angstrom-package-ipk.inc
conf/distro/include/angstrom-package-rpm.inc
packages/alsa/alsa-lib/unbreak_plugindir.patch
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-oss_1.0.14.bb
packages/alsa/alsa-utils_1.0.14.bb
packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch
packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch
packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch
packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch
packages/gcc/gcc-4.2.1/307-locale_facets.patch
packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch
packages/portmap/portmap-6.0/destdir-no-strip.patch
packages/portmap/portmap-6.0/no-libwrap.patch
packages/portmap/portmap-6.0/no-tcpd-support.patch
packages/portmap/portmap_6.0.bb
conf/distro/include/angstrom.inc
packages/gcc/gcc-cross_4.2.1.bb
packages/gcc/gcc_4.2.1.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/portmap/portmap.inc
Diffs:
#
# mt diff -r2f5bd4fb087c959aaf282ec818451c284de8277c -r6113cd3aa82bcb47774f0a89d931aedfe73e26ac
#
#
#
# delete "packages/xserver-common/xserver-common_1.10.bb"
#
# delete "packages/xserver-common/xserver-common_1.3.bb"
#
# delete "packages/xserver-common/xserver-common_1.8.bb"
#
# delete "packages/xserver-common/xserver-common_1.9.bb"
#
# rename "packages/xserver-common/xserver-common_1.17.bb"
# to "packages/xserver-common/xserver-common_1.18.bb"
#
# patch "packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch"
# from [fc88b8e91f46ae81818e65b7ee832fc7b3db915f]
# to [8b922bc76887bc8127d62d1af083f6868a493c90]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2]
# to [d21eeca9a1bb496e84541d55957587838aaa33e9]
#
============================================================
--- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch fc88b8e91f46ae81818e65b7ee832fc7b3db915f
+++ packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch 8b922bc76887bc8127d62d1af083f6868a493c90
@@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles
+ UILIBS = -lqt-mt
else
- UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0
-+ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv
++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget
endif
-CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb bfe9fc8a8216d59eb9cfb3b1456b94f3ee163ef2
+++ packages/fbreader/fbreader_0.8.2a.bb d21eeca9a1bb496e84541d55957587838aaa33e9
@@ -40,8 +40,6 @@ EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}'
CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr"
EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
-LDFLAGS_append = " -liconv"
-
inherit pkgconfig
do_configure() {
#
# mt diff -rb23b25b1fe0555089f3535775690edbf9ad885f0 -r6113cd3aa82bcb47774f0a89d931aedfe73e26ac
#
#
#
# add_dir "packages/portmap/portmap-6.0"
#
# add_file "conf/distro/include/angstrom-package-deb.inc"
# content [8335e823a868d57d55708c602a26223d00ab6084]
#
# add_file "conf/distro/include/angstrom-package-ipk.inc"
# content [440a6b52c9a5ad608b32d2bbbd73a677595a08b1]
#
# add_file "conf/distro/include/angstrom-package-rpm.inc"
# content [765c4bf206ce98aa3df32967a2f3acd60e668558]
#
# add_file "packages/alsa/alsa-lib/unbreak_plugindir.patch"
# content [a16e20ebbbcde514ae86abd3664bf70c4279e5e3]
#
# add_file "packages/alsa/alsa-lib_1.0.14.bb"
# content [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
#
# add_file "packages/alsa/alsa-oss_1.0.14.bb"
# content [7ca8c991dd2976fe24201983328f2b96c073e203]
#
# add_file "packages/alsa/alsa-utils_1.0.14.bb"
# content [a96036a12ca994ce724e4448bb897a719e94a500]
#
# add_file "packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch"
# content [b581c03296f5366b4537f115f0f15b882e4642d9]
#
# add_file "packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch"
# content [64a0003447e854b6c8205b5b87d3cdc8ca7caa1d]
#
# add_file "packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch"
# content [18ed95506560584fd1d043968fbd4b0815788660]
#
# add_file "packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch"
# content [65b2d89ea79630ced487f720de9e5a517e54c408]
#
# add_file "packages/gcc/gcc-4.2.1/307-locale_facets.patch"
# content [5dd86533b193ad688496b19e73f8e0395bb18761]
#
# add_file "packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch"
# content [1f1916106df0ca5ef09c7ab3bb7f1323de3574e6]
#
# add_file "packages/portmap/portmap-6.0/destdir-no-strip.patch"
# content [f8c1fc10af211a706c2d9e98872ddaaeef1c165e]
#
# add_file "packages/portmap/portmap-6.0/no-libwrap.patch"
# content [fc32321b7bf0534d84414d6f1aac381c2ff2475f]
#
# add_file "packages/portmap/portmap-6.0/no-tcpd-support.patch"
# content [e0c8679553ae5264003fc7b888634771ed4c4f3d]
#
# add_file "packages/portmap/portmap_6.0.bb"
# content [ca392f1e64fd7197d9e3a2fda7b4573b8ca5f289]
#
# patch "conf/distro/include/angstrom.inc"
# from [130b27cd1f01aa7501986af41f5aa3ec2ef4b767]
# to [cd8e6ee81497e36eceda2ade49b5706c6f03d464]
#
# patch "packages/gcc/gcc-cross_4.2.1.bb"
# from [320044acba5e9238f864668a392ad637e62641d5]
# to [78f5b4b004f93529c71f6ccf6d0c605f7d25daac]
#
# patch "packages/gcc/gcc_4.2.1.bb"
# from [bafb5bf9dabe0cd6e870dcebb72d25a26d2ff890]
# to [e8dadb13ddc8b7f5a90543b7fc26fd0466b3e1b6]
#
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
# from [77da97f05946e612c7e93275f599fd5891b3876c]
# to [cfb415f977c0f9b8a4e012bd39fe5df35f0e6b2b]
#
# patch "packages/portmap/portmap.inc"
# from [fe3c7fd20199a597bf47cca11fec9bcafa5bc049]
# to [03a075d623238bc9402ae2882f8f05d638c80ab6]
#
============================================================
--- conf/distro/include/angstrom-package-deb.inc 8335e823a868d57d55708c602a26223d00ab6084
+++ conf/distro/include/angstrom-package-deb.inc 8335e823a868d57d55708c602a26223d00ab6084
@@ -0,0 +1 @@
+INHERIT += "package_deb"
============================================================
--- conf/distro/include/angstrom-package-ipk.inc 440a6b52c9a5ad608b32d2bbbd73a677595a08b1
+++ conf/distro/include/angstrom-package-ipk.inc 440a6b52c9a5ad608b32d2bbbd73a677595a08b1
@@ -0,0 +1 @@
+INHERIT += "package_ipk"
============================================================
--- conf/distro/include/angstrom-package-rpm.inc 765c4bf206ce98aa3df32967a2f3acd60e668558
+++ conf/distro/include/angstrom-package-rpm.inc 765c4bf206ce98aa3df32967a2f3acd60e668558
@@ -0,0 +1 @@
+INHERIT += "package_rpm"
============================================================
--- packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
+++ packages/alsa/alsa-lib/unbreak_plugindir.patch a16e20ebbbcde514ae86abd3664bf70c4279e5e3
@@ -0,0 +1,12 @@
+diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
+--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
+@@ -93,7 +93,7 @@
+ esac
+ plugindir="$dir/$PACKAGE"
+ fi
+-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
+ ALSA_PLUGIN_DIR="$plugindir"
+ AC_SUBST(ALSA_PLUGIN_DIR)
+
============================================================
--- packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
+++ packages/alsa/alsa-lib_1.0.14.bb 60431b66fbe642b84eebb662e02f977ce4cf8e9d
@@ -0,0 +1,44 @@
+DESCRIPTION = "Alsa sound library"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+
+PR = "r1"
+
+# configure.in sets -D__arm__ on the command line for any arm system
+# (not just those with the ARM instruction set), this should be removed,
+# (or replaced by a permitted #define).
+#FIXME: remove the following
+ARM_INSTRUCTION_SET = "arm"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
+ file://fix-tstamp-declaration.patch;patch=1 \
+ file://unbreak_plugindir.patch;patch=1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+
+do_stage () {
+ oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
+ install -d ${STAGING_INCDIR}/alsa/sound
+ install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
+ install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev"
+FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*"
+FILES_libasound = "${libdir}/libasound.so.*"
+FILES_alsa-server = "${bindir}/*"
+FILES_alsa-conf = "${datadir}/alsa/"
+FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*"
+FILES_alsa-conf-base = "\
+${datadir}/alsa/alsa.conf \
+${datadir}/alsa/cards/aliases.conf \
+${datadir}/alsa/pcm/default.conf \
+${datadir}/alsa/pcm/dmix.conf \
+${datadir}/alsa/pcm/dsnoop.conf"
+
+RDEPENDS_libasound = "alsa-conf-base"
============================================================
--- packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
+++ packages/alsa/alsa-oss_1.0.14.bb 7ca8c991dd2976fe24201983328f2b96c073e203
@@ -0,0 +1,17 @@
+DESCRIPTION = "Alsa OSS Compatibility Package"
+SECTION = "libs/multimedia"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2"
+
+inherit autotools
+
+do_configure_prepend () {
+ touch NEWS README AUTHORS ChangeLog
+}
+
+do_stage () {
+ oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR}
+ oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR}
+}
============================================================
--- packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.14.bb a96036a12ca994ce724e4448bb897a719e94a500
@@ -0,0 +1,61 @@
+DESCRIPTION = "ALSA Utilities"
+HOMEPAGE = "http://www.alsa-project.org"
+SECTION = "console/utils"
+LICENSE = "GPL"
+DEPENDS = "alsa-lib ncurses"
+
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+
+# lazy hack. needs proper fixing in gettext.m4, see
+# http://bugs.openembedded.org/show_bug.cgi?id=2348
+# please close bug and remove this comment when properly fixed
+#
+EXTRA_OECONF_linux-uclibc = "--disable-nls"
+EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
+
+inherit autotools
+
+# This are all packages that we need to make. Also, the now empty alsa-utils
+# ipk depend on them.
+
+PACKAGES += "\
+ alsa-utils-alsamixer \
+ alsa-utils-midi \
+ alsa-utils-aplay \
+ alsa-utils-amixer \
+ alsa-utils-aconnect \
+ alsa-utils-iecset \
+ alsa-utils-speakertest \
+ alsa-utils-aseqnet \
+ alsa-utils-aseqdump \
+ alsa-utils-alsaconf \
+ alsa-utils-alsactl "
+
+# We omit alsaconf, because
+# a) this is a bash script
+# b) it creates config files not suitable for OE-based distros
+
+FILES_${PN} = ""
+FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord"
+FILES_alsa-utils-amixer = "${bindir}/amixer"
+FILES_alsa-utils-alsamixer = "${bindir}/alsamixer"
+FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/"
+FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi"
+FILES_alsa-utils-aconnect = "${bindir}/aconnect"
+FILES_alsa-utils-aseqnet = "${bindir}/aseqnet"
+FILES_alsa-utils-iecset = "${bindir}/iecset"
+FILES_alsa-utils-alsactl = "${sbindir}/alsactl"
+FILES_alsa-utils-aseqdump = "${bindir}/aseqdump"
+FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf"
+
+DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA"
+DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings"
+DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility"
+DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA"
+DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager"
+DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer"
+DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state"
+DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files"
+
+ALLOW_EMPTY_alsa-utils = "1"
============================================================
--- packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch b581c03296f5366b4537f115f0f15b882e4642d9
+++ packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch b581c03296f5366b4537f115f0f15b882e4642d9
@@ -0,0 +1,11 @@
+--- gcc/gcc/config.gcc.uclibc100-sh~ 2006-03-06 20:46:56 +0100
++++ gcc/gcc/config.gcc 2006-03-10 15:02:41 +0100
+@@ -1905,7 +1905,7 @@
+ ;;
+ sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
+ sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
+- sh-*-linux* | sh[346lbe]*-*-linux* | \
++ sh*-*-linux* | sh[346lbe]*-*-linux* | \
+ sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
+ sh64-*-netbsd* | sh64l*-*-netbsd*)
+ tmake_file="${tmake_file} sh/t-sh sh/t-elf"
============================================================
--- packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch 64a0003447e854b6c8205b5b87d3cdc8ca7caa1d
+++ packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch 64a0003447e854b6c8205b5b87d3cdc8ca7caa1d
@@ -0,0 +1,213 @@
+--- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100
+@@ -60,4 +60,49 @@
+ extern "C" __typeof(wctype_l) __wctype_l;
+ #endif
+
++# define __nl_langinfo_l nl_langinfo_l
++# define __strcoll_l strcoll_l
++# define __strftime_l strftime_l
++# define __strtod_l strtod_l
++# define __strtof_l strtof_l
++# define __strtold_l strtold_l
++# define __strxfrm_l strxfrm_l
++# define __newlocale newlocale
++# define __freelocale freelocale
++# define __duplocale duplocale
++# define __uselocale uselocale
++
++# ifdef _GLIBCXX_USE_WCHAR_T
++# define __iswctype_l iswctype_l
++# define __towlower_l towlower_l
++# define __towupper_l towupper_l
++# define __wcscoll_l wcscoll_l
++# define __wcsftime_l wcsftime_l
++# define __wcsxfrm_l wcsxfrm_l
++# define __wctype_l wctype_l
++# endif
++
++#else
++# define __nl_langinfo_l(N, L) nl_langinfo((N))
++# define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
++# define __strtod_l(S, E, L) strtod((S), (E))
++# define __strtof_l(S, E, L) strtof((S), (E))
++# define __strtold_l(S, E, L) strtold((S), (E))
++# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
++# warning should dummy __newlocale check for C|POSIX ?
++# define __newlocale(a, b, c) NULL
++# define __freelocale(a) ((void)0)
++# define __duplocale(a) __c_locale()
++//# define __uselocale ?
++//
++# ifdef _GLIBCXX_USE_WCHAR_T
++# define __iswctype_l(C, M, L) iswctype((C), (M))
++# define __towlower_l(C, L) towlower((C))
++# define __towupper_l(C, L) towupper((C))
++# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
++//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T))
++# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
++# define __wctype_l(S, L) wctype((S))
++# endif
++
+ #endif // GLIBC 2.3 and later
+--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100
+@@ -39,20 +39,6 @@
+ #include <langinfo.h>
+ #include <bits/c++locale_internal.h>
+
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __strtol_l(S, E, B, L) strtol((S), (E), (B))
+-#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B))
+-#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B))
+-#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B))
+-#define __strtof_l(S, E, L) strtof((S), (E))
+-#define __strtod_l(S, E, L) strtod((S), (E))
+-#define __strtold_l(S, E, L) strtold((S), (E))
+-#warning should dummy __newlocale check for C|POSIX ?
+-#define __newlocale(a, b, c) NULL
+-#define __freelocale(a) ((void)0)
+-#define __duplocale(a) __c_locale()
+-#endif
+-
+ namespace std
+ {
+ template<>
+--- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100
+@@ -36,13 +36,6 @@
+ #include <locale>
+ #include <bits/c++locale_internal.h>
+
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __strcoll_l(S1, S2, L) strcoll((S1), (S2))
+-#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N))
+-#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2))
+-#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N))
+-#endif
+-
+ namespace std
+ {
+ // These are basically extensions to char_traits, and perhaps should
+--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100
+@@ -43,10 +43,6 @@
+ #warning tailor for stub locale support
+ #endif
+
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L) nl_langinfo((N))
+-#endif
+-
+ namespace std
+ {
+ // Construct and return valid pattern consisting of some combination of:
+--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100
+@@ -41,9 +41,6 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning tailor for stub locale support
+ #endif
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L) nl_langinfo((N))
+-#endif
+
+ namespace std
+ {
+--- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100
+@@ -40,9 +40,6 @@
+ #ifdef __UCLIBC_MJN3_ONLY__
+ #warning tailor for stub locale support
+ #endif
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __nl_langinfo_l(N, L) nl_langinfo((N))
+-#endif
+
+ namespace std
+ {
+--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
++++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100
+@@ -38,13 +38,6 @@
+ #undef _LIBC
+ #include <bits/c++locale_internal.h>
+
+-#ifndef __UCLIBC_HAS_XLOCALE__
+-#define __wctype_l(S, L) wctype((S))
+-#define __towupper_l(C, L) towupper((C))
+-#define __towlower_l(C, L) towlower((C))
+-#define __iswctype_l(C, M, L) iswctype((C), (M))
+-#endif
+-
+ namespace std
+ {
+ // NB: The other ctype<char> specializations are in src/locale.cc and
+--- gcc/libstdc++-v3/config/locale/uclibc/messages_m%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list