From 1227869c347864af12e148857c5881b796b251cc Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 22 Aug 2008 21:27:49 +0000 Subject: libvisual 0.4: New recipe. --- packages/libvisual/libvisual_0.4.0.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/libvisual/libvisual_0.4.0.bb diff --git a/packages/libvisual/libvisual_0.4.0.bb b/packages/libvisual/libvisual_0.4.0.bb new file mode 100644 index 0000000000..4c1eff1651 --- /dev/null +++ b/packages/libvisual/libvisual_0.4.0.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "A cross platform audio visualization library" +HOMEPAGE = "http://libvisual.sf.net" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL GPL" +SRC_URI = "${SOURCEFORGE_MIRROR}/libvisual/libvisual-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 7b4b060580594128c72ad4398d70e5e6b904cf94 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Fri, 22 Aug 2008 22:46:44 +0000 Subject: boost.inc: Fixed python version - re-enables compiling boost_python. boost 1.33.0: Raised PR. boost 1.33.1: Raised PR. --- packages/boost/boost.inc | 4 ++-- packages/boost/boost_1.33.0.bb | 2 ++ packages/boost/boost_1.33.1.bb | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/boost/boost.inc b/packages/boost/boost.inc index 4458f367a1..80635b0f9f 100644 --- a/packages/boost/boost.inc +++ b/packages/boost/boost.inc @@ -61,8 +61,8 @@ FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}" #PYTHON_ROOT = "/dev/null" # to remove the python build DEPENDS += "python" -PYTHON_ROOT = "${STAGING_DIR_HOST}" -PYTHON_VERSION = "2.4" +PYTHON_ROOT = "${STAGING_DIR_HOST}/${layout_prefix}" +PYTHON_VERSION = "2.5" BOOSTLIBS += "boost-python" FILES_boost-python = "${libdir}/libboost_python.so.${PV}" diff --git a/packages/boost/boost_1.33.0.bb b/packages/boost/boost_1.33.0.bb index f910924cf1..520cf43a8d 100644 --- a/packages/boost/boost_1.33.0.bb +++ b/packages/boost/boost_1.33.0.bb @@ -1,5 +1,7 @@ include boost.inc +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" #SRC_URI += "file://unit_test_log10f.patch;patch=1" SRC_URI += "file://linux-uclibc.patch;patch=1" diff --git a/packages/boost/boost_1.33.1.bb b/packages/boost/boost_1.33.1.bb index c08721dc9f..840be8b784 100644 --- a/packages/boost/boost_1.33.1.bb +++ b/packages/boost/boost_1.33.1.bb @@ -1,6 +1,6 @@ include boost.inc -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/boost/${BOOST_P}.tar.bz2" #SRC_URI += "file://unit_test_log10f.patch;patch=1" -- cgit v1.2.3 From a7ce2fb467521c1f188982caaf7d82be5beaead0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Aug 2008 02:22:17 +0000 Subject: Refresh patches based on 4.3.1 for 4.3.2 All it needed was regenerating configure scripts. -Khem --- packages/gcc/gcc-4.3.2.inc | 18 +- packages/gcc/gcc-4.3.2/200-uclibc-locale.patch | 84 +- .../gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch | 1222 +++++++++++--------- packages/gcc/gcc-4.3.2/gcc-flags-for-build.patch | 164 ++- packages/gcc/gcc-cross-sdk_4.3.2.bb | 2 + packages/gcc/gcc-cross_4.3.2.bb | 1 + packages/gcc/gcc_4.3.2.bb | 1 + 7 files changed, 848 insertions(+), 644 deletions(-) diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index 1c09b12f1c..b21dd3100f 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -20,22 +20,22 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \ file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \ file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \ - file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \ + file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \ file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \ file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ file://debian/pr30961.dpatch;patch=1;pnum=0 \ file://100-uclibc-conf.patch;patch=1 \ file://103-uclibc-conf-noupstream.patch;patch=1 \ -# file://200-uclibc-locale.patch;patch=1 \ -# file://203-uclibc-locale-no__x.patch;patch=1 \ -# file://204-uclibc-locale-wchar_fix.patch;patch=1 \ -# file://205-uclibc-locale-update.patch;patch=1 \ + file://200-uclibc-locale.patch;patch=1 \ + file://203-uclibc-locale-no__x.patch;patch=1 \ + file://204-uclibc-locale-wchar_fix.patch;patch=1 \ + file://205-uclibc-locale-update.patch;patch=1 \ file://301-missing-execinfo_h.patch;patch=1 \ file://302-c99-snprintf.patch;patch=1 \ file://303-c99-complex-ugly-hack.patch;patch=1 \ file://304-index_macro.patch;patch=1 \ file://305-libmudflap-susv3-legacy.patch;patch=1 \ -# file://306-libstdc++-namespace.patch;patch=1 \ + file://306-libstdc++-namespace.patch;patch=1 \ file://307-locale_facets.patch;patch=1 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ @@ -53,10 +53,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ # file://fortran-static-linking.patch;patch=1 \ # file://intermask-bigendian.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ -# file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ + file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ -# file://zecke-xgcc-cpp.patch;patch=1 \ -# file://gcc-flags-for-build.patch;patch=1 \ + file://zecke-xgcc-cpp.patch;patch=1 \ + file://gcc-flags-for-build.patch;patch=1 \ " SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " diff --git a/packages/gcc/gcc-4.3.2/200-uclibc-locale.patch b/packages/gcc/gcc-4.3.2/200-uclibc-locale.patch index 398f7a4436..70ba98eed7 100644 --- a/packages/gcc/gcc-4.3.2/200-uclibc-locale.patch +++ b/packages/gcc/gcc-4.3.2/200-uclibc-locale.patch @@ -1,7 +1,7 @@ -Index: gcc-4.3.1/libstdc++-v3/acinclude.m4 +Index: gcc-4.3.2/libstdc++-v3/acinclude.m4 =================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/acinclude.m4 2008-08-19 01:15:23.000000000 -0700 +--- gcc-4.3.2.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/acinclude.m4 2008-08-28 17:55:56.000000000 -0700 @@ -1349,7 +1349,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@], @@ -62,10 +62,10 @@ Index: gcc-4.3.1/libstdc++-v3/acinclude.m4 esac # This is where the testsuite looks for locale catalogs, using the -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,63 @@ +// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- + @@ -130,10 +130,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h +#endif + +#endif // GLIBC 2.3 and later -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,160 @@ +// Wrapper for underlying C-language localization -*- C++ -*- + @@ -295,10 +295,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc +{ + const char* const* const locale::_S_categories = __gnu_cxx::category_names; +} // namespace std -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,117 @@ +// Wrapper for underlying C-language localization -*- C++ -*- + @@ -417,10 +417,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h +} + +#endif -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-08-19 01:39:14.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,308 @@ +// std::codecvt implementation details, GNU version -*- C++ -*- + @@ -730,10 +730,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc + } +#endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,80 @@ +// std::collate implementation details, GNU version -*- C++ -*- + @@ -815,10 +815,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc + { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); } +#endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,300 @@ +// std::ctype implementation details, GNU version -*- C++ -*- + @@ -1120,10 +1120,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc + } +#endif // _GLIBCXX_USE_WCHAR_T +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,100 @@ +// std::messages implementation details, GNU version -*- C++ -*- + @@ -1225,10 +1225,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc + } +#endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,118 @@ +// std::messages implementation details, GNU version -*- C++ -*- + @@ -1348,10 +1348,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h + this->_S_create_c_locale(this->_M_c_locale_messages, __s); + } + } -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,692 @@ +// std::moneypunct implementation details, GNU version -*- C++ -*- + @@ -2045,10 +2045,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc + } +#endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,160 @@ +// std::numpunct implementation details, GNU version -*- C++ -*- + @@ -2210,10 +2210,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc + { delete _M_data; } + #endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,406 @@ +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- + @@ -2621,10 +2621,10 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc + } +#endif +} -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h +Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-19 01:38:05.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-28 17:55:56.000000000 -0700 @@ -0,0 +1,68 @@ +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- + @@ -2694,11 +2694,11 @@ Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h + delete _M_data; + _S_destroy_c_locale(_M_c_locale_timepunct); + } -Index: gcc-4.3.1/libstdc++-v3/configure +Index: gcc-4.3.2/libstdc++-v3/configure =================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/configure 2008-04-25 09:52:57.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/configure 2008-08-19 01:38:04.000000000 -0700 -@@ -14001,7 +14001,7 @@ +--- gcc-4.3.2.orig/libstdc++-v3/configure 2008-07-07 12:49:54.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/configure 2008-08-28 18:02:13.000000000 -0700 +@@ -14003,7 +14003,7 @@ enableval="$enable_clocale" case "$enableval" in @@ -2707,7 +2707,7 @@ Index: gcc-4.3.1/libstdc++-v3/configure *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5 echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;} { (exit 1); exit 1; }; } ;; -@@ -14034,6 +14034,9 @@ +@@ -14036,6 +14036,9 @@ # Default to "generic". if test $enable_clocale_flag = auto; then case ${target_os} in @@ -2717,7 +2717,7 @@ Index: gcc-4.3.1/libstdc++-v3/configure linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) enable_clocale_flag=gnu ;; -@@ -14422,6 +14425,76 @@ +@@ -14424,6 +14427,76 @@ CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -2794,19 +2794,19 @@ Index: gcc-4.3.1/libstdc++-v3/configure esac # This is where the testsuite looks for locale catalogs, using the -@@ -17014,7 +17087,7 @@ +@@ -17016,7 +17089,7 @@ # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. cat > conftest.$ac_ext << EOF --#line 17017 "configure" -+#line 17090 "configure" +-#line 17019 "configure" ++#line 17092 "configure" int main() { // NB: _Atomic_word not necessarily int. -Index: gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h +Index: gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h =================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 14:59:49.000000000 -0800 -+++ gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h 2008-08-19 01:15:23.000000000 -0700 +--- gcc-4.3.2.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 14:59:49.000000000 -0800 ++++ gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h 2008-08-28 17:55:56.000000000 -0700 @@ -106,7 +106,9 @@ using std::wmemcpy; using std::wmemmove; @@ -2817,10 +2817,10 @@ Index: gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h #if _GLIBCXX_USE_C99 using std::wcstold; -Index: gcc-4.3.1/libstdc++-v3/include/c_std/cwchar +Index: gcc-4.3.2/libstdc++-v3/include/c_std/cwchar =================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/include/c_std/cwchar 2007-05-27 07:50:21.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/include/c_std/cwchar 2008-08-19 01:15:23.000000000 -0700 +--- gcc-4.3.2.orig/libstdc++-v3/include/c_std/cwchar 2007-05-27 07:50:21.000000000 -0700 ++++ gcc-4.3.2/libstdc++-v3/include/c_std/cwchar 2008-08-28 17:55:56.000000000 -0700 @@ -182,7 +182,9 @@ using ::wcscoll; using ::wcscpy; diff --git a/packages/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/packages/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch index 317a58b6a3..aba1e2df69 100644 --- a/packages/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch +++ b/packages/gcc/gcc-4.3.2/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch @@ -69,11 +69,11 @@ gcc: libiberty/configure.ac | 43 - 13 files changed, 1454 insertions(+), 896 deletions(-) -Index: gcc-4.3.1/configure.ac +Index: gcc-4.3.2/configure.ac =================================================================== ---- gcc-4.3.1.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.1/configure.ac 2008-08-20 00:47:50.000000000 -0700 -@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map], +--- gcc-4.3.2.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800 ++++ gcc-4.3.2/configure.ac 2008-08-28 18:18:37.000000000 -0700 +@@ -1667,6 +1667,38 @@ [DEBUG_PREFIX_CFLAGS_FOR_TARGET=]) AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET) @@ -112,11 +112,11 @@ Index: gcc-4.3.1/configure.ac # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -Index: gcc-4.3.1/Makefile.def +Index: gcc-4.3.2/Makefile.def =================================================================== ---- gcc-4.3.1.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 -+++ gcc-4.3.1/Makefile.def 2008-08-20 00:47:50.000000000 -0700 -@@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL ; }; +--- gcc-4.3.2.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700 ++++ gcc-4.3.2/Makefile.def 2008-08-28 18:18:37.000000000 -0700 +@@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL_DATA ; }; flags_to_pass = { flag= INSTALL_PROGRAM ; }; flags_to_pass = { flag= INSTALL_SCRIPT ; }; @@ -124,7 +124,7 @@ Index: gcc-4.3.1/Makefile.def flags_to_pass = { flag= LEX ; }; flags_to_pass = { flag= M4 ; }; flags_to_pass = { flag= MAKE ; }; -@@ -511,43 +512,51 @@ bootstrap_stage = { +@@ -511,43 +512,51 @@ // compiler probably has never heard of them. stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \ --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ; @@ -184,11 +184,11 @@ Index: gcc-4.3.1/Makefile.def - stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; }; + stage_cflags='$(STAGE3_CFLAGS) -fprofile-use' ; + stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; }; -Index: gcc-4.3.1/Makefile.tpl +Index: gcc-4.3.2/Makefile.tpl =================================================================== ---- gcc-4.3.1.orig/Makefile.tpl 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/Makefile.tpl 2008-08-20 00:47:50.000000000 -0700 -@@ -23,6 +23,14 @@ in +--- gcc-4.3.2.orig/Makefile.tpl 2008-08-28 18:05:25.000000000 -0700 ++++ gcc-4.3.2/Makefile.tpl 2008-08-28 18:18:37.000000000 -0700 +@@ -23,6 +23,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -203,7 +203,7 @@ Index: gcc-4.3.1/Makefile.tpl # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -139,6 +147,13 @@ BUILD_EXPORTS = \ +@@ -139,6 +147,13 @@ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; @@ -217,7 +217,7 @@ Index: gcc-4.3.1/Makefile.tpl # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring -@@ -153,6 +168,7 @@ HOST_SUBDIR = @host_subdir@ +@@ -153,6 +168,7 @@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -225,7 +225,7 @@ Index: gcc-4.3.1/Makefile.tpl CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -207,10 +223,10 @@ BASE_TARGET_EXPORTS = \ +@@ -207,10 +223,10 @@ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ @@ -238,7 +238,7 @@ Index: gcc-4.3.1/Makefile.tpl GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -322,7 +338,6 @@ LDFLAGS = @LDFLAGS@ +@@ -323,7 +339,6 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -246,7 +246,7 @@ Index: gcc-4.3.1/Makefile.tpl # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -330,14 +345,19 @@ PICFLAG = +@@ -331,14 +346,19 @@ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -267,7 +267,7 @@ Index: gcc-4.3.1/Makefile.tpl do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -376,22 +396,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ +@@ -377,22 +397,14 @@ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -294,7 +294,7 @@ Index: gcc-4.3.1/Makefile.tpl # ------------------------------------ # Miscellaneous targets and flag lists -@@ -491,19 +503,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ +@@ -492,19 +504,20 @@ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -320,7 +320,7 @@ Index: gcc-4.3.1/Makefile.tpl 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -851,9 +864,11 @@ configure-stage[+id+]-[+prefix+][+module +@@ -852,9 +865,11 @@ fi; \ [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ [+exports+][+ IF prev +] \ @@ -334,7 +334,7 @@ Index: gcc-4.3.1/Makefile.tpl echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ cd [+subdir+]/[+module+] || exit 1; \ -@@ -890,7 +905,8 @@ all-[+prefix+][+module+]: configure-[+pr +@@ -891,7 +906,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ [+exports+] \ (cd [+subdir+]/[+module+] && \ @@ -344,7 +344,7 @@ Index: gcc-4.3.1/Makefile.tpl @endif [+prefix+][+module+] [+ IF bootstrap +] -@@ -910,8 +926,11 @@ all-stage[+id+]-[+prefix+][+module+]: co +@@ -911,8 +927,11 @@ [+exports+][+ IF prev +] \ [+poststage1_exports+][+ ENDIF prev +] \ cd [+subdir+]/[+module+] && \ @@ -358,7 +358,7 @@ Index: gcc-4.3.1/Makefile.tpl IF prev +][+poststage1_args+][+ ENDIF prev +] [+extra_make_flags+] \ $(TARGET-stage[+id+]-[+prefix+][+module+]) -@@ -944,7 +963,8 @@ clean-stage[+id+]-[+prefix+][+module+]: +@@ -945,7 +964,8 @@ target_alias=(get "target" "${target_alias}") args="$(BUILD_CONFIGARGS)" no-config-site=true +] @@ -368,7 +368,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ENDFOR build_module +] # -------------------------------------- -@@ -961,7 +981,7 @@ clean-stage[+id+]-[+prefix+][+module+]: +@@ -962,7 +982,7 @@ [+ all prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)" poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" @@ -377,7 +377,7 @@ Index: gcc-4.3.1/Makefile.tpl poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +] .PHONY: check-[+module+] maybe-check-[+module+] -@@ -1059,7 +1079,7 @@ maybe-[+make_target+]-[+module+]: [+make +@@ -1060,7 +1080,7 @@ [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(RAW_CXX_TARGET_EXPORTS)" @@ -386,7 +386,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ELSE +] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true -@@ -1070,7 +1090,7 @@ maybe-[+make_target+]-[+module+]: [+make +@@ -1071,7 +1091,7 @@ [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" exports="$(NORMAL_TARGET_EXPORTS)" @@ -395,7 +395,7 @@ Index: gcc-4.3.1/Makefile.tpl [+ ENDIF +] .PHONY: check-target-[+module+] maybe-check-target-[+module+] -@@ -1300,7 +1320,7 @@ stage[+id+]-end:: [+ FOR host_modules +] +@@ -1301,7 +1321,7 @@ # Bubble a bug fix through all the stages up to stage [+id+]. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -404,7 +404,7 @@ Index: gcc-4.3.1/Makefile.tpl .PHONY: stage[+id+]-bubble stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @r=`${PWD_COMMAND}`; export r; \ -@@ -1439,11 +1459,11 @@ stage_current: +@@ -1440,11 +1460,11 @@ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap @@ -418,7 +418,7 @@ Index: gcc-4.3.1/Makefile.tpl @endif gcc-bootstrap # -------------------------------------- -@@ -1474,7 +1494,7 @@ configure-target-[+module+]: maybe-all-g +@@ -1475,7 +1495,7 @@ [+ ;; These Scheme functions build the bulk of the dependencies. ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc", @@ -427,7 +427,7 @@ Index: gcc-4.3.1/Makefile.tpl ;; is taken from VAR-NAME. (define dep-target (lambda (module-kind var-name hard) (string-append -@@ -1632,7 +1652,8 @@ config.status: configure +@@ -1633,7 +1653,8 @@ # Rebuilding configure. AUTOCONF = autoconf @@ -437,10 +437,10 @@ Index: gcc-4.3.1/Makefile.tpl cd $(srcdir) && $(AUTOCONF) # ------------------------------ -Index: gcc-4.3.1/config/mh-ppc-darwin +Index: gcc-4.3.2/config/mh-ppc-darwin =================================================================== ---- gcc-4.3.1.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 -+++ gcc-4.3.1/config/mh-ppc-darwin 2008-08-20 00:47:50.000000000 -0700 +--- gcc-4.3.2.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700 ++++ gcc-4.3.2/config/mh-ppc-darwin 2008-08-28 18:18:37.000000000 -0700 @@ -2,5 +2,4 @@ # position-independent-code -- the usual default on Darwin. This fix speeds # compiles by 3-5%. @@ -448,11 +448,11 @@ Index: gcc-4.3.1/config/mh-ppc-darwin -# Broken because of PR32009. -# BOOT_CFLAGS=-g -O2 -mdynamic-no-pic +BOOT_CFLAGS=-g -O2 -mdynamic-no-pic -Index: gcc-4.3.1/gcc/doc/install.texi +Index: gcc-4.3.2/gcc/doc/install.texi =================================================================== ---- gcc-4.3.1.orig/gcc/doc/install.texi 2008-05-22 23:58:10.000000000 -0700 -+++ gcc-4.3.1/gcc/doc/install.texi 2008-08-20 00:47:50.000000000 -0700 -@@ -1772,33 +1772,35 @@ same described above, but object files f +--- gcc-4.3.2.orig/gcc/doc/install.texi 2008-06-18 22:59:30.000000000 -0700 ++++ gcc-4.3.2/gcc/doc/install.texi 2008-08-28 18:18:37.000000000 -0700 +@@ -1778,33 +1778,35 @@ stage2 of the 3-stage bootstrap of the compiler are deleted as soon as they are no longer needed. @@ -513,7 +513,7 @@ Index: gcc-4.3.1/gcc/doc/install.texi If you used the flag @option{--enable-languages=@dots{}} to restrict the compilers to be built, only those you've actually enabled will be -@@ -2689,8 +2691,8 @@ cross-compilers on the Alpha for 32-bit +@@ -2695,8 +2697,8 @@ a few cases and may not work properly. @samp{make compare} may fail on old versions of DEC Unix unless you add @@ -524,10 +524,10 @@ Index: gcc-4.3.1/gcc/doc/install.texi comparison fail if it differs between the @code{stage1} and @code{stage2} compilations. The option @option{-save-temps} forces a fixed name to be used for the assembler input file, instead of a -Index: gcc-4.3.1/Makefile.in +Index: gcc-4.3.2/Makefile.in =================================================================== ---- gcc-4.3.1.orig/Makefile.in 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/Makefile.in 2008-08-20 00:47:50.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.in 2008-08-28 18:05:25.000000000 -0700 ++++ gcc-4.3.2/Makefile.in 2008-08-28 18:18:37.000000000 -0700 @@ -20,6 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # @@ -543,7 +543,7 @@ Index: gcc-4.3.1/Makefile.in # ------------------------------- # Standard Autoconf-set variables # ------------------------------- -@@ -136,6 +144,13 @@ BUILD_EXPORTS = \ +@@ -136,6 +144,13 @@ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; @@ -557,7 +557,7 @@ Index: gcc-4.3.1/Makefile.in # This is the list of directories to built for the host system. SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring -@@ -150,6 +165,7 @@ HOST_SUBDIR = @host_subdir@ +@@ -150,6 +165,7 @@ HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -565,7 +565,7 @@ Index: gcc-4.3.1/Makefile.in CFLAGS="$(CFLAGS)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ CXX="$(CXX)"; export CXX; \ -@@ -204,10 +220,10 @@ BASE_TARGET_EXPORTS = \ +@@ -204,10 +220,10 @@ AR="$(AR_FOR_TARGET)"; export AR; \ AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ @@ -578,7 +578,7 @@ Index: gcc-4.3.1/Makefile.in GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ -@@ -319,7 +335,6 @@ LDFLAGS = @LDFLAGS@ +@@ -320,7 +336,6 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates @@ -586,7 +586,7 @@ Index: gcc-4.3.1/Makefile.in # Only build the C compiler for stage1, because that is the only one that # we can guarantee will build with the native compiler, and also it is the -@@ -327,14 +342,19 @@ PICFLAG = +@@ -328,14 +343,19 @@ # MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them # overrideable (for a bootstrap build stage1 also builds gcc.info). @@ -607,7 +607,7 @@ Index: gcc-4.3.1/Makefile.in do-compare = @do_compare@ do-compare3 = $(do-compare) do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2 -@@ -373,22 +393,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_ +@@ -374,22 +394,14 @@ COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ @@ -634,7 +634,7 @@ Index: gcc-4.3.1/Makefile.in # ------------------------------------ # Miscellaneous targets and flag lists -@@ -495,6 +507,7 @@ BASE_FLAGS_TO_PASS = \ +@@ -496,6 +508,7 @@ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ @@ -642,7 +642,7 @@ Index: gcc-4.3.1/Makefile.in "LEX=$(LEX)" \ "M4=$(M4)" \ "MAKE=$(MAKE)" \ -@@ -591,19 +604,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \ +@@ -592,19 +605,20 @@ # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -668,7 +668,7 @@ Index: gcc-4.3.1/Makefile.in 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ -@@ -2737,7 +2751,8 @@ all-build-libiberty: configure-build-lib +@@ -2738,7 +2752,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/libiberty && \ @@ -678,7 +678,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-libiberty -@@ -2792,7 +2807,8 @@ all-build-bison: configure-build-bison +@@ -2793,7 +2808,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/bison && \ @@ -688,7 +688,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-bison -@@ -2847,7 +2863,8 @@ all-build-byacc: configure-build-byacc +@@ -2848,7 +2864,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/byacc && \ @@ -698,7 +698,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-byacc -@@ -2902,7 +2919,8 @@ all-build-flex: configure-build-flex +@@ -2903,7 +2920,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/flex && \ @@ -708,7 +708,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-flex -@@ -2957,7 +2975,8 @@ all-build-m4: configure-build-m4 +@@ -2958,7 +2976,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/m4 && \ @@ -718,7 +718,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-m4 -@@ -3012,7 +3031,8 @@ all-build-texinfo: configure-build-texin +@@ -3013,7 +3032,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/texinfo && \ @@ -728,7 +728,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-texinfo -@@ -3067,7 +3087,8 @@ all-build-fixincludes: configure-build-f +@@ -3068,7 +3088,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ (cd $(BUILD_SUBDIR)/fixincludes && \ @@ -738,7 +738,7 @@ Index: gcc-4.3.1/Makefile.in @endif build-fixincludes -@@ -3126,7 +3147,8 @@ all-ash: configure-ash +@@ -3127,7 +3148,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ash && \ @@ -748,7 +748,7 @@ Index: gcc-4.3.1/Makefile.in @endif ash -@@ -3550,7 +3572,8 @@ all-autoconf: configure-autoconf +@@ -3551,7 +3573,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/autoconf && \ @@ -758,7 +758,7 @@ Index: gcc-4.3.1/Makefile.in @endif autoconf -@@ -3974,7 +3997,8 @@ all-automake: configure-automake +@@ -3975,7 +3998,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/automake && \ @@ -768,7 +768,7 @@ Index: gcc-4.3.1/Makefile.in @endif automake -@@ -4398,7 +4422,8 @@ all-bash: configure-bash +@@ -4399,7 +4423,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bash && \ @@ -778,7 +778,7 @@ Index: gcc-4.3.1/Makefile.in @endif bash -@@ -4815,9 +4840,9 @@ configure-stage1-bfd: +@@ -4816,9 +4841,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ @@ -790,7 +790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4846,9 +4871,9 @@ configure-stage2-bfd: +@@ -4847,9 +4872,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -802,7 +802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4877,9 +4902,9 @@ configure-stageb2g0-bfd: +@@ -4878,9 +4903,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -814,7 +814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4908,9 +4933,9 @@ configure-stage3-bfd: +@@ -4909,9 +4934,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -826,7 +826,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4939,9 +4964,9 @@ configure-stageb3g2-bfd: +@@ -4940,9 +4965,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -838,7 +838,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -4970,9 +4995,9 @@ configure-stage4-bfd: +@@ -4971,9 +4996,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -850,7 +850,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5001,9 +5026,9 @@ configure-stageprofile-bfd: +@@ -5002,9 +5027,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -862,7 +862,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5032,9 +5057,9 @@ configure-stagefeedback-bfd: +@@ -5033,9 +5058,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -874,7 +874,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ -@@ -5069,7 +5094,8 @@ all-bfd: configure-bfd +@@ -5070,7 +5095,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ @@ -884,7 +884,7 @@ Index: gcc-4.3.1/Makefile.in @endif bfd -@@ -5088,8 +5114,11 @@ all-stage1-bfd: configure-stage1-bfd +@@ -5089,8 +5115,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -898,7 +898,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-bfd) maybe-clean-stage1-bfd: clean-stage1-bfd -@@ -5102,7 +5131,7 @@ clean-stage1-bfd: +@@ -5103,7 +5132,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -907,7 +907,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif bfd-bootstrap -@@ -5122,8 +5151,11 @@ all-stage2-bfd: configure-stage2-bfd +@@ -5123,8 +5152,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -921,7 +921,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-bfd) maybe-clean-stage2-bfd: clean-stage2-bfd -@@ -5136,7 +5168,7 @@ clean-stage2-bfd: +@@ -5137,7 +5169,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -930,7 +930,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5157,8 +5189,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b +@@ -5158,8 +5190,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -944,7 +944,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-bfd) maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd -@@ -5171,7 +5206,7 @@ clean-stageb2g0-bfd: +@@ -5172,7 +5207,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -953,7 +953,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5192,8 +5227,11 @@ all-stage3-bfd: configure-stage3-bfd +@@ -5193,8 +5228,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -967,7 +967,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-bfd) maybe-clean-stage3-bfd: clean-stage3-bfd -@@ -5206,7 +5244,7 @@ clean-stage3-bfd: +@@ -5207,7 +5245,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -976,7 +976,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5227,8 +5265,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b +@@ -5228,8 +5266,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -990,7 +990,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-bfd) maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd -@@ -5241,7 +5282,7 @@ clean-stageb3g2-bfd: +@@ -5242,7 +5283,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -999,7 +999,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5262,8 +5303,11 @@ all-stage4-bfd: configure-stage4-bfd +@@ -5263,8 +5304,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1013,7 +1013,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-bfd) maybe-clean-stage4-bfd: clean-stage4-bfd -@@ -5276,7 +5320,7 @@ clean-stage4-bfd: +@@ -5277,7 +5321,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1022,7 +1022,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5297,8 +5341,11 @@ all-stageprofile-bfd: configure-stagepro +@@ -5298,8 +5342,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1036,7 +1036,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-bfd) maybe-clean-stageprofile-bfd: clean-stageprofile-bfd -@@ -5311,7 +5358,7 @@ clean-stageprofile-bfd: +@@ -5312,7 +5359,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1045,7 +1045,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5332,8 +5379,11 @@ all-stagefeedback-bfd: configure-stagefe +@@ -5333,8 +5380,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/bfd && \ @@ -1059,7 +1059,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-bfd) maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd -@@ -5346,7 +5396,7 @@ clean-stagefeedback-bfd: +@@ -5347,7 +5397,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/bfd && \ @@ -1068,7 +1068,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif bfd-bootstrap -@@ -5753,9 +5803,9 @@ configure-stage1-opcodes: +@@ -5754,9 +5804,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ @@ -1080,7 +1080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5784,9 +5834,9 @@ configure-stage2-opcodes: +@@ -5785,9 +5835,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1092,7 +1092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5815,9 +5865,9 @@ configure-stageb2g0-opcodes: +@@ -5816,9 +5866,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1104,7 +1104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5846,9 +5896,9 @@ configure-stage3-opcodes: +@@ -5847,9 +5897,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1116,7 +1116,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5877,9 +5927,9 @@ configure-stageb3g2-opcodes: +@@ -5878,9 +5928,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1128,7 +1128,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5908,9 +5958,9 @@ configure-stage4-opcodes: +@@ -5909,9 +5959,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1140,7 +1140,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5939,9 +5989,9 @@ configure-stageprofile-opcodes: +@@ -5940,9 +5990,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1152,7 +1152,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -5970,9 +6020,9 @@ configure-stagefeedback-opcodes: +@@ -5971,9 +6021,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1164,7 +1164,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ -@@ -6007,7 +6057,8 @@ all-opcodes: configure-opcodes +@@ -6008,7 +6058,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ @@ -1174,7 +1174,7 @@ Index: gcc-4.3.1/Makefile.in @endif opcodes -@@ -6026,8 +6077,11 @@ all-stage1-opcodes: configure-stage1-opc +@@ -6027,8 +6078,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1188,7 +1188,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-opcodes) maybe-clean-stage1-opcodes: clean-stage1-opcodes -@@ -6040,7 +6094,7 @@ clean-stage1-opcodes: +@@ -6041,7 +6095,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1197,7 +1197,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif opcodes-bootstrap -@@ -6060,8 +6114,11 @@ all-stage2-opcodes: configure-stage2-opc +@@ -6061,8 +6115,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1211,7 +1211,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-opcodes) maybe-clean-stage2-opcodes: clean-stage2-opcodes -@@ -6074,7 +6131,7 @@ clean-stage2-opcodes: +@@ -6075,7 +6132,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1220,7 +1220,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6095,8 +6152,11 @@ all-stageb2g0-opcodes: configure-stageb2 +@@ -6096,8 +6153,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1234,7 +1234,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-opcodes) maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes -@@ -6109,7 +6169,7 @@ clean-stageb2g0-opcodes: +@@ -6110,7 +6170,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1243,7 +1243,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6130,8 +6190,11 @@ all-stage3-opcodes: configure-stage3-opc +@@ -6131,8 +6191,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1257,7 +1257,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-opcodes) maybe-clean-stage3-opcodes: clean-stage3-opcodes -@@ -6144,7 +6207,7 @@ clean-stage3-opcodes: +@@ -6145,7 +6208,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1266,7 +1266,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6165,8 +6228,11 @@ all-stageb3g2-opcodes: configure-stageb3 +@@ -6166,8 +6229,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1280,7 +1280,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-opcodes) maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes -@@ -6179,7 +6245,7 @@ clean-stageb3g2-opcodes: +@@ -6180,7 +6246,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1289,7 +1289,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6200,8 +6266,11 @@ all-stage4-opcodes: configure-stage4-opc +@@ -6201,8 +6267,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1303,7 +1303,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-opcodes) maybe-clean-stage4-opcodes: clean-stage4-opcodes -@@ -6214,7 +6283,7 @@ clean-stage4-opcodes: +@@ -6215,7 +6284,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1312,7 +1312,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6235,8 +6304,11 @@ all-stageprofile-opcodes: configure-stag +@@ -6236,8 +6305,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1326,7 +1326,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-opcodes) maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes -@@ -6249,7 +6321,7 @@ clean-stageprofile-opcodes: +@@ -6250,7 +6322,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1335,7 +1335,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6270,8 +6342,11 @@ all-stagefeedback-opcodes: configure-sta +@@ -6271,8 +6343,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1349,7 +1349,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-opcodes) maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes -@@ -6284,7 +6359,7 @@ clean-stagefeedback-opcodes: +@@ -6285,7 +6360,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/opcodes && \ @@ -1358,7 +1358,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif opcodes-bootstrap -@@ -6691,9 +6766,9 @@ configure-stage1-binutils: +@@ -6692,9 +6767,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ @@ -1370,7 +1370,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6722,9 +6797,9 @@ configure-stage2-binutils: +@@ -6723,9 +6798,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1382,7 +1382,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6753,9 +6828,9 @@ configure-stageb2g0-binutils: +@@ -6754,9 +6829,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1394,7 +1394,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6784,9 +6859,9 @@ configure-stage3-binutils: +@@ -6785,9 +6860,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1406,7 +1406,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6815,9 +6890,9 @@ configure-stageb3g2-binutils: +@@ -6816,9 +6891,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1418,7 +1418,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6846,9 +6921,9 @@ configure-stage4-binutils: +@@ -6847,9 +6922,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1430,7 +1430,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6877,9 +6952,9 @@ configure-stageprofile-binutils: +@@ -6878,9 +6953,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1442,7 +1442,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6908,9 +6983,9 @@ configure-stagefeedback-binutils: +@@ -6909,9 +6984,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1454,7 +1454,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ -@@ -6945,7 +7020,8 @@ all-binutils: configure-binutils +@@ -6946,7 +7021,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/binutils && \ @@ -1464,7 +1464,7 @@ Index: gcc-4.3.1/Makefile.in @endif binutils -@@ -6964,8 +7040,11 @@ all-stage1-binutils: configure-stage1-bi +@@ -6965,8 +7041,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1478,7 +1478,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-binutils) maybe-clean-stage1-binutils: clean-stage1-binutils -@@ -6978,7 +7057,7 @@ clean-stage1-binutils: +@@ -6979,7 +7058,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1487,7 +1487,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif binutils-bootstrap -@@ -6998,8 +7077,11 @@ all-stage2-binutils: configure-stage2-bi +@@ -6999,8 +7078,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1501,7 +1501,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-binutils) maybe-clean-stage2-binutils: clean-stage2-binutils -@@ -7012,7 +7094,7 @@ clean-stage2-binutils: +@@ -7013,7 +7095,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1510,7 +1510,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7033,8 +7115,11 @@ all-stageb2g0-binutils: configure-stageb +@@ -7034,8 +7116,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1524,7 +1524,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-binutils) maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils -@@ -7047,7 +7132,7 @@ clean-stageb2g0-binutils: +@@ -7048,7 +7133,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1533,7 +1533,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7068,8 +7153,11 @@ all-stage3-binutils: configure-stage3-bi +@@ -7069,8 +7154,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1547,7 +1547,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-binutils) maybe-clean-stage3-binutils: clean-stage3-binutils -@@ -7082,7 +7170,7 @@ clean-stage3-binutils: +@@ -7083,7 +7171,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1556,7 +1556,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7103,8 +7191,11 @@ all-stageb3g2-binutils: configure-stageb +@@ -7104,8 +7192,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1570,7 +1570,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-binutils) maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils -@@ -7117,7 +7208,7 @@ clean-stageb3g2-binutils: +@@ -7118,7 +7209,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1579,7 +1579,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7138,8 +7229,11 @@ all-stage4-binutils: configure-stage4-bi +@@ -7139,8 +7230,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1593,7 +1593,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-binutils) maybe-clean-stage4-binutils: clean-stage4-binutils -@@ -7152,7 +7246,7 @@ clean-stage4-binutils: +@@ -7153,7 +7247,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1602,7 +1602,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7173,8 +7267,11 @@ all-stageprofile-binutils: configure-sta +@@ -7174,8 +7268,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1616,7 +1616,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-binutils) maybe-clean-stageprofile-binutils: clean-stageprofile-binutils -@@ -7187,7 +7284,7 @@ clean-stageprofile-binutils: +@@ -7188,7 +7285,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1625,7 +1625,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7208,8 +7305,11 @@ all-stagefeedback-binutils: configure-st +@@ -7209,8 +7306,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/binutils && \ @@ -1639,7 +1639,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-binutils) maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils -@@ -7222,7 +7322,7 @@ clean-stagefeedback-binutils: +@@ -7223,7 +7323,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/binutils && \ @@ -1648,7 +1648,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif binutils-bootstrap -@@ -7636,7 +7736,8 @@ all-bison: configure-bison +@@ -7637,7 +7737,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bison && \ @@ -1658,7 +1658,7 @@ Index: gcc-4.3.1/Makefile.in @endif bison -@@ -8063,7 +8164,8 @@ all-byacc: configure-byacc +@@ -8064,7 +8165,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/byacc && \ @@ -1668,7 +1668,7 @@ Index: gcc-4.3.1/Makefile.in @endif byacc -@@ -8490,7 +8592,8 @@ all-bzip2: configure-bzip2 +@@ -8491,7 +8593,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bzip2 && \ @@ -1678,7 +1678,7 @@ Index: gcc-4.3.1/Makefile.in @endif bzip2 -@@ -8914,7 +9017,8 @@ all-dejagnu: configure-dejagnu +@@ -8915,7 +9018,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dejagnu && \ @@ -1688,7 +1688,7 @@ Index: gcc-4.3.1/Makefile.in @endif dejagnu -@@ -9338,7 +9442,8 @@ all-diff: configure-diff +@@ -9339,7 +9443,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/diff && \ @@ -1698,7 +1698,7 @@ Index: gcc-4.3.1/Makefile.in @endif diff -@@ -9762,7 +9867,8 @@ all-dosutils: configure-dosutils +@@ -9763,7 +9868,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dosutils && \ @@ -1708,7 +1708,7 @@ Index: gcc-4.3.1/Makefile.in @endif dosutils -@@ -10180,7 +10286,8 @@ all-etc: configure-etc +@@ -10181,7 +10287,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/etc && \ @@ -1718,7 +1718,7 @@ Index: gcc-4.3.1/Makefile.in @endif etc -@@ -10604,7 +10711,8 @@ all-fastjar: configure-fastjar +@@ -10605,7 +10712,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fastjar && \ @@ -1728,7 +1728,7 @@ Index: gcc-4.3.1/Makefile.in @endif fastjar -@@ -11031,7 +11139,8 @@ all-fileutils: configure-fileutils +@@ -11032,7 +11140,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fileutils && \ @@ -1738,7 +1738,7 @@ Index: gcc-4.3.1/Makefile.in @endif fileutils -@@ -11455,7 +11564,8 @@ all-findutils: configure-findutils +@@ -11456,7 +11565,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/findutils && \ @@ -1748,7 +1748,7 @@ Index: gcc-4.3.1/Makefile.in @endif findutils -@@ -11879,7 +11989,8 @@ all-find: configure-find +@@ -11880,7 +11990,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/find && \ @@ -1758,7 +1758,7 @@ Index: gcc-4.3.1/Makefile.in @endif find -@@ -12303,7 +12414,8 @@ all-fixincludes: configure-fixincludes +@@ -12304,7 +12415,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fixincludes && \ @@ -1768,7 +1768,7 @@ Index: gcc-4.3.1/Makefile.in @endif fixincludes -@@ -12711,7 +12823,8 @@ all-flex: configure-flex +@@ -12712,7 +12824,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/flex && \ @@ -1778,7 +1778,7 @@ Index: gcc-4.3.1/Makefile.in @endif flex -@@ -13131,9 +13244,9 @@ configure-stage1-gas: +@@ -13132,9 +13245,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ @@ -1790,7 +1790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13162,9 +13275,9 @@ configure-stage2-gas: +@@ -13163,9 +13276,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1802,7 +1802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13193,9 +13306,9 @@ configure-stageb2g0-gas: +@@ -13194,9 +13307,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1814,7 +1814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13224,9 +13337,9 @@ configure-stage3-gas: +@@ -13225,9 +13338,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1826,7 +1826,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13255,9 +13368,9 @@ configure-stageb3g2-gas: +@@ -13256,9 +13369,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1838,7 +1838,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13286,9 +13399,9 @@ configure-stage4-gas: +@@ -13287,9 +13400,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1850,7 +1850,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13317,9 +13430,9 @@ configure-stageprofile-gas: +@@ -13318,9 +13431,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1862,7 +1862,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13348,9 +13461,9 @@ configure-stagefeedback-gas: +@@ -13349,9 +13462,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -1874,7 +1874,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ cd $(HOST_SUBDIR)/gas || exit 1; \ -@@ -13385,7 +13498,8 @@ all-gas: configure-gas +@@ -13386,7 +13499,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gas && \ @@ -1884,7 +1884,7 @@ Index: gcc-4.3.1/Makefile.in @endif gas -@@ -13404,8 +13518,11 @@ all-stage1-gas: configure-stage1-gas +@@ -13405,8 +13519,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1898,7 +1898,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gas) maybe-clean-stage1-gas: clean-stage1-gas -@@ -13418,7 +13535,7 @@ clean-stage1-gas: +@@ -13419,7 +13536,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1907,7 +1907,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif gas-bootstrap -@@ -13438,8 +13555,11 @@ all-stage2-gas: configure-stage2-gas +@@ -13439,8 +13556,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1921,7 +1921,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gas) maybe-clean-stage2-gas: clean-stage2-gas -@@ -13452,7 +13572,7 @@ clean-stage2-gas: +@@ -13453,7 +13573,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1930,7 +1930,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13473,8 +13593,11 @@ all-stageb2g0-gas: configure-stageb2g0-g +@@ -13474,8 +13594,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1944,7 +1944,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gas) maybe-clean-stageb2g0-gas: clean-stageb2g0-gas -@@ -13487,7 +13610,7 @@ clean-stageb2g0-gas: +@@ -13488,7 +13611,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1953,7 +1953,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13508,8 +13631,11 @@ all-stage3-gas: configure-stage3-gas +@@ -13509,8 +13632,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1967,7 +1967,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gas) maybe-clean-stage3-gas: clean-stage3-gas -@@ -13522,7 +13648,7 @@ clean-stage3-gas: +@@ -13523,7 +13649,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1976,7 +1976,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13543,8 +13669,11 @@ all-stageb3g2-gas: configure-stageb3g2-g +@@ -13544,8 +13670,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -1990,7 +1990,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gas) maybe-clean-stageb3g2-gas: clean-stageb3g2-gas -@@ -13557,7 +13686,7 @@ clean-stageb3g2-gas: +@@ -13558,7 +13687,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -1999,7 +1999,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13578,8 +13707,11 @@ all-stage4-gas: configure-stage4-gas +@@ -13579,8 +13708,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2013,7 +2013,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gas) maybe-clean-stage4-gas: clean-stage4-gas -@@ -13592,7 +13724,7 @@ clean-stage4-gas: +@@ -13593,7 +13725,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2022,7 +2022,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13613,8 +13745,11 @@ all-stageprofile-gas: configure-stagepro +@@ -13614,8 +13746,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2036,7 +2036,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gas) maybe-clean-stageprofile-gas: clean-stageprofile-gas -@@ -13627,7 +13762,7 @@ clean-stageprofile-gas: +@@ -13628,7 +13763,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2045,7 +2045,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -13648,8 +13783,11 @@ all-stagefeedback-gas: configure-stagefe +@@ -13649,8 +13784,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gas && \ @@ -2059,7 +2059,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gas) maybe-clean-stagefeedback-gas: clean-stagefeedback-gas -@@ -13662,7 +13800,7 @@ clean-stagefeedback-gas: +@@ -13663,7 +13801,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gas && \ @@ -2068,7 +2068,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gas-bootstrap -@@ -14069,9 +14207,9 @@ configure-stage1-gcc: +@@ -14070,9 +14208,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ @@ -2080,7 +2080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14100,9 +14238,9 @@ configure-stage2-gcc: +@@ -14101,9 +14239,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2092,7 +2092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14131,9 +14269,9 @@ configure-stageb2g0-gcc: +@@ -14132,9 +14270,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2104,7 +2104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14162,9 +14300,9 @@ configure-stage3-gcc: +@@ -14163,9 +14301,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2116,7 +2116,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14193,9 +14331,9 @@ configure-stageb3g2-gcc: +@@ -14194,9 +14332,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2128,7 +2128,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14224,9 +14362,9 @@ configure-stage4-gcc: +@@ -14225,9 +14363,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2140,7 +2140,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14255,9 +14393,9 @@ configure-stageprofile-gcc: +@@ -14256,9 +14394,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2152,7 +2152,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14286,9 +14424,9 @@ configure-stagefeedback-gcc: +@@ -14287,9 +14425,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2164,7 +2164,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ -@@ -14323,7 +14461,8 @@ all-gcc: configure-gcc +@@ -14324,7 +14462,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gcc && \ @@ -2174,7 +2174,7 @@ Index: gcc-4.3.1/Makefile.in @endif gcc -@@ -14342,8 +14481,11 @@ all-stage1-gcc: configure-stage1-gcc +@@ -14343,8 +14482,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2188,7 +2188,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gcc) maybe-clean-stage1-gcc: clean-stage1-gcc -@@ -14356,7 +14498,7 @@ clean-stage1-gcc: +@@ -14357,7 +14499,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2197,7 +2197,7 @@ Index: gcc-4.3.1/Makefile.in $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14376,8 +14518,11 @@ all-stage2-gcc: configure-stage2-gcc +@@ -14377,8 +14519,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2211,7 +2211,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gcc) maybe-clean-stage2-gcc: clean-stage2-gcc -@@ -14390,7 +14535,7 @@ clean-stage2-gcc: +@@ -14391,7 +14536,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2220,7 +2220,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14411,8 +14556,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g +@@ -14412,8 +14557,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2234,7 +2234,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gcc) maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc -@@ -14425,7 +14573,7 @@ clean-stageb2g0-gcc: +@@ -14426,7 +14574,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2243,7 +2243,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14446,8 +14594,11 @@ all-stage3-gcc: configure-stage3-gcc +@@ -14447,8 +14595,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2257,7 +2257,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gcc) maybe-clean-stage3-gcc: clean-stage3-gcc -@@ -14460,7 +14611,7 @@ clean-stage3-gcc: +@@ -14461,7 +14612,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2266,7 +2266,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14481,8 +14632,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g +@@ -14482,8 +14633,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2280,7 +2280,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gcc) maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc -@@ -14495,7 +14649,7 @@ clean-stageb3g2-gcc: +@@ -14496,7 +14650,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2289,7 +2289,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14516,8 +14670,11 @@ all-stage4-gcc: configure-stage4-gcc +@@ -14517,8 +14671,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2303,7 +2303,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gcc) maybe-clean-stage4-gcc: clean-stage4-gcc -@@ -14530,7 +14687,7 @@ clean-stage4-gcc: +@@ -14531,7 +14688,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2312,7 +2312,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14551,8 +14708,11 @@ all-stageprofile-gcc: configure-stagepro +@@ -14552,8 +14709,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2326,7 +2326,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gcc) maybe-clean-stageprofile-gcc: clean-stageprofile-gcc -@@ -14565,7 +14725,7 @@ clean-stageprofile-gcc: +@@ -14566,7 +14726,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2335,7 +2335,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -14586,8 +14746,11 @@ all-stagefeedback-gcc: configure-stagefe +@@ -14587,8 +14747,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gcc && \ @@ -2349,7 +2349,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gcc) maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc -@@ -14600,7 +14763,7 @@ clean-stagefeedback-gcc: +@@ -14601,7 +14764,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gcc && \ @@ -2358,7 +2358,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ $(EXTRA_GCC_FLAGS) clean @endif gcc-bootstrap -@@ -15014,7 +15177,8 @@ all-gawk: configure-gawk +@@ -15015,7 +15178,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gawk && \ @@ -2368,7 +2368,7 @@ Index: gcc-4.3.1/Makefile.in @endif gawk -@@ -15438,7 +15602,8 @@ all-gettext: configure-gettext +@@ -15439,7 +15603,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gettext && \ @@ -2378,7 +2378,7 @@ Index: gcc-4.3.1/Makefile.in @endif gettext -@@ -15855,9 +16020,9 @@ configure-stage1-gmp: +@@ -15856,9 +16021,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ @@ -2390,7 +2390,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15886,9 +16051,9 @@ configure-stage2-gmp: +@@ -15887,9 +16052,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2402,7 +2402,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15917,9 +16082,9 @@ configure-stageb2g0-gmp: +@@ -15918,9 +16083,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2414,7 +2414,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15948,9 +16113,9 @@ configure-stage3-gmp: +@@ -15949,9 +16114,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2426,7 +2426,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -15979,9 +16144,9 @@ configure-stageb3g2-gmp: +@@ -15980,9 +16145,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2438,7 +2438,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16010,9 +16175,9 @@ configure-stage4-gmp: +@@ -16011,9 +16176,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2450,7 +2450,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16041,9 +16206,9 @@ configure-stageprofile-gmp: +@@ -16042,9 +16207,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2462,7 +2462,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16072,9 +16237,9 @@ configure-stagefeedback-gmp: +@@ -16073,9 +16238,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2474,7 +2474,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ -@@ -16109,7 +16274,8 @@ all-gmp: configure-gmp +@@ -16110,7 +16275,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gmp && \ @@ -2484,7 +2484,7 @@ Index: gcc-4.3.1/Makefile.in @endif gmp -@@ -16128,8 +16294,11 @@ all-stage1-gmp: configure-stage1-gmp +@@ -16129,8 +16295,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2498,7 +2498,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-gmp) maybe-clean-stage1-gmp: clean-stage1-gmp -@@ -16142,7 +16311,7 @@ clean-stage1-gmp: +@@ -16143,7 +16312,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2507,7 +2507,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif gmp-bootstrap -@@ -16162,8 +16331,11 @@ all-stage2-gmp: configure-stage2-gmp +@@ -16163,8 +16332,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2521,7 +2521,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-gmp) maybe-clean-stage2-gmp: clean-stage2-gmp -@@ -16176,7 +16348,7 @@ clean-stage2-gmp: +@@ -16177,7 +16349,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2530,7 +2530,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16197,8 +16369,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g +@@ -16198,8 +16370,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2544,7 +2544,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-gmp) maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp -@@ -16211,7 +16386,7 @@ clean-stageb2g0-gmp: +@@ -16212,7 +16387,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2553,7 +2553,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16232,8 +16407,11 @@ all-stage3-gmp: configure-stage3-gmp +@@ -16233,8 +16408,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2567,7 +2567,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-gmp) maybe-clean-stage3-gmp: clean-stage3-gmp -@@ -16246,7 +16424,7 @@ clean-stage3-gmp: +@@ -16247,7 +16425,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2576,7 +2576,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16267,8 +16445,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g +@@ -16268,8 +16446,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2590,7 +2590,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-gmp) maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp -@@ -16281,7 +16462,7 @@ clean-stageb3g2-gmp: +@@ -16282,7 +16463,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2599,7 +2599,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16302,8 +16483,11 @@ all-stage4-gmp: configure-stage4-gmp +@@ -16303,8 +16484,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2613,7 +2613,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-gmp) maybe-clean-stage4-gmp: clean-stage4-gmp -@@ -16316,7 +16500,7 @@ clean-stage4-gmp: +@@ -16317,7 +16501,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2622,7 +2622,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16337,8 +16521,11 @@ all-stageprofile-gmp: configure-stagepro +@@ -16338,8 +16522,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2636,7 +2636,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-gmp) maybe-clean-stageprofile-gmp: clean-stageprofile-gmp -@@ -16351,7 +16538,7 @@ clean-stageprofile-gmp: +@@ -16352,7 +16539,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2645,7 +2645,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16372,8 +16559,11 @@ all-stagefeedback-gmp: configure-stagefe +@@ -16373,8 +16560,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/gmp && \ @@ -2659,7 +2659,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-gmp) maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp -@@ -16386,7 +16576,7 @@ clean-stagefeedback-gmp: +@@ -16387,7 +16577,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/gmp && \ @@ -2668,7 +2668,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif gmp-bootstrap -@@ -16787,9 +16977,9 @@ configure-stage1-mpfr: +@@ -16788,9 +16978,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ @@ -2680,7 +2680,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16818,9 +17008,9 @@ configure-stage2-mpfr: +@@ -16819,9 +17009,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2692,7 +2692,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16849,9 +17039,9 @@ configure-stageb2g0-mpfr: +@@ -16850,9 +17040,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2704,7 +2704,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16880,9 +17070,9 @@ configure-stage3-mpfr: +@@ -16881,9 +17071,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2716,7 +2716,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16911,9 +17101,9 @@ configure-stageb3g2-mpfr: +@@ -16912,9 +17102,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2728,7 +2728,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16942,9 +17132,9 @@ configure-stage4-mpfr: +@@ -16943,9 +17133,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2740,7 +2740,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -16973,9 +17163,9 @@ configure-stageprofile-mpfr: +@@ -16974,9 +17164,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2752,7 +2752,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -17004,9 +17194,9 @@ configure-stagefeedback-mpfr: +@@ -17005,9 +17195,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -2764,7 +2764,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ -@@ -17041,7 +17231,8 @@ all-mpfr: configure-mpfr +@@ -17042,7 +17232,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpfr && \ @@ -2774,7 +2774,7 @@ Index: gcc-4.3.1/Makefile.in @endif mpfr -@@ -17060,8 +17251,11 @@ all-stage1-mpfr: configure-stage1-mpfr +@@ -17061,8 +17252,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2788,7 +2788,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-mpfr) maybe-clean-stage1-mpfr: clean-stage1-mpfr -@@ -17074,7 +17268,7 @@ clean-stage1-mpfr: +@@ -17075,7 +17269,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2797,7 +2797,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif mpfr-bootstrap -@@ -17094,8 +17288,11 @@ all-stage2-mpfr: configure-stage2-mpfr +@@ -17095,8 +17289,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2811,7 +2811,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-mpfr) maybe-clean-stage2-mpfr: clean-stage2-mpfr -@@ -17108,7 +17305,7 @@ clean-stage2-mpfr: +@@ -17109,7 +17306,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2820,7 +2820,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17129,8 +17326,11 @@ all-stageb2g0-mpfr: configure-stageb2g0- +@@ -17130,8 +17327,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2834,7 +2834,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-mpfr) maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr -@@ -17143,7 +17343,7 @@ clean-stageb2g0-mpfr: +@@ -17144,7 +17344,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2843,7 +2843,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17164,8 +17364,11 @@ all-stage3-mpfr: configure-stage3-mpfr +@@ -17165,8 +17365,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2857,7 +2857,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-mpfr) maybe-clean-stage3-mpfr: clean-stage3-mpfr -@@ -17178,7 +17381,7 @@ clean-stage3-mpfr: +@@ -17179,7 +17382,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2866,7 +2866,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17199,8 +17402,11 @@ all-stageb3g2-mpfr: configure-stageb3g2- +@@ -17200,8 +17403,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2880,7 +2880,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-mpfr) maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr -@@ -17213,7 +17419,7 @@ clean-stageb3g2-mpfr: +@@ -17214,7 +17420,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2889,7 +2889,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17234,8 +17440,11 @@ all-stage4-mpfr: configure-stage4-mpfr +@@ -17235,8 +17441,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2903,7 +2903,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-mpfr) maybe-clean-stage4-mpfr: clean-stage4-mpfr -@@ -17248,7 +17457,7 @@ clean-stage4-mpfr: +@@ -17249,7 +17458,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2912,7 +2912,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17269,8 +17478,11 @@ all-stageprofile-mpfr: configure-stagepr +@@ -17270,8 +17479,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2926,7 +2926,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-mpfr) maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr -@@ -17283,7 +17495,7 @@ clean-stageprofile-mpfr: +@@ -17284,7 +17496,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2935,7 +2935,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17304,8 +17516,11 @@ all-stagefeedback-mpfr: configure-stagef +@@ -17305,8 +17517,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2949,7 +2949,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-mpfr) maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr -@@ -17318,7 +17533,7 @@ clean-stagefeedback-mpfr: +@@ -17319,7 +17534,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ @@ -2958,7 +2958,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif mpfr-bootstrap -@@ -17726,7 +17941,8 @@ all-gnuserv: configure-gnuserv +@@ -17727,7 +17942,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnuserv && \ @@ -2968,7 +2968,7 @@ Index: gcc-4.3.1/Makefile.in @endif gnuserv -@@ -18150,7 +18366,8 @@ all-gprof: configure-gprof +@@ -18151,7 +18367,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gprof && \ @@ -2978,7 +2978,7 @@ Index: gcc-4.3.1/Makefile.in @endif gprof -@@ -18574,7 +18791,8 @@ all-gzip: configure-gzip +@@ -18575,7 +18792,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gzip && \ @@ -2988,7 +2988,7 @@ Index: gcc-4.3.1/Makefile.in @endif gzip -@@ -18998,7 +19216,8 @@ all-hello: configure-hello +@@ -18999,7 +19217,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/hello && \ @@ -2998,7 +2998,7 @@ Index: gcc-4.3.1/Makefile.in @endif hello -@@ -19422,7 +19641,8 @@ all-indent: configure-indent +@@ -19423,7 +19642,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/indent && \ @@ -3008,7 +3008,7 @@ Index: gcc-4.3.1/Makefile.in @endif indent -@@ -19839,9 +20059,9 @@ configure-stage1-intl: +@@ -19840,9 +20060,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ @@ -3020,7 +3020,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19870,9 +20090,9 @@ configure-stage2-intl: +@@ -19871,9 +20091,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3032,7 +3032,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19901,9 +20121,9 @@ configure-stageb2g0-intl: +@@ -19902,9 +20122,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3044,7 +3044,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19932,9 +20152,9 @@ configure-stage3-intl: +@@ -19933,9 +20153,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3056,7 +3056,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19963,9 +20183,9 @@ configure-stageb3g2-intl: +@@ -19964,9 +20184,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3068,7 +3068,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -19994,9 +20214,9 @@ configure-stage4-intl: +@@ -19995,9 +20215,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3080,7 +3080,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20025,9 +20245,9 @@ configure-stageprofile-intl: +@@ -20026,9 +20246,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3092,7 +3092,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20056,9 +20276,9 @@ configure-stagefeedback-intl: +@@ -20057,9 +20277,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3104,7 +3104,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ cd $(HOST_SUBDIR)/intl || exit 1; \ -@@ -20093,7 +20313,8 @@ all-intl: configure-intl +@@ -20094,7 +20314,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/intl && \ @@ -3114,7 +3114,7 @@ Index: gcc-4.3.1/Makefile.in @endif intl -@@ -20112,8 +20333,11 @@ all-stage1-intl: configure-stage1-intl +@@ -20113,8 +20334,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3128,7 +3128,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-intl) maybe-clean-stage1-intl: clean-stage1-intl -@@ -20126,7 +20350,7 @@ clean-stage1-intl: +@@ -20127,7 +20351,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3137,7 +3137,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif intl-bootstrap -@@ -20146,8 +20370,11 @@ all-stage2-intl: configure-stage2-intl +@@ -20147,8 +20371,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3151,7 +3151,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-intl) maybe-clean-stage2-intl: clean-stage2-intl -@@ -20160,7 +20387,7 @@ clean-stage2-intl: +@@ -20161,7 +20388,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3160,7 +3160,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20181,8 +20408,11 @@ all-stageb2g0-intl: configure-stageb2g0- +@@ -20182,8 +20409,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3174,7 +3174,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-intl) maybe-clean-stageb2g0-intl: clean-stageb2g0-intl -@@ -20195,7 +20425,7 @@ clean-stageb2g0-intl: +@@ -20196,7 +20426,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3183,7 +3183,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20216,8 +20446,11 @@ all-stage3-intl: configure-stage3-intl +@@ -20217,8 +20447,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3197,7 +3197,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-intl) maybe-clean-stage3-intl: clean-stage3-intl -@@ -20230,7 +20463,7 @@ clean-stage3-intl: +@@ -20231,7 +20464,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3206,7 +3206,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20251,8 +20484,11 @@ all-stageb3g2-intl: configure-stageb3g2- +@@ -20252,8 +20485,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3220,7 +3220,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-intl) maybe-clean-stageb3g2-intl: clean-stageb3g2-intl -@@ -20265,7 +20501,7 @@ clean-stageb3g2-intl: +@@ -20266,7 +20502,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3229,7 +3229,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20286,8 +20522,11 @@ all-stage4-intl: configure-stage4-intl +@@ -20287,8 +20523,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3243,7 +3243,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-intl) maybe-clean-stage4-intl: clean-stage4-intl -@@ -20300,7 +20539,7 @@ clean-stage4-intl: +@@ -20301,7 +20540,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3252,7 +3252,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20321,8 +20560,11 @@ all-stageprofile-intl: configure-stagepr +@@ -20322,8 +20561,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3266,7 +3266,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-intl) maybe-clean-stageprofile-intl: clean-stageprofile-intl -@@ -20335,7 +20577,7 @@ clean-stageprofile-intl: +@@ -20336,7 +20578,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3275,7 +3275,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20356,8 +20598,11 @@ all-stagefeedback-intl: configure-stagef +@@ -20357,8 +20599,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/intl && \ @@ -3289,7 +3289,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-intl) maybe-clean-stagefeedback-intl: clean-stagefeedback-intl -@@ -20370,7 +20615,7 @@ clean-stagefeedback-intl: +@@ -20371,7 +20616,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/intl && \ @@ -3298,7 +3298,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif intl-bootstrap -@@ -20784,7 +21029,8 @@ all-tcl: configure-tcl +@@ -20785,7 +21030,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tcl && \ @@ -3308,7 +3308,7 @@ Index: gcc-4.3.1/Makefile.in @endif tcl -@@ -21193,7 +21439,8 @@ all-itcl: configure-itcl +@@ -21194,7 +21440,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/itcl && \ @@ -3318,7 +3318,7 @@ Index: gcc-4.3.1/Makefile.in @endif itcl -@@ -21610,9 +21857,9 @@ configure-stage1-ld: +@@ -21611,9 +21858,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ @@ -3330,7 +3330,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21641,9 +21888,9 @@ configure-stage2-ld: +@@ -21642,9 +21889,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3342,7 +3342,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21672,9 +21919,9 @@ configure-stageb2g0-ld: +@@ -21673,9 +21920,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3354,7 +3354,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21703,9 +21950,9 @@ configure-stage3-ld: +@@ -21704,9 +21951,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3366,7 +3366,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21734,9 +21981,9 @@ configure-stageb3g2-ld: +@@ -21735,9 +21982,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3378,7 +3378,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21765,9 +22012,9 @@ configure-stage4-ld: +@@ -21766,9 +22013,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3390,7 +3390,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21796,9 +22043,9 @@ configure-stageprofile-ld: +@@ -21797,9 +22044,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3402,7 +3402,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21827,9 +22074,9 @@ configure-stagefeedback-ld: +@@ -21828,9 +22075,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3414,7 +3414,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ cd $(HOST_SUBDIR)/ld || exit 1; \ -@@ -21864,7 +22111,8 @@ all-ld: configure-ld +@@ -21865,7 +22112,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ld && \ @@ -3424,7 +3424,7 @@ Index: gcc-4.3.1/Makefile.in @endif ld -@@ -21883,8 +22131,11 @@ all-stage1-ld: configure-stage1-ld +@@ -21884,8 +22132,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3438,7 +3438,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-ld) maybe-clean-stage1-ld: clean-stage1-ld -@@ -21897,7 +22148,7 @@ clean-stage1-ld: +@@ -21898,7 +22149,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3447,7 +3447,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif ld-bootstrap -@@ -21917,8 +22168,11 @@ all-stage2-ld: configure-stage2-ld +@@ -21918,8 +22169,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3461,7 +3461,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-ld) maybe-clean-stage2-ld: clean-stage2-ld -@@ -21931,7 +22185,7 @@ clean-stage2-ld: +@@ -21932,7 +22186,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3470,7 +3470,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -21952,8 +22206,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld +@@ -21953,8 +22207,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3484,7 +3484,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-ld) maybe-clean-stageb2g0-ld: clean-stageb2g0-ld -@@ -21966,7 +22223,7 @@ clean-stageb2g0-ld: +@@ -21967,7 +22224,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3493,7 +3493,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -21987,8 +22244,11 @@ all-stage3-ld: configure-stage3-ld +@@ -21988,8 +22245,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3507,7 +3507,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-ld) maybe-clean-stage3-ld: clean-stage3-ld -@@ -22001,7 +22261,7 @@ clean-stage3-ld: +@@ -22002,7 +22262,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3516,7 +3516,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22022,8 +22282,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld +@@ -22023,8 +22283,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3530,7 +3530,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-ld) maybe-clean-stageb3g2-ld: clean-stageb3g2-ld -@@ -22036,7 +22299,7 @@ clean-stageb3g2-ld: +@@ -22037,7 +22300,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3539,7 +3539,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22057,8 +22320,11 @@ all-stage4-ld: configure-stage4-ld +@@ -22058,8 +22321,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3553,7 +3553,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-ld) maybe-clean-stage4-ld: clean-stage4-ld -@@ -22071,7 +22337,7 @@ clean-stage4-ld: +@@ -22072,7 +22338,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3562,7 +3562,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22092,8 +22358,11 @@ all-stageprofile-ld: configure-stageprof +@@ -22093,8 +22359,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3576,7 +3576,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-ld) maybe-clean-stageprofile-ld: clean-stageprofile-ld -@@ -22106,7 +22375,7 @@ clean-stageprofile-ld: +@@ -22107,7 +22376,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3585,7 +3585,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22127,8 +22396,11 @@ all-stagefeedback-ld: configure-stagefee +@@ -22128,8 +22397,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/ld && \ @@ -3599,7 +3599,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-ld) maybe-clean-stagefeedback-ld: clean-stagefeedback-ld -@@ -22141,7 +22413,7 @@ clean-stagefeedback-ld: +@@ -22142,7 +22414,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/ld && \ @@ -3608,7 +3608,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif ld-bootstrap -@@ -22548,9 +22820,9 @@ configure-stage1-libcpp: +@@ -22549,9 +22821,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ @@ -3620,7 +3620,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22579,9 +22851,9 @@ configure-stage2-libcpp: +@@ -22580,9 +22852,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3632,7 +3632,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22610,9 +22882,9 @@ configure-stageb2g0-libcpp: +@@ -22611,9 +22883,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3644,7 +3644,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22641,9 +22913,9 @@ configure-stage3-libcpp: +@@ -22642,9 +22914,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3656,7 +3656,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22672,9 +22944,9 @@ configure-stageb3g2-libcpp: +@@ -22673,9 +22945,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3668,7 +3668,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22703,9 +22975,9 @@ configure-stage4-libcpp: +@@ -22704,9 +22976,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3680,7 +3680,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22734,9 +23006,9 @@ configure-stageprofile-libcpp: +@@ -22735,9 +23007,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3692,7 +3692,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22765,9 +23037,9 @@ configure-stagefeedback-libcpp: +@@ -22766,9 +23038,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3704,7 +3704,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ -@@ -22802,7 +23074,8 @@ all-libcpp: configure-libcpp +@@ -22803,7 +23075,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libcpp && \ @@ -3714,7 +3714,7 @@ Index: gcc-4.3.1/Makefile.in @endif libcpp -@@ -22821,8 +23094,11 @@ all-stage1-libcpp: configure-stage1-libc +@@ -22822,8 +23095,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3728,7 +3728,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libcpp) maybe-clean-stage1-libcpp: clean-stage1-libcpp -@@ -22835,7 +23111,7 @@ clean-stage1-libcpp: +@@ -22836,7 +23112,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3737,7 +3737,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libcpp-bootstrap -@@ -22855,8 +23131,11 @@ all-stage2-libcpp: configure-stage2-libc +@@ -22856,8 +23132,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3751,7 +3751,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libcpp) maybe-clean-stage2-libcpp: clean-stage2-libcpp -@@ -22869,7 +23148,7 @@ clean-stage2-libcpp: +@@ -22870,7 +23149,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3760,7 +3760,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22890,8 +23169,11 @@ all-stageb2g0-libcpp: configure-stageb2g +@@ -22891,8 +23170,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3774,7 +3774,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libcpp) maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp -@@ -22904,7 +23186,7 @@ clean-stageb2g0-libcpp: +@@ -22905,7 +23187,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3783,7 +3783,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22925,8 +23207,11 @@ all-stage3-libcpp: configure-stage3-libc +@@ -22926,8 +23208,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3797,7 +3797,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libcpp) maybe-clean-stage3-libcpp: clean-stage3-libcpp -@@ -22939,7 +23224,7 @@ clean-stage3-libcpp: +@@ -22940,7 +23225,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3806,7 +3806,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22960,8 +23245,11 @@ all-stageb3g2-libcpp: configure-stageb3g +@@ -22961,8 +23246,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3820,7 +3820,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libcpp) maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp -@@ -22974,7 +23262,7 @@ clean-stageb3g2-libcpp: +@@ -22975,7 +23263,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3829,7 +3829,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -22995,8 +23283,11 @@ all-stage4-libcpp: configure-stage4-libc +@@ -22996,8 +23284,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3843,7 +3843,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libcpp) maybe-clean-stage4-libcpp: clean-stage4-libcpp -@@ -23009,7 +23300,7 @@ clean-stage4-libcpp: +@@ -23010,7 +23301,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3852,7 +3852,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23030,8 +23321,11 @@ all-stageprofile-libcpp: configure-stage +@@ -23031,8 +23322,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3866,7 +3866,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libcpp) maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp -@@ -23044,7 +23338,7 @@ clean-stageprofile-libcpp: +@@ -23045,7 +23339,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3875,7 +3875,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23065,8 +23359,11 @@ all-stagefeedback-libcpp: configure-stag +@@ -23066,8 +23360,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3889,7 +3889,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libcpp) maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp -@@ -23079,7 +23376,7 @@ clean-stagefeedback-libcpp: +@@ -23080,7 +23377,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libcpp && \ @@ -3898,7 +3898,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libcpp-bootstrap -@@ -23486,9 +23783,9 @@ configure-stage1-libdecnumber: +@@ -23487,9 +23784,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ @@ -3910,7 +3910,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23517,9 +23814,9 @@ configure-stage2-libdecnumber: +@@ -23518,9 +23815,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3922,7 +3922,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23548,9 +23845,9 @@ configure-stageb2g0-libdecnumber: +@@ -23549,9 +23846,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3934,7 +3934,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23579,9 +23876,9 @@ configure-stage3-libdecnumber: +@@ -23580,9 +23877,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3946,7 +3946,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23610,9 +23907,9 @@ configure-stageb3g2-libdecnumber: +@@ -23611,9 +23908,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3958,7 +3958,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23641,9 +23938,9 @@ configure-stage4-libdecnumber: +@@ -23642,9 +23939,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3970,7 +3970,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23672,9 +23969,9 @@ configure-stageprofile-libdecnumber: +@@ -23673,9 +23970,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3982,7 +3982,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23703,9 +24000,9 @@ configure-stagefeedback-libdecnumber: +@@ -23704,9 +24001,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -3994,7 +3994,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ -@@ -23740,7 +24037,8 @@ all-libdecnumber: configure-libdecnumber +@@ -23741,7 +24038,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4004,7 +4004,7 @@ Index: gcc-4.3.1/Makefile.in @endif libdecnumber -@@ -23759,8 +24057,11 @@ all-stage1-libdecnumber: configure-stage +@@ -23760,8 +24058,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4018,7 +4018,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libdecnumber) maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber -@@ -23773,7 +24074,7 @@ clean-stage1-libdecnumber: +@@ -23774,7 +24075,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4027,7 +4027,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libdecnumber-bootstrap -@@ -23793,8 +24094,11 @@ all-stage2-libdecnumber: configure-stage +@@ -23794,8 +24095,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4041,7 +4041,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libdecnumber) maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber -@@ -23807,7 +24111,7 @@ clean-stage2-libdecnumber: +@@ -23808,7 +24112,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4050,7 +4050,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23828,8 +24132,11 @@ all-stageb2g0-libdecnumber: configure-st +@@ -23829,8 +24133,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4064,7 +4064,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libdecnumber) maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber -@@ -23842,7 +24149,7 @@ clean-stageb2g0-libdecnumber: +@@ -23843,7 +24150,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4073,7 +4073,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23863,8 +24170,11 @@ all-stage3-libdecnumber: configure-stage +@@ -23864,8 +24171,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4087,7 +4087,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libdecnumber) maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber -@@ -23877,7 +24187,7 @@ clean-stage3-libdecnumber: +@@ -23878,7 +24188,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4096,7 +4096,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23898,8 +24208,11 @@ all-stageb3g2-libdecnumber: configure-st +@@ -23899,8 +24209,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4110,7 +4110,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libdecnumber) maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber -@@ -23912,7 +24225,7 @@ clean-stageb3g2-libdecnumber: +@@ -23913,7 +24226,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4119,7 +4119,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23933,8 +24246,11 @@ all-stage4-libdecnumber: configure-stage +@@ -23934,8 +24247,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4133,7 +4133,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libdecnumber) maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber -@@ -23947,7 +24263,7 @@ clean-stage4-libdecnumber: +@@ -23948,7 +24264,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4142,7 +4142,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -23968,8 +24284,11 @@ all-stageprofile-libdecnumber: configure +@@ -23969,8 +24285,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4156,7 +4156,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libdecnumber) maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber -@@ -23982,7 +24301,7 @@ clean-stageprofile-libdecnumber: +@@ -23983,7 +24302,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4165,7 +4165,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -24003,8 +24322,11 @@ all-stagefeedback-libdecnumber: configur +@@ -24004,8 +24323,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4179,7 +4179,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libdecnumber) maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber -@@ -24017,7 +24339,7 @@ clean-stagefeedback-libdecnumber: +@@ -24018,7 +24340,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libdecnumber && \ @@ -4188,7 +4188,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libdecnumber-bootstrap -@@ -24431,7 +24753,8 @@ all-libgui: configure-libgui +@@ -24432,7 +24754,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libgui && \ @@ -4198,7 +4198,7 @@ Index: gcc-4.3.1/Makefile.in @endif libgui -@@ -24848,9 +25171,9 @@ configure-stage1-libiberty: +@@ -24849,9 +25172,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ @@ -4210,7 +4210,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24879,9 +25202,9 @@ configure-stage2-libiberty: +@@ -24880,9 +25203,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4222,7 +4222,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24910,9 +25233,9 @@ configure-stageb2g0-libiberty: +@@ -24911,9 +25234,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4234,7 +4234,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24941,9 +25264,9 @@ configure-stage3-libiberty: +@@ -24942,9 +25265,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4246,7 +4246,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -24972,9 +25295,9 @@ configure-stageb3g2-libiberty: +@@ -24973,9 +25296,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4258,7 +4258,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25003,9 +25326,9 @@ configure-stage4-libiberty: +@@ -25004,9 +25327,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4270,7 +4270,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25034,9 +25357,9 @@ configure-stageprofile-libiberty: +@@ -25035,9 +25358,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4282,7 +4282,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25065,9 +25388,9 @@ configure-stagefeedback-libiberty: +@@ -25066,9 +25389,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4294,7 +4294,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ -@@ -25102,7 +25425,8 @@ all-libiberty: configure-libiberty +@@ -25103,7 +25426,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiberty && \ @@ -4304,7 +4304,7 @@ Index: gcc-4.3.1/Makefile.in @endif libiberty -@@ -25121,8 +25445,11 @@ all-stage1-libiberty: configure-stage1-l +@@ -25122,8 +25446,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4318,7 +4318,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-libiberty) maybe-clean-stage1-libiberty: clean-stage1-libiberty -@@ -25135,7 +25462,7 @@ clean-stage1-libiberty: +@@ -25136,7 +25463,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4327,7 +4327,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif libiberty-bootstrap -@@ -25155,8 +25482,11 @@ all-stage2-libiberty: configure-stage2-l +@@ -25156,8 +25483,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4341,7 +4341,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-libiberty) maybe-clean-stage2-libiberty: clean-stage2-libiberty -@@ -25169,7 +25499,7 @@ clean-stage2-libiberty: +@@ -25170,7 +25500,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4350,7 +4350,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25190,8 +25520,11 @@ all-stageb2g0-libiberty: configure-stage +@@ -25191,8 +25521,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4364,7 +4364,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-libiberty) maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty -@@ -25204,7 +25537,7 @@ clean-stageb2g0-libiberty: +@@ -25205,7 +25538,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4373,7 +4373,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25225,8 +25558,11 @@ all-stage3-libiberty: configure-stage3-l +@@ -25226,8 +25559,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4387,7 +4387,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-libiberty) maybe-clean-stage3-libiberty: clean-stage3-libiberty -@@ -25239,7 +25575,7 @@ clean-stage3-libiberty: +@@ -25240,7 +25576,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4396,7 +4396,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25260,8 +25596,11 @@ all-stageb3g2-libiberty: configure-stage +@@ -25261,8 +25597,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4410,7 +4410,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-libiberty) maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty -@@ -25274,7 +25613,7 @@ clean-stageb3g2-libiberty: +@@ -25275,7 +25614,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4419,7 +4419,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25295,8 +25634,11 @@ all-stage4-libiberty: configure-stage4-l +@@ -25296,8 +25635,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4433,7 +4433,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-libiberty) maybe-clean-stage4-libiberty: clean-stage4-libiberty -@@ -25309,7 +25651,7 @@ clean-stage4-libiberty: +@@ -25310,7 +25652,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4442,7 +4442,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25330,8 +25672,11 @@ all-stageprofile-libiberty: configure-st +@@ -25331,8 +25673,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4456,7 +4456,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-libiberty) maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty -@@ -25344,7 +25689,7 @@ clean-stageprofile-libiberty: +@@ -25345,7 +25690,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4465,7 +4465,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25365,8 +25710,11 @@ all-stagefeedback-libiberty: configure-s +@@ -25366,8 +25711,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4479,7 +4479,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-libiberty) maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty -@@ -25379,7 +25727,7 @@ clean-stagefeedback-libiberty: +@@ -25380,7 +25728,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/libiberty && \ @@ -4488,7 +4488,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif libiberty-bootstrap -@@ -25793,7 +26141,8 @@ all-libtool: configure-libtool +@@ -25794,7 +26142,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtool && \ @@ -4498,7 +4498,7 @@ Index: gcc-4.3.1/Makefile.in @endif libtool -@@ -26217,7 +26566,8 @@ all-m4: configure-m4 +@@ -26218,7 +26567,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/m4 && \ @@ -4508,7 +4508,7 @@ Index: gcc-4.3.1/Makefile.in @endif m4 -@@ -26641,7 +26991,8 @@ all-make: configure-make +@@ -26642,7 +26992,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/make && \ @@ -4518,7 +4518,7 @@ Index: gcc-4.3.1/Makefile.in @endif make -@@ -27065,7 +27416,8 @@ all-mmalloc: configure-mmalloc +@@ -27066,7 +27417,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mmalloc && \ @@ -4528,7 +4528,7 @@ Index: gcc-4.3.1/Makefile.in @endif mmalloc -@@ -27483,7 +27835,8 @@ all-patch: configure-patch +@@ -27484,7 +27836,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/patch && \ @@ -4538,7 +4538,7 @@ Index: gcc-4.3.1/Makefile.in @endif patch -@@ -27907,7 +28260,8 @@ all-perl: configure-perl +@@ -27908,7 +28261,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/perl && \ @@ -4548,7 +4548,7 @@ Index: gcc-4.3.1/Makefile.in @endif perl -@@ -28331,7 +28685,8 @@ all-prms: configure-prms +@@ -28332,7 +28686,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/prms && \ @@ -4558,7 +4558,7 @@ Index: gcc-4.3.1/Makefile.in @endif prms -@@ -28755,7 +29110,8 @@ all-rcs: configure-rcs +@@ -28756,7 +29111,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/rcs && \ @@ -4568,7 +4568,7 @@ Index: gcc-4.3.1/Makefile.in @endif rcs -@@ -29179,7 +29535,8 @@ all-readline: configure-readline +@@ -29180,7 +29536,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/readline && \ @@ -4578,7 +4578,7 @@ Index: gcc-4.3.1/Makefile.in @endif readline -@@ -29603,7 +29960,8 @@ all-release: configure-release +@@ -29604,7 +29961,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/release && \ @@ -4588,7 +4588,7 @@ Index: gcc-4.3.1/Makefile.in @endif release -@@ -30015,7 +30373,8 @@ all-recode: configure-recode +@@ -30016,7 +30374,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/recode && \ @@ -4598,7 +4598,7 @@ Index: gcc-4.3.1/Makefile.in @endif recode -@@ -30439,7 +30798,8 @@ all-sed: configure-sed +@@ -30440,7 +30799,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sed && \ @@ -4608,7 +4608,7 @@ Index: gcc-4.3.1/Makefile.in @endif sed -@@ -30863,7 +31223,8 @@ all-send-pr: configure-send-pr +@@ -30864,7 +31224,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/send-pr && \ @@ -4618,7 +4618,7 @@ Index: gcc-4.3.1/Makefile.in @endif send-pr -@@ -31287,7 +31648,8 @@ all-shellutils: configure-shellutils +@@ -31288,7 +31649,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/shellutils && \ @@ -4628,7 +4628,7 @@ Index: gcc-4.3.1/Makefile.in @endif shellutils -@@ -31711,7 +32073,8 @@ all-sid: configure-sid +@@ -31712,7 +32074,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sid && \ @@ -4638,7 +4638,7 @@ Index: gcc-4.3.1/Makefile.in @endif sid -@@ -32135,7 +32498,8 @@ all-sim: configure-sim +@@ -32136,7 +32499,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sim && \ @@ -4648,7 +4648,7 @@ Index: gcc-4.3.1/Makefile.in @endif sim -@@ -32559,7 +32923,8 @@ all-tar: configure-tar +@@ -32560,7 +32924,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tar && \ @@ -4658,7 +4658,7 @@ Index: gcc-4.3.1/Makefile.in @endif tar -@@ -32983,7 +33348,8 @@ all-texinfo: configure-texinfo +@@ -32984,7 +33349,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/texinfo && \ @@ -4668,7 +4668,7 @@ Index: gcc-4.3.1/Makefile.in @endif texinfo -@@ -33401,7 +33767,8 @@ all-textutils: configure-textutils +@@ -33402,7 +33768,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/textutils && \ @@ -4678,7 +4678,7 @@ Index: gcc-4.3.1/Makefile.in @endif textutils -@@ -33825,7 +34192,8 @@ all-time: configure-time +@@ -33826,7 +34193,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/time && \ @@ -4688,7 +4688,7 @@ Index: gcc-4.3.1/Makefile.in @endif time -@@ -34249,7 +34617,8 @@ all-uudecode: configure-uudecode +@@ -34250,7 +34618,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/uudecode && \ @@ -4698,7 +4698,7 @@ Index: gcc-4.3.1/Makefile.in @endif uudecode -@@ -34673,7 +35042,8 @@ all-wdiff: configure-wdiff +@@ -34674,7 +35043,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/wdiff && \ @@ -4708,7 +4708,7 @@ Index: gcc-4.3.1/Makefile.in @endif wdiff -@@ -35097,7 +35467,8 @@ all-zip: configure-zip +@@ -35098,7 +35468,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zip && \ @@ -4718,7 +4718,7 @@ Index: gcc-4.3.1/Makefile.in @endif zip -@@ -35517,9 +35888,9 @@ configure-stage1-zlib: +@@ -35518,9 +35889,9 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ @@ -4730,7 +4730,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35548,9 +35919,9 @@ configure-stage2-zlib: +@@ -35549,9 +35920,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4742,7 +4742,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35579,9 +35950,9 @@ configure-stageb2g0-zlib: +@@ -35580,9 +35951,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4754,7 +4754,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35610,9 +35981,9 @@ configure-stage3-zlib: +@@ -35611,9 +35982,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4766,7 +4766,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35641,9 +36012,9 @@ configure-stageb3g2-zlib: +@@ -35642,9 +36013,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4778,7 +4778,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35672,9 +36043,9 @@ configure-stage4-zlib: +@@ -35673,9 +36044,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4790,7 +4790,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35703,9 +36074,9 @@ configure-stageprofile-zlib: +@@ -35704,9 +36075,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4802,7 +4802,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35734,9 +36105,9 @@ configure-stagefeedback-zlib: +@@ -35735,9 +36106,9 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ $(HOST_EXPORTS) \ @@ -4814,7 +4814,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ -@@ -35771,7 +36142,8 @@ all-zlib: configure-zlib +@@ -35772,7 +36143,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/zlib && \ @@ -4824,7 +4824,7 @@ Index: gcc-4.3.1/Makefile.in @endif zlib -@@ -35790,8 +36162,11 @@ all-stage1-zlib: configure-stage1-zlib +@@ -35791,8 +36163,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4838,7 +4838,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-zlib) maybe-clean-stage1-zlib: clean-stage1-zlib -@@ -35804,7 +36179,7 @@ clean-stage1-zlib: +@@ -35805,7 +36180,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4847,7 +4847,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif zlib-bootstrap -@@ -35824,8 +36199,11 @@ all-stage2-zlib: configure-stage2-zlib +@@ -35825,8 +36200,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4861,7 +4861,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-zlib) maybe-clean-stage2-zlib: clean-stage2-zlib -@@ -35838,7 +36216,7 @@ clean-stage2-zlib: +@@ -35839,7 +36217,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4870,7 +4870,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35859,8 +36237,11 @@ all-stageb2g0-zlib: configure-stageb2g0- +@@ -35860,8 +36238,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4884,7 +4884,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-zlib) maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib -@@ -35873,7 +36254,7 @@ clean-stageb2g0-zlib: +@@ -35874,7 +36255,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4893,7 +4893,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35894,8 +36275,11 @@ all-stage3-zlib: configure-stage3-zlib +@@ -35895,8 +36276,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4907,7 +4907,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-zlib) maybe-clean-stage3-zlib: clean-stage3-zlib -@@ -35908,7 +36292,7 @@ clean-stage3-zlib: +@@ -35909,7 +36293,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4916,7 +4916,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35929,8 +36313,11 @@ all-stageb3g2-zlib: configure-stageb3g2- +@@ -35930,8 +36314,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4930,7 +4930,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-zlib) maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib -@@ -35943,7 +36330,7 @@ clean-stageb3g2-zlib: +@@ -35944,7 +36331,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4939,7 +4939,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35964,8 +36351,11 @@ all-stage4-zlib: configure-stage4-zlib +@@ -35965,8 +36352,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4953,7 +4953,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-zlib) maybe-clean-stage4-zlib: clean-stage4-zlib -@@ -35978,7 +36368,7 @@ clean-stage4-zlib: +@@ -35979,7 +36369,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4962,7 +4962,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -35999,8 +36389,11 @@ all-stageprofile-zlib: configure-stagepr +@@ -36000,8 +36390,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4976,7 +4976,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-zlib) maybe-clean-stageprofile-zlib: clean-stageprofile-zlib -@@ -36013,7 +36406,7 @@ clean-stageprofile-zlib: +@@ -36014,7 +36407,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -4985,7 +4985,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -36034,8 +36427,11 @@ all-stagefeedback-zlib: configure-stagef +@@ -36035,8 +36428,11 @@ $(HOST_EXPORTS) \ $(POSTSTAGE1_HOST_EXPORTS) \ cd $(HOST_SUBDIR)/zlib && \ @@ -4999,7 +4999,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-zlib) maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib -@@ -36048,7 +36444,7 @@ clean-stagefeedback-zlib: +@@ -36049,7 +36445,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/zlib && \ @@ -5008,7 +5008,7 @@ Index: gcc-4.3.1/Makefile.in $(POSTSTAGE1_FLAGS_TO_PASS) \ clean @endif zlib-bootstrap -@@ -36450,7 +36846,8 @@ all-gdb: configure-gdb +@@ -36451,7 +36847,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ @@ -5018,7 +5018,7 @@ Index: gcc-4.3.1/Makefile.in @endif gdb -@@ -36874,7 +37271,8 @@ all-expect: configure-expect +@@ -36875,7 +37272,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ @@ -5028,7 +5028,7 @@ Index: gcc-4.3.1/Makefile.in @endif expect -@@ -37298,7 +37696,8 @@ all-guile: configure-guile +@@ -37299,7 +37697,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ @@ -5038,7 +5038,7 @@ Index: gcc-4.3.1/Makefile.in @endif guile -@@ -37722,7 +38121,8 @@ all-tk: configure-tk +@@ -37723,7 +38122,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ @@ -5048,7 +5048,7 @@ Index: gcc-4.3.1/Makefile.in @endif tk -@@ -38146,7 +38546,8 @@ all-libtermcap: configure-libtermcap +@@ -38147,7 +38547,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libtermcap && \ @@ -5058,7 +5058,7 @@ Index: gcc-4.3.1/Makefile.in @endif libtermcap -@@ -38504,7 +38905,8 @@ all-utils: configure-utils +@@ -38505,7 +38906,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/utils && \ @@ -5068,7 +5068,7 @@ Index: gcc-4.3.1/Makefile.in @endif utils -@@ -38922,7 +39324,8 @@ all-gnattools: configure-gnattools +@@ -38923,7 +39325,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnattools && \ @@ -5078,7 +5078,7 @@ Index: gcc-4.3.1/Makefile.in @endif gnattools -@@ -39367,7 +39770,8 @@ all-target-libstdc++-v3: configure-targe +@@ -39368,7 +39771,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ @@ -5088,7 +5088,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libstdc++-v3 -@@ -39808,7 +40212,8 @@ all-target-libmudflap: configure-target- +@@ -39809,7 +40213,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ @@ -5098,7 +5098,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libmudflap -@@ -40249,7 +40654,8 @@ all-target-libssp: configure-target-libs +@@ -40250,7 +40655,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libssp && \ @@ -5108,7 +5108,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libssp -@@ -40690,7 +41096,8 @@ all-target-newlib: configure-target-newl +@@ -40691,7 +41097,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ @@ -5118,7 +5118,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-newlib -@@ -41136,9 +41543,9 @@ configure-stage1-target-libgcc: +@@ -41137,9 +41544,9 @@ mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ @@ -5131,7 +5131,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41179,9 +41586,9 @@ configure-stage2-target-libgcc: +@@ -41180,9 +41587,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5144,7 +5144,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41222,9 +41629,9 @@ configure-stageb2g0-target-libgcc: +@@ -41223,9 +41630,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5157,7 +5157,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41265,9 +41672,9 @@ configure-stage3-target-libgcc: +@@ -41266,9 +41673,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5170,7 +5170,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41308,9 +41715,9 @@ configure-stageb3g2-target-libgcc: +@@ -41309,9 +41716,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5183,7 +5183,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41351,9 +41758,9 @@ configure-stage4-target-libgcc: +@@ -41352,9 +41759,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5196,7 +5196,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41394,9 +41801,9 @@ configure-stageprofile-target-libgcc: +@@ -41395,9 +41802,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5209,7 +5209,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41437,9 +41844,9 @@ configure-stagefeedback-target-libgcc: +@@ -41438,9 +41845,9 @@ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ $(NORMAL_TARGET_EXPORTS) \ @@ -5222,7 +5222,7 @@ Index: gcc-4.3.1/Makefile.in echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ -@@ -41474,7 +41881,8 @@ all-target-libgcc: configure-target-libg +@@ -41475,7 +41882,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgcc && \ @@ -5232,7 +5232,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgcc -@@ -41493,8 +41901,11 @@ all-stage1-target-libgcc: configure-stag +@@ -41494,8 +41902,11 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5246,7 +5246,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage1-target-libgcc) maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc -@@ -41507,7 +41918,7 @@ clean-stage1-target-libgcc: +@@ -41508,7 +41919,7 @@ $(MAKE) stage1-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5255,7 +5255,7 @@ Index: gcc-4.3.1/Makefile.in clean @endif target-libgcc-bootstrap -@@ -41527,8 +41938,11 @@ all-stage2-target-libgcc: configure-stag +@@ -41528,8 +41939,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5269,7 +5269,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage2-target-libgcc) maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc -@@ -41541,7 +41955,7 @@ clean-stage2-target-libgcc: +@@ -41542,7 +41956,7 @@ $(MAKE) stage2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5278,7 +5278,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41562,8 +41976,11 @@ all-stageb2g0-target-libgcc: configure-s +@@ -41563,8 +41977,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5292,7 +5292,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb2g0-target-libgcc) maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc -@@ -41576,7 +41993,7 @@ clean-stageb2g0-target-libgcc: +@@ -41577,7 +41994,7 @@ $(MAKE) stageb2g0-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5301,7 +5301,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41597,8 +42014,11 @@ all-stage3-target-libgcc: configure-stag +@@ -41598,8 +42015,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5315,7 +5315,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage3-target-libgcc) maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc -@@ -41611,7 +42031,7 @@ clean-stage3-target-libgcc: +@@ -41612,7 +42032,7 @@ $(MAKE) stage3-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5324,7 +5324,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41632,8 +42052,11 @@ all-stageb3g2-target-libgcc: configure-s +@@ -41633,8 +42053,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5338,7 +5338,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageb3g2-target-libgcc) maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc -@@ -41646,7 +42069,7 @@ clean-stageb3g2-target-libgcc: +@@ -41647,7 +42070,7 @@ $(MAKE) stageb3g2-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5347,7 +5347,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41667,8 +42090,11 @@ all-stage4-target-libgcc: configure-stag +@@ -41668,8 +42091,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5361,7 +5361,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stage4-target-libgcc) maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc -@@ -41681,7 +42107,7 @@ clean-stage4-target-libgcc: +@@ -41682,7 +42108,7 @@ $(MAKE) stage4-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5370,7 +5370,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41702,8 +42128,11 @@ all-stageprofile-target-libgcc: configur +@@ -41703,8 +42129,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5384,7 +5384,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stageprofile-target-libgcc) maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc -@@ -41716,7 +42145,7 @@ clean-stageprofile-target-libgcc: +@@ -41717,7 +42146,7 @@ $(MAKE) stageprofile-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5393,7 +5393,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -41737,8 +42166,11 @@ all-stagefeedback-target-libgcc: configu +@@ -41738,8 +42167,11 @@ $(NORMAL_TARGET_EXPORTS) \ \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5407,7 +5407,7 @@ Index: gcc-4.3.1/Makefile.in $(TARGET-stagefeedback-target-libgcc) maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc -@@ -41751,7 +42183,7 @@ clean-stagefeedback-target-libgcc: +@@ -41752,7 +42184,7 @@ $(MAKE) stagefeedback-start; \ fi; \ cd $(TARGET_SUBDIR)/libgcc && \ @@ -5416,7 +5416,7 @@ Index: gcc-4.3.1/Makefile.in \ clean @endif target-libgcc-bootstrap -@@ -42190,7 +42622,8 @@ all-target-libgfortran: configure-target +@@ -42191,7 +42623,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ @@ -5426,7 +5426,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgfortran -@@ -42631,7 +43064,8 @@ all-target-libobjc: configure-target-lib +@@ -42632,7 +43065,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ @@ -5436,7 +5436,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libobjc -@@ -43072,7 +43506,8 @@ all-target-libtermcap: configure-target- +@@ -43073,7 +43507,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ @@ -5446,7 +5446,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libtermcap -@@ -43448,7 +43883,8 @@ all-target-winsup: configure-target-wins +@@ -43449,7 +43884,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ @@ -5456,7 +5456,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-winsup -@@ -43889,7 +44325,8 @@ all-target-libgloss: configure-target-li +@@ -43890,7 +44326,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ @@ -5466,7 +5466,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgloss -@@ -44325,7 +44762,8 @@ all-target-libiberty: configure-target-l +@@ -44326,7 +44763,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ @@ -5476,7 +5476,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libiberty -@@ -44766,7 +45204,8 @@ all-target-gperf: configure-target-gperf +@@ -44767,7 +45205,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ @@ -5486,7 +5486,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-gperf -@@ -45207,7 +45646,8 @@ all-target-examples: configure-target-ex +@@ -45208,7 +45647,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/examples && \ @@ -5496,7 +5496,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-examples -@@ -45638,7 +46078,8 @@ all-target-libffi: configure-target-libf +@@ -45639,7 +46079,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ @@ -5506,7 +5506,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libffi -@@ -46079,7 +46520,8 @@ all-target-libjava: configure-target-lib +@@ -46080,7 +46521,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ @@ -5516,7 +5516,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libjava -@@ -46520,7 +46962,8 @@ all-target-zlib: configure-target-zlib +@@ -46521,7 +46963,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ @@ -5526,7 +5526,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-zlib -@@ -46961,7 +47404,8 @@ all-target-boehm-gc: configure-target-bo +@@ -46962,7 +47405,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ @@ -5536,7 +5536,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-boehm-gc -@@ -47402,7 +47846,8 @@ all-target-qthreads: configure-target-qt +@@ -47403,7 +47847,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ @@ -5546,7 +5546,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-qthreads -@@ -47843,7 +48288,8 @@ all-target-rda: configure-target-rda +@@ -47844,7 +48289,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ @@ -5556,7 +5556,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-rda -@@ -48284,7 +48730,8 @@ all-target-libada: configure-target-liba +@@ -48285,7 +48731,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ @@ -5566,7 +5566,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libada -@@ -48725,7 +49172,8 @@ all-target-libgomp: configure-target-lib +@@ -48726,7 +49173,8 @@ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgomp && \ @@ -5576,7 +5576,7 @@ Index: gcc-4.3.1/Makefile.in @endif target-libgomp -@@ -49358,7 +49806,7 @@ stage1-end:: +@@ -49359,7 +49807,7 @@ # Bubble a bug fix through all the stages up to stage 1. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5585,7 +5585,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage1-bubble stage1-bubble:: @r=`${PWD_COMMAND}`; export r; \ -@@ -49569,7 +50017,7 @@ stage2-end:: +@@ -49570,7 +50018,7 @@ # Bubble a bug fix through all the stages up to stage 2. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5594,7 +5594,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage2-bubble stage2-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -49801,7 +50249,7 @@ stageb2g0-end:: +@@ -49802,7 +50250,7 @@ # Bubble a bug fix through all the stages up to stage b2g0. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5603,7 +5603,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageb2g0-bubble stageb2g0-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50033,7 +50481,7 @@ stage3-end:: +@@ -50034,7 +50482,7 @@ # Bubble a bug fix through all the stages up to stage 3. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5612,7 +5612,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage3-bubble stage3-bubble:: stage2-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50319,7 +50767,7 @@ stageb3g2-end:: +@@ -50320,7 +50768,7 @@ # Bubble a bug fix through all the stages up to stage b3g2. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5621,7 +5621,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageb3g2-bubble stageb3g2-bubble:: stageb2g0-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50605,7 +51053,7 @@ stage4-end:: +@@ -50606,7 +51054,7 @@ # Bubble a bug fix through all the stages up to stage 4. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5630,7 +5630,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stage4-bubble stage4-bubble:: stage3-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -50880,7 +51328,7 @@ stageprofile-end:: +@@ -50881,7 +51329,7 @@ # Bubble a bug fix through all the stages up to stage profile. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5639,7 +5639,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stageprofile-bubble stageprofile-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -51091,7 +51539,7 @@ stagefeedback-end:: +@@ -51092,7 +51540,7 @@ # Bubble a bug fix through all the stages up to stage feedback. They are # remade, but not reconfigured. The next stage (if any) will not be @@ -5648,7 +5648,7 @@ Index: gcc-4.3.1/Makefile.in .PHONY: stagefeedback-bubble stagefeedback-bubble:: stageprofile-bubble @r=`${PWD_COMMAND}`; export r; \ -@@ -51174,10 +51622,10 @@ stage_current: +@@ -51175,10 +51623,10 @@ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi .PHONY: restrap @@ -5661,7 +5661,7 @@ Index: gcc-4.3.1/Makefile.in @endif gcc-bootstrap # -------------------------------------- -@@ -52003,7 +52451,8 @@ config.status: configure +@@ -52004,7 +52452,8 @@ # Rebuilding configure. AUTOCONF = autoconf @@ -5671,11 +5671,11 @@ Index: gcc-4.3.1/Makefile.in cd $(srcdir) && $(AUTOCONF) # ------------------------------ -Index: gcc-4.3.1/configure +Index: gcc-4.3.2/configure =================================================================== ---- gcc-4.3.1.orig/configure 2008-02-01 19:29:30.000000000 -0800 -+++ gcc-4.3.1/configure 2008-08-20 00:47:50.000000000 -0700 -@@ -272,7 +272,7 @@ PACKAGE_STRING= +--- gcc-4.3.2.orig/configure 2008-02-01 19:29:30.000000000 -0800 ++++ gcc-4.3.2/configure 2008-08-28 18:18:37.000000000 -0700 +@@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= ac_unique_file="move-if-change" @@ -5684,7 +5684,7 @@ Index: gcc-4.3.1/configure ac_subst_files='serialization_dependencies host_makefile_frag target_makefile_frag alphaieee_frag ospace_frag' # Initialize some variables set by options. -@@ -5147,6 +5147,38 @@ else +@@ -5147,6 +5147,38 @@ fi; @@ -5723,7 +5723,7 @@ Index: gcc-4.3.1/configure # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -@@ -12825,6 +12857,8 @@ s,@gmpinc@,$gmpinc,;t t +@@ -12825,6 +12857,8 @@ s,@stage1_languages@,$stage1_languages,;t t s,@SYSROOT_CFLAGS_FOR_TARGET@,$SYSROOT_CFLAGS_FOR_TARGET,;t t s,@DEBUG_PREFIX_CFLAGS_FOR_TARGET@,$DEBUG_PREFIX_CFLAGS_FOR_TARGET,;t t @@ -5732,11 +5732,11 @@ Index: gcc-4.3.1/configure s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t s,@tooldir@,$tooldir,;t t s,@build_tooldir@,$build_tooldir,;t t -Index: gcc-4.3.1/libiberty/Makefile.in +Index: gcc-4.3.2/libiberty/Makefile.in =================================================================== ---- gcc-4.3.1.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 -+++ gcc-4.3.1/libiberty/Makefile.in 2008-08-20 00:47:50.000000000 -0700 -@@ -60,7 +60,7 @@ RANLIB = @RANLIB@ +--- gcc-4.3.2.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700 ++++ gcc-4.3.2/libiberty/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +@@ -60,7 +60,7 @@ MAKEINFO = @MAKEINFO@ PERL = @PERL@ @@ -5745,7 +5745,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in MAKEOVERRIDES = -@@ -143,10 +143,11 @@ CFILES = alloca.c argv.c asprintf.c atex +@@ -143,10 +143,11 @@ pex-unix.c pex-win32.c \ physmem.c putenv.c \ random.c regex.c rename.c rindex.c \ @@ -5761,7 +5761,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in tmpnam.c \ unlink-if-ordinary.c \ vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ -@@ -156,7 +157,8 @@ CFILES = alloca.c argv.c asprintf.c atex +@@ -156,7 +157,8 @@ # These are always included in the library. The first four are listed # first and by compile time to optimize parallel builds. @@ -5771,7 +5771,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in ./alloca.o ./argv.o \ ./choose-temp.o ./concat.o ./cp-demint.o \ ./dyn-string.o \ -@@ -473,13 +475,13 @@ stamp-h: $(srcdir)/config.in config.stat +@@ -473,13 +475,13 @@ config.status: $(srcdir)/configure $(SHELL) ./config.status --recheck @@ -5787,7 +5787,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in @subdirs='$(SUBDIRS)'; \ target=`echo $@ | sed -e 's/-subdir//'`; \ for dir in $$subdirs ; do \ -@@ -496,40 +498,41 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -496,40 +498,41 @@ # The dependencies in the remainder of this file are automatically # generated by "make maint-deps". Manual edits will be lost. @@ -5835,7 +5835,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \ -@@ -548,7 +551,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -548,7 +551,7 @@ else true; fi $(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION) @@ -5844,7 +5844,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \ else true; fi -@@ -566,20 +569,21 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -566,20 +569,21 @@ else true; fi $(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION) @@ -5869,7 +5869,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \ else true; fi -@@ -591,7 +595,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -591,7 +595,7 @@ else true; fi $(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION) @@ -5878,7 +5878,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -599,7 +603,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -599,7 +603,7 @@ else true; fi $(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION) @@ -5887,7 +5887,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \ $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -607,7 +611,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -607,7 +611,7 @@ else true; fi $(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION) @@ -5896,7 +5896,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -615,14 +619,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -615,14 +619,14 @@ else true; fi $(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION) @@ -5913,7 +5913,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \ -@@ -635,93 +639,94 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -635,93 +639,94 @@ else true; fi $(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION) @@ -6024,7 +6024,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \ -@@ -740,7 +745,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -740,7 +745,7 @@ else true; fi $(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION) @@ -6033,7 +6033,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -748,28 +753,28 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -748,28 +753,28 @@ else true; fi $(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION) @@ -6066,7 +6066,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \ else true; fi -@@ -811,7 +816,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -811,7 +816,7 @@ else true; fi $(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION) @@ -6075,7 +6075,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \ else true; fi -@@ -823,41 +828,41 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -823,41 +828,41 @@ else true; fi $(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION) @@ -6123,7 +6123,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \ $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ -@@ -865,42 +870,42 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -865,42 +870,42 @@ else true; fi $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION) @@ -6172,7 +6172,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \ else true; fi -@@ -912,14 +917,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -912,14 +917,14 @@ else true; fi $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION) @@ -6189,7 +6189,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \ else true; fi -@@ -938,7 +943,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -938,7 +943,7 @@ else true; fi $(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION) @@ -6198,7 +6198,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \ else true; fi -@@ -956,20 +961,21 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -956,20 +961,21 @@ else true; fi $(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION) @@ -6223,7 +6223,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \ -@@ -1006,7 +1012,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1006,7 +1012,7 @@ else true; fi $(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION) @@ -6232,7 +6232,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \ -@@ -1037,7 +1043,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1037,7 +1043,7 @@ else true; fi $(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION) @@ -6241,7 +6241,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \ -@@ -1056,13 +1062,13 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1056,13 +1062,13 @@ else true; fi $(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION) @@ -6257,7 +6257,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/safe-ctype.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \ -@@ -1082,14 +1088,14 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1082,14 +1088,14 @@ else true; fi $(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION) @@ -6274,7 +6274,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \ -@@ -1114,7 +1120,7 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1114,7 +1120,7 @@ else true; fi $(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION) @@ -6283,7 +6283,7 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \ -@@ -1127,54 +1133,54 @@ $(CONFIGURED_OFILES): stamp-picdir +@@ -1127,54 +1133,54 @@ else true; fi $(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION) @@ -6346,11 +6346,11 @@ Index: gcc-4.3.1/libiberty/Makefile.in $(INCDIR)/libiberty.h if [ x"$(PICFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \ -Index: gcc-4.3.1/libiberty/configure +Index: gcc-4.3.2/libiberty/configure =================================================================== ---- gcc-4.3.1.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.1/libiberty/configure 2008-08-20 00:47:50.000000000 -0700 -@@ -309,7 +309,7 @@ ac_includes_default="\ +--- gcc-4.3.2.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700 ++++ gcc-4.3.2/libiberty/configure 2008-08-28 18:18:37.000000000 -0700 +@@ -309,7 +309,7 @@ # include #endif" @@ -6359,7 +6359,7 @@ Index: gcc-4.3.1/libiberty/configure ac_subst_files='host_makefile_frag' # Initialize some variables set by options. -@@ -3699,9 +3699,7 @@ case "${host}" in +@@ -3699,9 +3699,7 @@ esac if [ -n "${frag}" ]; then @@ -6370,7 +6370,7 @@ Index: gcc-4.3.1/libiberty/configure fi # If they didn't specify --enable-shared, don't generate shared libs. -@@ -3712,34 +3710,35 @@ case "${enable_shared}" in +@@ -3712,34 +3710,35 @@ *) shared=yes ;; esac if [ "${shared}" = "yes" ]; then @@ -6425,7 +6425,7 @@ Index: gcc-4.3.1/libiberty/configure # record if we want to build shared libs. if [ "${shared}" = "yes" ]; then -@@ -9671,6 +9670,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t +@@ -9671,6 +9670,7 @@ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t @@ -6433,11 +6433,11 @@ Index: gcc-4.3.1/libiberty/configure s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@CHECK@,$CHECK,;t t -Index: gcc-4.3.1/libiberty/configure.ac +Index: gcc-4.3.2/libiberty/configure.ac =================================================================== ---- gcc-4.3.1.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 -+++ gcc-4.3.1/libiberty/configure.ac 2008-08-20 00:47:50.000000000 -0700 -@@ -187,9 +187,7 @@ case "${host}" in +--- gcc-4.3.2.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700 ++++ gcc-4.3.2/libiberty/configure.ac 2008-08-28 18:18:37.000000000 -0700 +@@ -187,9 +187,7 @@ esac if [[ -n "${frag}" ]]; then @@ -6448,7 +6448,7 @@ Index: gcc-4.3.1/libiberty/configure.ac fi # If they didn't specify --enable-shared, don't generate shared libs. -@@ -200,34 +198,35 @@ case "${enable_shared}" in +@@ -200,34 +198,35 @@ *) shared=yes ;; esac if [[ "${shared}" = "yes" ]]; then @@ -6503,11 +6503,11 @@ Index: gcc-4.3.1/libiberty/configure.ac # record if we want to build shared libs. if [[ "${shared}" = "yes" ]]; then -Index: gcc-4.3.1/gcc/Makefile.in +Index: gcc-4.3.2/gcc/Makefile.in =================================================================== ---- gcc-4.3.1.orig/gcc/Makefile.in 2008-08-20 00:46:44.000000000 -0700 -+++ gcc-4.3.1/gcc/Makefile.in 2008-08-20 00:47:50.000000000 -0700 -@@ -673,7 +673,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@ +--- gcc-4.3.2.orig/gcc/Makefile.in 2008-08-28 18:05:19.000000000 -0700 ++++ gcc-4.3.2/gcc/Makefile.in 2008-08-28 18:18:37.000000000 -0700 +@@ -672,7 +672,7 @@ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE # Native linker and preprocessor flags. For x-fragment overrides. @@ -6516,20 +6516,20 @@ Index: gcc-4.3.1/gcc/Makefile.in BUILD_CPPFLAGS=$(ALL_CPPFLAGS) # Actual name to use when installing a native compiler. -Index: gcc-4.3.1/gcc/configure +Index: gcc-4.3.2/gcc/configure =================================================================== ---- gcc-4.3.1.orig/gcc/configure 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/gcc/configure 2008-08-20 00:49:10.000000000 -0700 -@@ -309,7 +309,7 @@ ac_includes_default="\ +--- gcc-4.3.2.orig/gcc/configure 2008-08-28 18:05:26.000000000 -0700 ++++ gcc-4.3.2/gcc/configure 2008-08-28 18:19:35.000000000 -0700 +@@ -458,7 +458,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ac_subst_files='language_hooks' # Initialize some variables set by options. -@@ -12813,6 +12813,7 @@ else +@@ -12972,6 +12972,7 @@ esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ @@ -6537,7 +6537,7 @@ Index: gcc-4.3.1/gcc/configure CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -@@ -13310,6 +13311,7 @@ fi +@@ -13469,6 +13470,7 @@ # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' BUILD_CFLAGS='$(ALL_CFLAGS)' @@ -6545,7 +6545,7 @@ Index: gcc-4.3.1/gcc/configure STMP_FIXINC=stmp-fixinc # Possibly disable fixproto, on a per-target basis. -@@ -13327,6 +13329,7 @@ esac +@@ -13486,6 +13488,7 @@ if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' @@ -6553,7 +6553,107 @@ Index: gcc-4.3.1/gcc/configure if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then -@@ -17957,6 +17960,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR +@@ -14064,13 +14067,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:14067: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:14070: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:14070: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:14073: output\"" >&5) ++ (eval echo "\"\$as_me:14076: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -15125,7 +15128,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 15128 "configure"' > conftest.$ac_ext ++ echo '#line 15131 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -15745,11 +15748,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15748: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15751: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15752: \$? = $ac_status" >&5 ++ echo "$as_me:15755: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16067,11 +16070,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16070: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16073: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16074: \$? = $ac_status" >&5 ++ echo "$as_me:16077: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16172,11 +16175,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16175: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16179: \$? = $ac_status" >&5 ++ echo "$as_me:16182: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16227,11 +16230,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16230: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16233: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16234: \$? = $ac_status" >&5 ++ echo "$as_me:16237: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19024,7 +19027,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 19027 "configure" ++#line 19030 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -19124,7 +19127,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 19127 "configure" ++#line 19130 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -23934,6 +23937,7 @@ s,@inhibit_libc@,$inhibit_libc,;t t s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t @@ -6561,11 +6661,11 @@ Index: gcc-4.3.1/gcc/configure s,@STMP_FIXINC@,$STMP_FIXINC,;t t s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t s,@collect2@,$collect2,;t t -Index: gcc-4.3.1/gcc/configure.ac +Index: gcc-4.3.2/gcc/configure.ac =================================================================== ---- gcc-4.3.1.orig/gcc/configure.ac 2008-08-20 00:46:50.000000000 -0700 -+++ gcc-4.3.1/gcc/configure.ac 2008-08-20 00:48:50.000000000 -0700 -@@ -1480,6 +1480,7 @@ else +--- gcc-4.3.2.orig/gcc/configure.ac 2008-08-28 18:05:26.000000000 -0700 ++++ gcc-4.3.2/gcc/configure.ac 2008-08-28 18:18:37.000000000 -0700 +@@ -1480,6 +1480,7 @@ esac saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ @@ -6573,7 +6673,7 @@ Index: gcc-4.3.1/gcc/configure.ac CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias -@@ -1776,6 +1777,7 @@ AC_SUBST(inhibit_libc) +@@ -1776,6 +1777,7 @@ # These are the normal (build=host) settings: CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD) BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS) @@ -6581,7 +6681,7 @@ Index: gcc-4.3.1/gcc/configure.ac STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC) # Possibly disable fixproto, on a per-target basis. -@@ -1793,6 +1795,7 @@ AC_SUBST(STMP_FIXPROTO) +@@ -1793,6 +1795,7 @@ if test x$build != x$host || test "x$coverage_flags" != x then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' diff --git a/packages/gcc/gcc-4.3.2/gcc-flags-for-build.patch b/packages/gcc/gcc-4.3.2/gcc-flags-for-build.patch index b9b17640ba..43a9d73dcf 100644 --- a/packages/gcc/gcc-4.3.2/gcc-flags-for-build.patch +++ b/packages/gcc/gcc-4.3.2/gcc-flags-for-build.patch @@ -1,7 +1,7 @@ -Index: gcc-4.3.1/Makefile.def +Index: gcc-4.3.2/Makefile.def =================================================================== ---- gcc-4.3.1.orig/Makefile.def 2008-08-21 00:42:54.000000000 -0700 -+++ gcc-4.3.1/Makefile.def 2008-08-21 00:42:55.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.def 2008-08-28 18:21:19.000000000 -0700 ++++ gcc-4.3.2/Makefile.def 2008-08-28 18:21:41.000000000 -0700 @@ -207,6 +207,7 @@ flags_to_pass = { flag= BISON ; }; flags_to_pass = { flag= CC_FOR_BUILD ; }; @@ -10,11 +10,11 @@ Index: gcc-4.3.1/Makefile.def flags_to_pass = { flag= CXX_FOR_BUILD ; }; flags_to_pass = { flag= EXPECT ; }; flags_to_pass = { flag= FLEX ; }; -Index: gcc-4.3.1/gcc/Makefile.in +Index: gcc-4.3.2/gcc/Makefile.in =================================================================== ---- gcc-4.3.1.orig/gcc/Makefile.in 2008-08-21 00:42:54.000000000 -0700 -+++ gcc-4.3.1/gcc/Makefile.in 2008-08-21 00:42:55.000000000 -0700 -@@ -674,7 +674,7 @@ +--- gcc-4.3.2.orig/gcc/Makefile.in 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/gcc/Makefile.in 2008-08-28 18:21:41.000000000 -0700 +@@ -673,7 +673,7 @@ # Native linker and preprocessor flags. For x-fragment overrides. BUILD_LDFLAGS=@BUILD_LDFLAGS@ @@ -23,10 +23,10 @@ Index: gcc-4.3.1/gcc/Makefile.in # Actual name to use when installing a native compiler. GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)') -Index: gcc-4.3.1/gcc/configure.ac +Index: gcc-4.3.2/gcc/configure.ac =================================================================== ---- gcc-4.3.1.orig/gcc/configure.ac 2008-08-21 00:42:54.000000000 -0700 -+++ gcc-4.3.1/gcc/configure.ac 2008-08-21 00:42:55.000000000 -0700 +--- gcc-4.3.2.orig/gcc/configure.ac 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/gcc/configure.ac 2008-08-28 18:21:41.000000000 -0700 @@ -1775,10 +1775,11 @@ # Also, we cannot run fixincludes or fix-header. @@ -51,10 +51,10 @@ Index: gcc-4.3.1/gcc/configure.ac if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then -Index: gcc-4.3.1/Makefile.in +Index: gcc-4.3.2/Makefile.in =================================================================== ---- gcc-4.3.1.orig/Makefile.in 2008-08-21 00:42:55.000000000 -0700 -+++ gcc-4.3.1/Makefile.in 2008-08-21 00:42:55.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.in 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/Makefile.in 2008-08-28 18:21:41.000000000 -0700 @@ -272,6 +272,7 @@ AS_FOR_BUILD = @AS_FOR_BUILD@ CC_FOR_BUILD = @CC_FOR_BUILD@ @@ -63,7 +63,7 @@ Index: gcc-4.3.1/Makefile.in CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ -@@ -501,6 +502,7 @@ +@@ -502,6 +503,7 @@ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ @@ -71,20 +71,20 @@ Index: gcc-4.3.1/Makefile.in "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "EXPECT=$(EXPECT)" \ "FLEX=$(FLEX)" \ -Index: gcc-4.3.1/gcc/configure +Index: gcc-4.3.2/gcc/configure =================================================================== ---- gcc-4.3.1.orig/gcc/configure 2008-08-21 00:42:54.000000000 -0700 -+++ gcc-4.3.1/gcc/configure 2008-08-21 00:42:55.000000000 -0700 -@@ -309,7 +309,7 @@ +--- gcc-4.3.2.orig/gcc/configure 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/gcc/configure 2008-08-28 18:21:50.000000000 -0700 +@@ -458,7 +458,7 @@ # include #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS BUILD_CPPFLAGS STMP_FIXINC STMP_FIXPROTO collect2 LIBTOOL SED FGREP GREP LD DUMPBIN ac_ct_DUMPBIN ac_ct_AR STRIP ac_ct_STRIP lt_ECHO objdir enable_fast_install gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS' ac_subst_files='language_hooks' # Initialize some variables set by options. -@@ -13312,6 +13312,7 @@ +@@ -13471,6 +13471,7 @@ CC_FOR_BUILD='$(CC)' BUILD_CFLAGS='$(ALL_CFLAGS)' BUILD_LDFLAGS='$(LDFLAGS)' @@ -92,7 +92,7 @@ Index: gcc-4.3.1/gcc/configure STMP_FIXINC=stmp-fixinc # Possibly disable fixproto, on a per-target basis. -@@ -13330,6 +13331,7 @@ +@@ -13489,6 +13490,7 @@ then BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)' BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)' @@ -100,7 +100,107 @@ Index: gcc-4.3.1/gcc/configure if test "x$TARGET_SYSTEM_ROOT" = x; then if test "x$STMP_FIXPROTO" != x; then -@@ -17961,6 +17963,7 @@ +@@ -14067,13 +14069,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:14070: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:14072: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:14073: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:14075: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:14076: output\"" >&5) ++ (eval echo "\"\$as_me:14078: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -15128,7 +15130,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 15131 "configure"' > conftest.$ac_ext ++ echo '#line 15133 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -15748,11 +15750,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15751: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15753: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15755: \$? = $ac_status" >&5 ++ echo "$as_me:15757: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16070,11 +16072,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16073: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16075: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16077: \$? = $ac_status" >&5 ++ echo "$as_me:16079: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16175,11 +16177,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16180: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16182: \$? = $ac_status" >&5 ++ echo "$as_me:16184: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16230,11 +16232,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16233: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16235: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16237: \$? = $ac_status" >&5 ++ echo "$as_me:16239: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -19027,7 +19029,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 19030 "configure" ++#line 19032 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -19127,7 +19129,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 19130 "configure" ++#line 19132 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -23938,6 +23940,7 @@ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t @@ -108,10 +208,10 @@ Index: gcc-4.3.1/gcc/configure s,@STMP_FIXINC@,$STMP_FIXINC,;t t s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t s,@collect2@,$collect2,;t t -Index: gcc-4.3.1/Makefile.tpl +Index: gcc-4.3.2/Makefile.tpl =================================================================== ---- gcc-4.3.1.orig/Makefile.tpl 2008-08-21 00:42:55.000000000 -0700 -+++ gcc-4.3.1/Makefile.tpl 2008-08-21 00:42:55.000000000 -0700 +--- gcc-4.3.2.orig/Makefile.tpl 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/Makefile.tpl 2008-08-28 18:21:41.000000000 -0700 @@ -275,6 +275,7 @@ AS_FOR_BUILD = @AS_FOR_BUILD@ CC_FOR_BUILD = @CC_FOR_BUILD@ @@ -120,10 +220,10 @@ Index: gcc-4.3.1/Makefile.tpl CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ -Index: gcc-4.3.1/configure +Index: gcc-4.3.2/configure =================================================================== ---- gcc-4.3.1.orig/configure 2008-08-21 01:29:03.000000000 -0700 -+++ gcc-4.3.1/configure 2008-08-21 01:29:14.000000000 -0700 +--- gcc-4.3.2.orig/configure 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/configure 2008-08-28 18:21:41.000000000 -0700 @@ -272,7 +272,7 @@ PACKAGE_BUGREPORT= @@ -157,10 +257,10 @@ Index: gcc-4.3.1/configure s,@CXXFLAGS_FOR_BUILD@,$CXXFLAGS_FOR_BUILD,;t t s,@CXX_FOR_BUILD@,$CXX_FOR_BUILD,;t t s,@DLLTOOL_FOR_BUILD@,$DLLTOOL_FOR_BUILD,;t t -Index: gcc-4.3.1/configure.ac +Index: gcc-4.3.2/configure.ac =================================================================== ---- gcc-4.3.1.orig/configure.ac 2008-08-21 01:27:06.000000000 -0700 -+++ gcc-4.3.1/configure.ac 2008-08-21 01:28:41.000000000 -0700 +--- gcc-4.3.2.orig/configure.ac 2008-08-28 18:21:20.000000000 -0700 ++++ gcc-4.3.2/configure.ac 2008-08-28 18:21:41.000000000 -0700 @@ -2425,6 +2425,7 @@ # our build compiler if desired. if test x"${build}" = x"${host}" ; then diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb index e9db886be6..29ee187785 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,3 +1,5 @@ +PR = "r1" + inherit sdk require gcc-${PV}.inc diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb index f9ae312513..d41b7a4557 100644 --- a/packages/gcc/gcc-cross_4.3.2.bb +++ b/packages/gcc/gcc-cross_4.3.2.bb @@ -1,3 +1,4 @@ +PR = "r1" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc diff --git a/packages/gcc/gcc_4.3.2.bb b/packages/gcc/gcc_4.3.2.bb index 902ed2de22..bdca9ca513 100644 --- a/packages/gcc/gcc_4.3.2.bb +++ b/packages/gcc/gcc_4.3.2.bb @@ -1,3 +1,4 @@ +PR = "r1" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc -- cgit v1.2.3 From d80141ea4131694f6cad63ea2d50e2b46c840948 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Aug 2008 05:18:57 +0000 Subject: All below is done for GCC 4.3.1 and 4.3.2 recipes. Enable patches for ARM big endian support. Delete unneeded ARM big endian patches. Adjust Thumb support patches. --- packages/gcc/gcc-4.3.1.inc | 10 ++-- packages/gcc/gcc-4.3.1/800-arm-bigendian.patch | 55 +++++----------------- .../gcc/gcc-4.3.1/801-arm-bigendian-eabi.patch | 14 ------ packages/gcc/gcc-4.3.1/arm-thumb.patch | 43 +++++------------ packages/gcc/gcc-4.3.1/intermask-bigendian.patch | 24 ---------- packages/gcc/gcc-4.3.2.inc | 4 +- packages/gcc/gcc-4.3.2/800-arm-bigendian.patch | 55 +++++----------------- .../gcc/gcc-4.3.2/801-arm-bigendian-eabi.patch | 14 ------ packages/gcc/gcc-4.3.2/arm-thumb.patch | 43 +++++------------ packages/gcc/gcc-4.3.2/intermask-bigendian.patch | 24 ---------- packages/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- packages/gcc/gcc-cross-sdk_4.3.2.bb | 2 +- packages/gcc/gcc-cross_4.3.1.bb | 2 +- packages/gcc/gcc-cross_4.3.2.bb | 2 +- packages/gcc/gcc_4.3.1.bb | 2 +- packages/gcc/gcc_4.3.2.bb | 2 +- 16 files changed, 55 insertions(+), 243 deletions(-) delete mode 100644 packages/gcc/gcc-4.3.1/801-arm-bigendian-eabi.patch delete mode 100644 packages/gcc/gcc-4.3.1/intermask-bigendian.patch delete mode 100644 packages/gcc/gcc-4.3.2/801-arm-bigendian-eabi.patch delete mode 100644 packages/gcc/gcc-4.3.2/intermask-bigendian.patch diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc index 7a04be2401..6bc197e4c5 100644 --- a/packages/gcc/gcc-4.3.1.inc +++ b/packages/gcc/gcc-4.3.1.inc @@ -20,7 +20,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fedora/gcc43-libgomp-speedup.patch;patch=1;pnum=0 \ file://fedora/gcc43-i386-libgomp.patch;patch=1;pnum=0 \ file://fedora/gcc43-rh251682.patch;patch=1;pnum=0 \ - file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \ + file://debian/arm-unbreak-eabi-armv4t.dpatch;patch=1 \ file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \ file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ file://debian/pr30961.dpatch;patch=1;pnum=0 \ @@ -40,13 +40,12 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ # file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ -# file://800-arm-bigendian.patch;patch=1 \ -# file://801-arm-bigendian-eabi.patch;patch=1 \ + file://800-arm-bigendian.patch;patch=1 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ -# file://arm-thumb.patch;patch=1 \ -# file://arm-thumb-cache.patch;patch=1 \ + file://arm-thumb.patch;patch=1 \ + file://arm-thumb-cache.patch;patch=1 \ file://ldflags.patch;patch=1 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ @@ -54,7 +53,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ -# file://intermask-bigendian.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \ file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.3.1/800-arm-bigendian.patch b/packages/gcc/gcc-4.3.1/800-arm-bigendian.patch index 07c6093379..f433942783 100644 --- a/packages/gcc/gcc-4.3.1/800-arm-bigendian.patch +++ b/packages/gcc/gcc-4.3.1/800-arm-bigendian.patch @@ -3,37 +3,11 @@ Adds support for arm*b-linux* big-endian ARM targets See http://gcc.gnu.org/PR16350 ---- gcc-4.2.0/gcc/config/arm/linux-elf.h -+++ gcc-4.2.0/gcc/config/arm/linux-elf.h -@@ -28,19 +28,33 @@ - #undef TARGET_VERSION - #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr); - -+/* -+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-* -+ * (big endian) configurations. -+ */ -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END -+#define TARGET_ENDIAN_OPTION "mbig-endian" -+#define TARGET_LINKER_EMULATION "armelfb_linux" -+#else -+#define TARGET_ENDIAN_DEFAULT 0 -+#define TARGET_ENDIAN_OPTION "mlittle-endian" -+#define TARGET_LINKER_EMULATION "armelf_linux" -+#endif -+ - #undef TARGET_DEFAULT_FLOAT_ABI - #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD - - #undef TARGET_DEFAULT --#define TARGET_DEFAULT (0) -+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT) - - #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6 - --#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p" -+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p" +Index: gcc-4.3.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.3.2.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 ++++ gcc-4.3.2/gcc/config/arm/linux-elf.h 2008-08-28 21:08:30.000000000 -0700 +@@ -51,7 +51,7 @@ #undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ @@ -42,19 +16,12 @@ See http://gcc.gnu.org/PR16350 /* Now we define the strings used to build the spec file. */ #undef LIB_SPEC -@@ -61,7 +75,7 @@ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - -X \ -- %{mbig-endian:-EB}" \ -+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ - SUBTARGET_EXTRA_LINK_SPEC - - #undef LINK_SPEC ---- gcc-4.2.0/gcc/config.gcc.orig 2006-09-22 14:53:41.000000000 +0200 -+++ gcc-4.2.0/gcc/config.gcc 2006-09-25 10:45:21.000000000 +0200 -@@ -696,6 +696,11 @@ - tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" +Index: gcc-4.3.2/gcc/config.gcc +=================================================================== +--- gcc-4.3.2.orig/gcc/config.gcc 2008-08-28 20:57:39.000000000 -0700 ++++ gcc-4.3.2/gcc/config.gcc 2008-08-28 21:00:11.000000000 -0700 +@@ -742,6 +742,11 @@ + esac tmake_file="${tmake_file} t-linux arm/t-arm" case ${target} in + arm*b-*) diff --git a/packages/gcc/gcc-4.3.1/801-arm-bigendian-eabi.patch b/packages/gcc/gcc-4.3.1/801-arm-bigendian-eabi.patch deleted file mode 100644 index 54490fc24f..0000000000 --- a/packages/gcc/gcc-4.3.1/801-arm-bigendian-eabi.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: gcc-4.1.1/gcc/config/arm/linux-eabi.h -=================================================================== ---- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h 2007-02-20 14:51:33.416193250 +0100 -+++ gcc-4.1.1/gcc/config/arm/linux-eabi.h 2007-02-20 14:52:11.622581000 +0100 -@@ -48,7 +48,8 @@ - #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - #undef SUBTARGET_EXTRA_LINK_SPEC --#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi" -+#define SUBTARGET_EXTRA_LINK_SPEC \ -+ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} " - - /* Use ld-linux.so.3 so that it will be possible to run "classic" - GNU/Linux binaries on an EABI system. */ diff --git a/packages/gcc/gcc-4.3.1/arm-thumb.patch b/packages/gcc/gcc-4.3.1/arm-thumb.patch index 016a7a550b..7b0b8b2ddc 100644 --- a/packages/gcc/gcc-4.3.1/arm-thumb.patch +++ b/packages/gcc/gcc-4.3.1/arm-thumb.patch @@ -3,34 +3,11 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- gcc-4.1.1/gcc/config/arm/lib1funcs.asm~gcc -+++ gcc-4.1.1/gcc/config/arm/lib1funcs.asm -@@ -995,10 +995,24 @@ - .code 32 - FUNC_START div0 - -+#if ! defined __thumb__ - stmfd sp!, {r1, lr} - mov r0, #SIGFPE - bl SYM(raise) __PLT__ - RETLDM r1 -+#else -+ push {r1, lr} -+ mov r0, #SIGFPE -+ bl SYM(raise) __PLT__ -+#if __ARM_ARCH__ > 4 -+ pop {r1, pc} -+#else -+ @ on 4T that won't work -+ pop {r1} -+ pop {r3} -+ bx r3 -+#endif -+#endif - - FUNC_END div0 - -@@ -1141,11 +1155,12 @@ +Index: gcc-4.3.1/gcc/config/arm/lib1funcs.asm +=================================================================== +--- gcc-4.3.1.orig/gcc/config/arm/lib1funcs.asm 2007-05-30 12:04:09.000000000 -0700 ++++ gcc-4.3.1/gcc/config/arm/lib1funcs.asm 2008-08-28 21:51:17.000000000 -0700 +@@ -1225,11 +1225,12 @@ code here switches to the correct mode before executing the function. */ .text @@ -44,7 +21,7 @@ bx \register nop -@@ -1242,6 +1257,7 @@ +@@ -1330,6 +1331,7 @@ .code 16 THUMB_FUNC_START _interwork_call_via_\register @@ -52,9 +29,11 @@ bx pc nop ---- gcc-4.1.1/gcc/config/arm/t-linux~gcc -+++ gcc-4.1.1/gcc/config/arm/t-linux -@@ -7,6 +7,7 @@ +Index: gcc-4.3.1/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.3.1.orig/gcc/config/arm/t-linux 2008-08-28 21:25:24.000000000 -0700 ++++ gcc-4.3.1/gcc/config/arm/t-linux 2008-08-28 21:51:17.000000000 -0700 +@@ -6,6 +6,7 @@ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ diff --git a/packages/gcc/gcc-4.3.1/intermask-bigendian.patch b/packages/gcc/gcc-4.3.1/intermask-bigendian.patch deleted file mode 100644 index fdff3d3d86..0000000000 --- a/packages/gcc/gcc-4.3.1/intermask-bigendian.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gcc-4.2.0/gcc/config/arm/bpabi.h -+++ gcc-4.2.0/gcc/config/arm/bpabi.h -@@ -33,9 +33,19 @@ - #undef FPUTYPE_DEFAULT - #define FPUTYPE_DEFAULT FPUTYPE_VFP - -+/* -+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-* -+ * (big endian) configurations. -+ */ -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END -+#else -+#define TARGET_ENDIAN_DEFAULT 0 -+#endif -+ - /* EABI targets should enable interworking by default. */ - #undef TARGET_DEFAULT --#define TARGET_DEFAULT MASK_INTERWORK -+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT) - - /* The ARM BPABI functions return a boolean; they use no special - calling convention. */ - diff --git a/packages/gcc/gcc-4.3.2.inc b/packages/gcc/gcc-4.3.2.inc index b21dd3100f..49b2a63b70 100644 --- a/packages/gcc/gcc-4.3.2.inc +++ b/packages/gcc/gcc-4.3.2.inc @@ -39,8 +39,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://307-locale_facets.patch;patch=1 \ file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ -# file://800-arm-bigendian.patch;patch=1 \ -# file://801-arm-bigendian-eabi.patch;patch=1 \ + file://800-arm-bigendian.patch;patch=1 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ file://arm-nolibfloat.patch;patch=1 \ file://arm-softfloat.patch;patch=1 \ @@ -51,7 +50,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://gcc-4.0.2-e300c2c3.patch;patch=1 \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ -# file://intermask-bigendian.patch;patch=1 \ file://gcc-arm-frename-registers.patch;patch=1 \ file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.3.2/800-arm-bigendian.patch b/packages/gcc/gcc-4.3.2/800-arm-bigendian.patch index 07c6093379..f433942783 100644 --- a/packages/gcc/gcc-4.3.2/800-arm-bigendian.patch +++ b/packages/gcc/gcc-4.3.2/800-arm-bigendian.patch @@ -3,37 +3,11 @@ Adds support for arm*b-linux* big-endian ARM targets See http://gcc.gnu.org/PR16350 ---- gcc-4.2.0/gcc/config/arm/linux-elf.h -+++ gcc-4.2.0/gcc/config/arm/linux-elf.h -@@ -28,19 +28,33 @@ - #undef TARGET_VERSION - #define TARGET_VERSION fputs (" (ARM GNU/Linux with ELF)", stderr); - -+/* -+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-* -+ * (big endian) configurations. -+ */ -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END -+#define TARGET_ENDIAN_OPTION "mbig-endian" -+#define TARGET_LINKER_EMULATION "armelfb_linux" -+#else -+#define TARGET_ENDIAN_DEFAULT 0 -+#define TARGET_ENDIAN_OPTION "mlittle-endian" -+#define TARGET_LINKER_EMULATION "armelf_linux" -+#endif -+ - #undef TARGET_DEFAULT_FLOAT_ABI - #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD - - #undef TARGET_DEFAULT --#define TARGET_DEFAULT (0) -+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT) - - #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6 - --#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p" -+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p" +Index: gcc-4.3.2/gcc/config/arm/linux-elf.h +=================================================================== +--- gcc-4.3.2.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 ++++ gcc-4.3.2/gcc/config/arm/linux-elf.h 2008-08-28 21:08:30.000000000 -0700 +@@ -51,7 +51,7 @@ #undef MULTILIB_DEFAULTS #define MULTILIB_DEFAULTS \ @@ -42,19 +16,12 @@ See http://gcc.gnu.org/PR16350 /* Now we define the strings used to build the spec file. */ #undef LIB_SPEC -@@ -61,7 +75,7 @@ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - -X \ -- %{mbig-endian:-EB}" \ -+ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ - SUBTARGET_EXTRA_LINK_SPEC - - #undef LINK_SPEC ---- gcc-4.2.0/gcc/config.gcc.orig 2006-09-22 14:53:41.000000000 +0200 -+++ gcc-4.2.0/gcc/config.gcc 2006-09-25 10:45:21.000000000 +0200 -@@ -696,6 +696,11 @@ - tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" +Index: gcc-4.3.2/gcc/config.gcc +=================================================================== +--- gcc-4.3.2.orig/gcc/config.gcc 2008-08-28 20:57:39.000000000 -0700 ++++ gcc-4.3.2/gcc/config.gcc 2008-08-28 21:00:11.000000000 -0700 +@@ -742,6 +742,11 @@ + esac tmake_file="${tmake_file} t-linux arm/t-arm" case ${target} in + arm*b-*) diff --git a/packages/gcc/gcc-4.3.2/801-arm-bigendian-eabi.patch b/packages/gcc/gcc-4.3.2/801-arm-bigendian-eabi.patch deleted file mode 100644 index 54490fc24f..0000000000 --- a/packages/gcc/gcc-4.3.2/801-arm-bigendian-eabi.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: gcc-4.1.1/gcc/config/arm/linux-eabi.h -=================================================================== ---- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h 2007-02-20 14:51:33.416193250 +0100 -+++ gcc-4.1.1/gcc/config/arm/linux-eabi.h 2007-02-20 14:52:11.622581000 +0100 -@@ -48,7 +48,8 @@ - #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - #undef SUBTARGET_EXTRA_LINK_SPEC --#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi" -+#define SUBTARGET_EXTRA_LINK_SPEC \ -+ " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} " - - /* Use ld-linux.so.3 so that it will be possible to run "classic" - GNU/Linux binaries on an EABI system. */ diff --git a/packages/gcc/gcc-4.3.2/arm-thumb.patch b/packages/gcc/gcc-4.3.2/arm-thumb.patch index 016a7a550b..7b0b8b2ddc 100644 --- a/packages/gcc/gcc-4.3.2/arm-thumb.patch +++ b/packages/gcc/gcc-4.3.2/arm-thumb.patch @@ -3,34 +3,11 @@ # Patch managed by http://www.holgerschurig.de/patcher.html # ---- gcc-4.1.1/gcc/config/arm/lib1funcs.asm~gcc -+++ gcc-4.1.1/gcc/config/arm/lib1funcs.asm -@@ -995,10 +995,24 @@ - .code 32 - FUNC_START div0 - -+#if ! defined __thumb__ - stmfd sp!, {r1, lr} - mov r0, #SIGFPE - bl SYM(raise) __PLT__ - RETLDM r1 -+#else -+ push {r1, lr} -+ mov r0, #SIGFPE -+ bl SYM(raise) __PLT__ -+#if __ARM_ARCH__ > 4 -+ pop {r1, pc} -+#else -+ @ on 4T that won't work -+ pop {r1} -+ pop {r3} -+ bx r3 -+#endif -+#endif - - FUNC_END div0 - -@@ -1141,11 +1155,12 @@ +Index: gcc-4.3.1/gcc/config/arm/lib1funcs.asm +=================================================================== +--- gcc-4.3.1.orig/gcc/config/arm/lib1funcs.asm 2007-05-30 12:04:09.000000000 -0700 ++++ gcc-4.3.1/gcc/config/arm/lib1funcs.asm 2008-08-28 21:51:17.000000000 -0700 +@@ -1225,11 +1225,12 @@ code here switches to the correct mode before executing the function. */ .text @@ -44,7 +21,7 @@ bx \register nop -@@ -1242,6 +1257,7 @@ +@@ -1330,6 +1331,7 @@ .code 16 THUMB_FUNC_START _interwork_call_via_\register @@ -52,9 +29,11 @@ bx pc nop ---- gcc-4.1.1/gcc/config/arm/t-linux~gcc -+++ gcc-4.1.1/gcc/config/arm/t-linux -@@ -7,6 +7,7 @@ +Index: gcc-4.3.1/gcc/config/arm/t-linux +=================================================================== +--- gcc-4.3.1.orig/gcc/config/arm/t-linux 2008-08-28 21:25:24.000000000 -0700 ++++ gcc-4.3.1/gcc/config/arm/t-linux 2008-08-28 21:51:17.000000000 -0700 +@@ -6,6 +6,7 @@ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ diff --git a/packages/gcc/gcc-4.3.2/intermask-bigendian.patch b/packages/gcc/gcc-4.3.2/intermask-bigendian.patch deleted file mode 100644 index fdff3d3d86..0000000000 --- a/packages/gcc/gcc-4.3.2/intermask-bigendian.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gcc-4.2.0/gcc/config/arm/bpabi.h -+++ gcc-4.2.0/gcc/config/arm/bpabi.h -@@ -33,9 +33,19 @@ - #undef FPUTYPE_DEFAULT - #define FPUTYPE_DEFAULT FPUTYPE_VFP - -+/* -+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-* -+ * (big endian) configurations. -+ */ -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END -+#else -+#define TARGET_ENDIAN_DEFAULT 0 -+#endif -+ - /* EABI targets should enable interworking by default. */ - #undef TARGET_DEFAULT --#define TARGET_DEFAULT MASK_INTERWORK -+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT) - - /* The ARM BPABI functions return a boolean; they use no special - calling convention. */ - diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb index 7380c26f13..1c09b67716 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" inherit sdk diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb index 29ee187785..7f3e1466ce 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.2.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb index fe44c73674..48934f73c5 100644 --- a/packages/gcc/gcc-cross_4.3.1.bb +++ b/packages/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r12" +PR = "r13" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc-cross_4.3.2.bb b/packages/gcc/gcc-cross_4.3.2.bb index d41b7a4557..7e649ac280 100644 --- a/packages/gcc/gcc-cross_4.3.2.bb +++ b/packages/gcc/gcc-cross_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-${PV}.inc require gcc-cross4.inc require gcc-configure-cross.inc diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb index 1514b1ae0f..c2fd8ccb21 100644 --- a/packages/gcc/gcc_4.3.1.bb +++ b/packages/gcc/gcc_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/packages/gcc/gcc_4.3.2.bb b/packages/gcc/gcc_4.3.2.bb index bdca9ca513..158469e988 100644 --- a/packages/gcc/gcc_4.3.2.bb +++ b/packages/gcc/gcc_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-${PV}.inc require gcc-configure-target.inc require gcc-package-target.inc -- cgit v1.2.3 From 8806f1ab1c61be5d749f8788be3e66f73f8e5c79 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 29 Aug 2008 05:33:34 +0000 Subject: Convert spaces into tabs for better readability. --- packages/uclibc/uclibc_0.9.29.bb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index f521490863..90b52b3f8d 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r25" +PR = "r26" DEFAULT_PREFERENCE = "1" require uclibc.inc @@ -15,23 +15,23 @@ require uclibc.inc PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" SRC_URI += "file://uClibc.machine file://uClibc.distro \ - file://errno_values.h.patch;patch=1 \ - file://termios.h.patch;patch=1 \ - file://unistd_arm.patch;patch=1 \ - file://build_wcs_upper_buffer.patch;patch=1 \ - file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \ - file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \ - file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \ - file://uClibc-0.9.29-conditional-sched_affinity.patch;patch=1 \ - file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;patch=1 \ - file://uClibc-0.9.29-fix-internal_function-definition.patch;patch=1 \ - file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \ - file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \ - file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \ - file://arm_fix_alignment.patch;patch=1 \ - file://uclibc-arm-ftruncate64.patch;patch=1 \ - file://uclibc-use-fgnu89-inline.patch;patch=1 \ - " + file://errno_values.h.patch;patch=1 \ + file://termios.h.patch;patch=1 \ + file://unistd_arm.patch;patch=1 \ + file://build_wcs_upper_buffer.patch;patch=1 \ + file://uClibc-0.9.29-001-fix-mmap.patch;patch=1 \ + file://uClibc-0.9.29-002-atmel.1.patch;patch=1 \ + file://uClibc-0.9.29-avr32-fix-sa_onstack.patch;patch=1 \ + file://uClibc-0.9.29-conditional-sched_affinity.patch;patch=1 \ + file://uClibc-0.9.29-fix-gethostent_r-failure-retval.patch;patch=1 \ + file://uClibc-0.9.29-fix-internal_function-definition.patch;patch=1 \ + file://uClibc-0.9.29-rm-whitespace.patch;patch=1 \ + file://uClibc-0.9.29-avr32-bzero.patch;patch=1 \ + file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \ + file://arm_fix_alignment.patch;patch=1 \ + file://uclibc-arm-ftruncate64.patch;patch=1 \ + file://uclibc-use-fgnu89-inline.patch;patch=1 \ + " #recent versions uclibc require real kernel headers PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From aa12068c841cac5509cea075f0ad65a4cd3141b8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 29 Aug 2008 09:01:12 +0000 Subject: libsdl x11 remove 1.2.9, 1.2.11 is the new stable one. --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- packages/libsdl/libsdl-x11_1.2.9.bb | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/libsdl/libsdl-x11_1.2.9.bb diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 13040fd45d..9a30fb0aa1 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1009,7 +1009,7 @@ PREFERRED_VERSION_libsdl-native ?= "1.2.11" PREFERRED_VERSION_libsdl-net ?= "1.2.7" PREFERRED_VERSION_libsdl-ttf ?= "2.0.3" PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3" -PREFERRED_VERSION_libsdl-x11 ?= "1.2.9" +PREFERRED_VERSION_libsdl-x11 ?= "1.2.11" PREFERRED_VERSION_libsettings ?= "0.3" PREFERRED_VERSION_libsexy ?= "0.1.11" PREFERRED_VERSION_libsidplay ?= "1.36.59" diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb deleted file mode 100644 index 637f0ae177..0000000000 --- a/packages/libsdl/libsdl-x11_1.2.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require libsdl.inc -PR = "r6" - -EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ - --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \ - --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ - --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \ - --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \ - --disable-video-xbios --disable-video-gem --disable-video-dummy \ - --enable-video-opengl --enable-input-events --enable-pthreads \ - --disable-video-picogui --disable-video-qtopia --enable-dlopen" - -- cgit v1.2.3 From 3d3cb42025e9f5607a66523c3b7d02d2f63e1904 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Aug 2008 12:39:31 +0000 Subject: preferred-om-2008-versions: Bumped firefox to 3.0.1, since 1.0.7 doesn't build and 3.0.1 does. --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 9a30fb0aa1..3126392630 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -369,7 +369,7 @@ PREFERRED_VERSION_file ?= "4.21" PREFERRED_VERSION_file-native ?= "4.21" PREFERRED_VERSION_findutils ?= "4.2.29" PREFERRED_VERSION_findutils-native ?= "4.2.29" -PREFERRED_VERSION_firefox ?= "1.0.7" +PREFERRED_VERSION_firefox ?= "3.0.1" PREFERRED_VERSION_fis ?= "1.0" PREFERRED_VERSION_fish ?= "1.1.0" PREFERRED_VERSION_fixesproto ?= "4.0" -- cgit v1.2.3 From 0b4c74ed98765d16abd3f3bba60a885c031f38c5 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Aug 2008 12:39:53 +0000 Subject: task-openmoko-feed: Added zip and firefox. --- packages/tasks/task-openmoko-feed.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index af2c85fb2c..87a2601950 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r35" +PR = "r36" inherit task @@ -93,4 +93,6 @@ RDEPENDS_task-openmoko-feed = "\ irssi \ zsh \ fbreader \ + zip \ + firefox \ " -- cgit v1.2.3 From 53d40c2ef7fbab3cfa5b70d15ba322897ded9500 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Aug 2008 13:00:40 +0000 Subject: task-openmoko-feed: Added tichy, a python applets manager for embedded devices. --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 87a2601950..32b05effed 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r36" +PR = "r37" inherit task @@ -95,4 +95,5 @@ RDEPENDS_task-openmoko-feed = "\ fbreader \ zip \ firefox \ + tichy \ " -- cgit v1.2.3 From 92bc1fb9505921d5fcf1fa8d812813ced63d991c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 29 Aug 2008 13:12:24 +0000 Subject: preferred-om-2008-versions: Bumped bluez to 3.33. --- conf/distro/include/preferred-om-2008-versions.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 3126392630..0ebca097cf 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -91,14 +91,14 @@ PREFERRED_VERSION_bison-native ?= "2.0" PREFERRED_VERSION_bitbake ?= "1.8.6" PREFERRED_VERSION_bitchx ?= "1.1" PREFERRED_VERSION_bluesnarfer ?= "0.1" -PREFERRED_VERSION_bluez-cups-backend ?= "3.23" +PREFERRED_VERSION_bluez-cups-backend ?= "3.33" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" -PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.23" +PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33" PREFERRED_VERSION_bluez-hcidump ?= "1.38" -PREFERRED_VERSION_bluez-libs ?= "3.23" -PREFERRED_VERSION_bluez-utils ?= "3.23" -PREFERRED_VERSION_bluez-utils-alsa ?= "3.23" +PREFERRED_VERSION_bluez-libs ?= "3.33" +PREFERRED_VERSION_bluez-utils ?= "3.33" +PREFERRED_VERSION_bluez-utils-alsa ?= "3.33" PREFERRED_VERSION_bmon ?= "2.1.0" PREFERRED_VERSION_boa ?= "0.94.13" PREFERRED_VERSION_bochs ?= "2.1" -- cgit v1.2.3 From a11471ceda7613108917fa99120923a86e3076a4 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 29 Aug 2008 13:48:48 +0000 Subject: c-ares: add 1.5.3 --- packages/c-ares/c-ares_1.5.3.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/c-ares/c-ares_1.5.3.bb diff --git a/packages/c-ares/c-ares_1.5.3.bb b/packages/c-ares/c-ares_1.5.3.bb new file mode 100644 index 0000000000..9098a9cb31 --- /dev/null +++ b/packages/c-ares/c-ares_1.5.3.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz" +LICENSE = "MIT" +S = "${WORKDIR}/c-ares-${PV}" + +inherit autotools + +do_stage() { + oe_libinstall -C .libs -a libcares ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/ares + install -m 0644 ares*.h ${STAGING_INCDIR}/ares/ +} + -- cgit v1.2.3 From 5ddd65ca331ae09bcf5505b0a7836a83aa1666ca Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Fri, 29 Aug 2008 14:16:33 +0000 Subject: c-ares: enable shared library support --- packages/c-ares/c-ares_1.5.3.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/c-ares/c-ares_1.5.3.bb b/packages/c-ares/c-ares_1.5.3.bb index 9098a9cb31..7375bda980 100644 --- a/packages/c-ares/c-ares_1.5.3.bb +++ b/packages/c-ares/c-ares_1.5.3.bb @@ -4,11 +4,14 @@ SECTION = "libs" SRC_URI = "http://daniel.haxx.se/projects/c-ares/c-ares-${PV}.tar.gz" LICENSE = "MIT" S = "${WORKDIR}/c-ares-${PV}" +PR = "r1" inherit autotools +EXTRA_OECONF = "--enable-shared" + do_stage() { - oe_libinstall -C .libs -a libcares ${STAGING_LIBDIR} + oe_libinstall -C .libs -a -so libcares ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/ares install -m 0644 ares*.h ${STAGING_INCDIR}/ares/ } -- cgit v1.2.3 From 1758389618b9d52af94c8a7ba40df3e63b707998 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 16:51:18 +0000 Subject: SlugOS 5.0: udev - mount.sh script needs to use blkid to automatically blacklist members of a RAID array (lest we automount them, which may happen, at least with the busybox mount command). --- packages/udev/files/slugos/mount.sh | 6 ++++++ packages/udev/udev_100.bb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/udev/files/slugos/mount.sh b/packages/udev/files/slugos/mount.sh index 11714c1390..0990a7e85a 100644 --- a/packages/udev/files/slugos/mount.sh +++ b/packages/udev/files/slugos/mount.sh @@ -10,6 +10,12 @@ PMOUNT="/usr/bin/pmount" UMOUNT="/bin/umount" name="`basename "$DEVNAME"`" +if ( blkid "$DEVNAME" | grep -q 'TYPE="mdraid"' ) +then + logger "udev/mount.sh" "[$DEVNAME] is a member of an array, ignoring" + exit 0 +fi + for line in `cat /etc/udev/mount.blacklist | grep -v ^#` do if ( echo "$DEVNAME" | grep -q "$line" ) diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb index c8840e1a8f..1cd3c41e82 100644 --- a/packages/udev/udev_100.bb +++ b/packages/udev/udev_100.bb @@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r11" +PR = "r12" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ -- cgit v1.2.3 From feb7dfbddb590c8ab69b9c669b02ad6edffd355d Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 16:53:31 +0000 Subject: SlugOS 5.0: /etc/init.d/mountall.sh - assemble mdraid arrays before mounting them. --- packages/initscripts/initscripts-1.0/slugos/mountall.sh | 9 +++++++++ packages/initscripts/initscripts-slugos_1.0.bb | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/initscripts/initscripts-1.0/slugos/mountall.sh b/packages/initscripts/initscripts-1.0/slugos/mountall.sh index 94ea8217fd..3a155d155b 100644 --- a/packages/initscripts/initscripts-1.0/slugos/mountall.sh +++ b/packages/initscripts/initscripts-1.0/slugos/mountall.sh @@ -5,6 +5,15 @@ # . /etc/default/rcS +# If the right stuff exists, attempt to automatically assemble any +# RAID devices that might be configured. +# +if test -x /sbin/mdadm +then + test "$VERBOSE" != no && echo "Assembling RAID devices..." + mdadm --assemble --scan --auto=md +fi + # # Mount local filesystems in /etc/fstab. For some reason, people # might want to mount "proc" several times, and mount -v complains diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index b742ad5071..18176ed4f8 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -16,7 +16,7 @@ RDEPENDS = "" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.14" +PR := "${PR}.15" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -- cgit v1.2.3 From 328e061342655a3e1b3dbccbb0a3c44352c37bec Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 16:56:54 +0000 Subject: SlugOS 5.0 : conffiles - innocuous change to the comments to correct ipkg/opkg. This has the desired side-effect of requiring manual review by the user of sysconf restoration after upgrading to SlugOS 5.0 --- packages/slugos-init/files/conffiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/slugos-init/files/conffiles b/packages/slugos-init/files/conffiles index e1408a3227..668f7467a8 100644 --- a/packages/slugos-init/files/conffiles +++ b/packages/slugos-init/files/conffiles @@ -2,7 +2,7 @@ # Known SlugOS configuration files. These files are preserved on # a flash upgrade. Other configuration files, found from: # -# /usr/lib/ipkg/*.conffiles +# /usr/lib/opkg/*.conffiles # /etc/*.conf # # are preserved too with an operation of 'diff' if they have been -- cgit v1.2.3 From ba59d10ded836a1ae40817bd1f75dd36435c2cc1 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 16:58:07 +0000 Subject: SlugOS 5.0: /etc/default/functions - also make sure that /dev/tty0 exists as one of the minimal device nodes. --- packages/slugos-init/files/functions | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index 5b6b40b091..253526995f 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -191,6 +191,7 @@ checkmount(){ minimaldevnodes(){ [ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1 [ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1 + [ -c "$1/dev/tty0" ] || mknod -m 644 "$1/dev/tty0" c 4 0 || return 1 return 0 } # -- cgit v1.2.3 From e688507ddf5b39b7bb900bae0c6db4d53bf8451d Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 17:00:48 +0000 Subject: SlugOS 5.0: enable mdraid support --- packages/slugos-init/files/boot/disk | 14 +++++++++++++- packages/slugos-init/files/turnup | 23 +++++++++++++++++++++-- packages/slugos-init/slugos-init_5.0.bb | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index 63370ce340..34c002ba0b 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -24,9 +24,21 @@ then # waiting for disk if test "$sleep" -gt 0 then - echo "Waiting $sleep seconds for disk" + echo "boot: waiting $sleep seconds for disk" sleep "$sleep" fi + # Attempt to assemble the RAID if necessary + if (echo $device | grep -q "^/dev/md") + then + if test -n "$MDUUID" + then + echo "boot: assembling RAID array (UUID)" + mdadm -Acpartitions --auto=md --uuid="$MDUUID" $device + else + echo "boot: assembling RAID array (config file)" + mdadm -As --auto=md $device + fi + fi # # fire the boot echo "boot: rootfs: mount $* $device [$UUID]" diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 2bbc9024ef..51b801dfea 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -274,7 +274,13 @@ setup_dev() { # /dev/null # syslog, and maybe other things, only work if fd 1 is valid, therefore # we must create these devices here... - makedevs --root="$1" --devtable="$2" + # (if makedevs is a symlink, it's the busybox version, different syntax) + if [ -h /sbin/makedevs ] + then + makedevs -d "$2" "$1" + else + makedevs --root="$1" --devtable="$2" + fi :>"$1"/dev/.noram return 0 } @@ -290,7 +296,13 @@ setup_bootdev() { } # NOTE: this fails silently with 0 return code(!) when a directory # does not exist yet things are created within it. - makedevs -r "$1" -D "$2" + # (if makedevs is a symlink, it's the busybox version, different syntax) + if [ -h /sbin/makedevs ] + then + makedevs -d "$2" "$1" + else + makedevs -r "$1" -D "$2" + fi } # @@ -432,6 +444,7 @@ boot_rootfs() { sleep="$3" device="$4" uuid= + mduuid= # test this first as the test does not depend on the correctness # of the other arguments @@ -452,6 +465,11 @@ boot_rootfs() { return 1 } uuid="$3" + if (echo "$device" | grep -q '^/dev/md') + then + # FIXME: should use awk to do the below extraction + mduuid=`mdadm --detail --brief "$device" | sed 's/^.*UUID=//'` + fi shift 3;; nfs) shift 2;; flash) ;; @@ -493,6 +511,7 @@ boot_rootfs() { echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " + test -n "$mduuid" && echo -n "MDUUID='$mduuid' " echo -n "exec '/boot/$type' '$device'" for opt in "$@" do diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 9b7c2cd8d0..4babf89d61 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r1.2" +PR = "r2" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 810442253a218c9087717f055c86b1df6ed72393 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Aug 2008 17:25:39 +0000 Subject: bitbake.conf: add entries needed for hg fetcher --- conf/bitbake.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9ce51821b1..ea9b290184 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -215,6 +215,7 @@ CVSDIR = "${CO_DIR}/cvs" SVNDIR = "${CO_DIR}/svn" GITDIR = "${CO_DIR}/git" BZRDIR = "${CO_DIR}/bzr" +HGDIR = "${CO_DIR}/hg" STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}" WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}" @@ -449,6 +450,7 @@ FETCHCMD_svn = "/usr/bin/env svn" FETCHCMD_cvs = "/usr/bin/env cvs" FETCHCMD_wget = "/usr/bin/env wget -t 5" FETCHCMD_bzr = "/usr/bin/env bzr" +FETCHCMD_hg = "/usr/bin/env hg" FETCHCOMMAND = "ERROR, this must be a BitBake bug" FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}" -- cgit v1.2.3 From f60c132ca66cc96dde01e0622af2dd319c2aa52b Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 29 Aug 2008 17:36:45 +0000 Subject: SlugOS 5.0: task-slugos - temporarily add mdadm and raid1 support to base image to facilitate broader testing, add netconsole to base image for next steps, and cleanup comments in general. --- packages/tasks/task-slugos.bb | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 0a0dd65496..e1092b68d9 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r20" +PR = "r21" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" ALLOW_EMPTY = "1" @@ -21,14 +21,10 @@ ALLOW_EMPTY = "1" SLUGOS_STANDARD_RDEPENDS = "" SLUGOS_STANDARD_RRECOMMENDS = "" -# diff, cpio and find are required for turnup and ipkg. +# The full cpio (non-busybox) is required for turnup and sysconfig. SLUGOS_STANDARD_RRECOMMENDS += "\ cpio \ " -## SlugOS 5.0 -- uses busybox diff & find; cpio still needs -p and ability to -## create CRC archives before we can use busybox cpio - MJW -#diffutils \ -#findutils \ # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux @@ -41,12 +37,6 @@ e2fsprogs-badblocks \ e2fsprogs-blkid \ " -# These lines add support for an X/Y/ZModem package called lrzsz -# (this is of use for people with modified NSLU2 hardware which -# supports a serial port.) -## SlugOS 5.0 -- uses busybox rx command - MJW -#SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" - # Filesystem selection. Adding entries here adds the module to the # image. The module must be built as part of nslu2-kernel (i.e. it # must be specified as a module in the defconfig file). The NLS @@ -100,6 +90,15 @@ kernel-module-mii \ kernel-module-ixp4xx-mac \ kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ +kernel-module-netconsole \ +" + +# Add packages and modules required for RAID-1 support +# (temporary, intended only to facilitate testing - MJW) +SLUGOS_STANDARD_RRECOMMENDS += "\ +mdadm \ +kernel-module-md-mod \ +kernel-module-raid1 \ " # Other candidate packages that have been considered and @@ -110,10 +109,10 @@ kernel-module-via-velocity \ # kernel-module-isofs \ # kernel-module-udf \ # kernel-module-loop \ -# kernel-module-netconsole \ +# wireless-tools \ # wpa-supplicant \ # zd1211-firmware kernel-module-zd1211rw \ -# madwifi-ng-modules madwifi-ng-tools wireless-tools \ +# madwifi-ng-modules madwifi-ng-tools \ DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" -- cgit v1.2.3 From 1ce0638fe75c1c2f764c01cb60deb7920d6bfbea Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 29 Aug 2008 17:38:59 +0000 Subject: angstrom source mirror: update script to hangle bzr and hg --- contrib/angstrom/source-mirror.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/angstrom/source-mirror.txt b/contrib/angstrom/source-mirror.txt index 1c480e730d..524134779e 100644 --- a/contrib/angstrom/source-mirror.txt +++ b/contrib/angstrom/source-mirror.txt @@ -3,6 +3,8 @@ rsync ~/OE/downloads/ angstrom@linuxtogo.org:~/website/unstable/sources/ -av \ --exclude "*.md5" \ --exclude "svn" \ + --exclude "hg" \ + --exclude "bzr" \ --exclude "cvs" \ --exclude "git" \ --exclude "umac.ko" \ -- cgit v1.2.3 From 22fc6ff1aa469f6fdc42a39b7811173045cda5c7 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Aug 2008 06:02:17 +0000 Subject: preferred-om-2008-versions.inc: Bumped bluez-hcidump to 1.42 --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 0ebca097cf..3f2c521224 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -95,7 +95,7 @@ PREFERRED_VERSION_bluez-cups-backend ?= "3.33" PREFERRED_VERSION_bluez-dtl1-workaround ?= "1.0" PREFERRED_VERSION_bluez-gnome ?= "0.14" PREFERRED_VERSION_bluez-gstreamer-plugin ?= "3.33" -PREFERRED_VERSION_bluez-hcidump ?= "1.38" +PREFERRED_VERSION_bluez-hcidump ?= "1.42" PREFERRED_VERSION_bluez-libs ?= "3.33" PREFERRED_VERSION_bluez-utils ?= "3.33" PREFERRED_VERSION_bluez-utils-alsa ?= "3.33" -- cgit v1.2.3 From 7bdf78e47b937eec57172b12f12db9e0ca2cb1b8 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Aug 2008 06:20:24 +0000 Subject: bluez: Updated rest of the packages to 3.33 (since 3.28 no longer exists as a recipe). --- packages/bluez/bluez-cups-backend_3.28.bb | 27 --------------------------- packages/bluez/bluez-cups-backend_3.33.bb | 27 +++++++++++++++++++++++++++ packages/bluez/bluez-gstreamer-plugin_3.28.bb | 27 --------------------------- packages/bluez/bluez-gstreamer-plugin_3.33.bb | 27 +++++++++++++++++++++++++++ packages/bluez/bluez-utils-alsa_3.28.bb | 25 ------------------------- packages/bluez/bluez-utils-alsa_3.33.bb | 25 +++++++++++++++++++++++++ 6 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 packages/bluez/bluez-cups-backend_3.28.bb create mode 100644 packages/bluez/bluez-cups-backend_3.33.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.28.bb create mode 100644 packages/bluez/bluez-gstreamer-plugin_3.33.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.28.bb create mode 100644 packages/bluez/bluez-utils-alsa_3.33.bb diff --git a/packages/bluez/bluez-cups-backend_3.28.bb b/packages/bluez/bluez-cups-backend_3.28.bb deleted file mode 100644 index 40e099642a..0000000000 --- a/packages/bluez/bluez-cups-backend_3.28.bb +++ /dev/null @@ -1,27 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-cups-backend_3.33.bb b/packages/bluez/bluez-cups-backend_3.33.bb new file mode 100644 index 0000000000..40e099642a --- /dev/null +++ b/packages/bluez/bluez-cups-backend_3.33.bb @@ -0,0 +1,27 @@ +require bluez-utils3.inc + +PR = "r1" + +DEPENDS += "cups" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/cups/backend/bluetooth" +RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.28.bb b/packages/bluez/bluez-gstreamer-plugin_3.28.bb deleted file mode 100644 index 53b7eb86f2..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.28.bb +++ /dev/null @@ -1,27 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.33.bb b/packages/bluez/bluez-gstreamer-plugin_3.33.bb new file mode 100644 index 0000000000..53b7eb86f2 --- /dev/null +++ b/packages/bluez/bluez-gstreamer-plugin_3.33.bb @@ -0,0 +1,27 @@ +require bluez-utils3.inc + +PR = "r1" + +DEPENDS += "gstreamer gst-plugins-base " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --enable-gstreamer \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-utils-alsa_3.28.bb b/packages/bluez/bluez-utils-alsa_3.28.bb deleted file mode 100644 index a1e3e85818..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.28.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.33.bb b/packages/bluez/bluez-utils-alsa_3.33.bb new file mode 100644 index 0000000000..a1e3e85818 --- /dev/null +++ b/packages/bluez/bluez-utils-alsa_3.33.bb @@ -0,0 +1,25 @@ +require bluez-utils3.inc + +PR = "r1" + +DEPENDS += "alsa-lib" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +FILES_${PN} = "${libdir}/alsa-lib/libasound*" -- cgit v1.2.3 From 90f208ced132a4e8fd84b5624b012e6b1a1500e1 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Aug 2008 07:52:35 +0000 Subject: task-openmoko-feed: Added pidgin --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 32b05effed..989c5fff48 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r37" +PR = "r38" inherit task @@ -96,4 +96,5 @@ RDEPENDS_task-openmoko-feed = "\ zip \ firefox \ tichy \ + pidgin \ " -- cgit v1.2.3 From ee87f7928343e81d8c84591cbcf147a08085b796 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 30 Aug 2008 09:28:09 +0000 Subject: ffmpeg: Revert DEPENDS on coreutils-native. Instead, remove -s (strip) argument to install. --- .../ffmpeg-0.4.9-pre1/install-must-not-strip.patch | 47 ++++++++++++++++++++++ packages/ffmpeg/ffmpeg.inc | 2 +- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 5 +-- packages/gnash/gnash-minimal.inc | 2 +- packages/mplayer/mplayer_0.0+1.0rc2.bb | 2 +- 5 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch new file mode 100644 index 0000000000..6fbeb3eb88 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/install-must-not-strip.patch @@ -0,0 +1,47 @@ +Index: ffmpeg-0.4.9-pre1/libavcodec/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/Makefile 2008-08-30 11:13:34.000000000 +0200 +@@ -267,10 +267,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 ++ install -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0.4.9 + ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so.0 + ln -sf libavcodec.so.0.4.9 $(prefix)/lib/libavcodec.so + ldconfig || true +Index: ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavcodec/libpostproc/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavcodec/libpostproc/Makefile 2008-08-30 11:13:40.000000000 +0200 +@@ -50,7 +50,7 @@ + install: all + ifeq ($(SHARED_PP),yes) + install -d $(prefix)/lib +- install -s -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) ++ install -m 755 $(SPPLIB) $(prefix)/lib/$(SPPLIB).$(SPPVERSION) + ln -sf $(SPPLIB).$(SPPVERSION) $(prefix)/lib/$(SPPLIB) + ldconfig || true + mkdir -p $(prefix)/include/postproc +Index: ffmpeg-0.4.9-pre1/libavformat/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2008-08-30 11:13:14.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-08-30 11:13:46.000000000 +0200 +@@ -103,10 +103,10 @@ + ifeq ($(BUILD_SHARED),yes) + install: all install-headers + ifeq ($(CONFIG_WIN32),yes) +- install -s -m 755 $(SLIB) "$(prefix)" ++ install -m 755 $(SLIB) "$(prefix)" + else + install -d $(prefix)/lib +- install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 ++ install -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0.4.9 + ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so.0 + ln -sf libavformat.so.0.4.9 $(prefix)/lib/libavformat.so + ldconfig || true diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index 6316b4e26e..aab2c62fa9 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "coreutils-native zlib libogg libvorbis faac faad2 liba52 lame" +DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame" RSUGGESTS = "mplayer" inherit autotools pkgconfig diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index f2d5a928aa..5a2856aef5 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,13 +1,12 @@ require ffmpeg.inc -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ - file://libavformat-makefile.patch;patch=1 \ - file://Makefile-lame.patch;patch=1 \ + file://install-must-not-strip.patch;patch=1 \ " EXTRA_OECONF += " \ diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 2f2645a125..9845638663 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -28,7 +28,7 @@ EXTRA_OECONF="--enable-gui=gtk \ --disable-glext \ --disable-Xft \ --disable-expat \ - --disable-mad \ + --enable-mad \ --disable-gstreamer \ --disable-cairo \ --disable-plugin \ diff --git a/packages/mplayer/mplayer_0.0+1.0rc2.bb b/packages/mplayer/mplayer_0.0+1.0rc2.bb index e50fa46eec..d086e9bcc1 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc2.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc2.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig DEPENDS_append_c7x0 = " libw100 " DEPENDS_append_hx4700 = " libw100 " -DEFAULT_PREFERENCE_avr32 = "-1" +DEFAULT_PREFERENCE_avr32 = "1" RDEPENDS = "mplayer-common" LICENSE = "GPL" -- cgit v1.2.3 From 9c0e0b8bb7b55ed7e035320a4ed0cf8bf09bcad1 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sat, 30 Aug 2008 09:44:16 +0000 Subject: ffmpeg: Brought in ifaistos' missing patch for fixed linker arguments for libavformat. Needed for ppc/glibc. --- .../ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch | 13 +++++++++++++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch new file mode 100644 index 0000000000..d78ada9b36 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-avformat-use-LDFLAGS.patch @@ -0,0 +1,13 @@ +Index: ffmpeg-0.4.9-pre1/libavformat/Makefile +=================================================================== +--- ffmpeg-0.4.9-pre1.orig/libavformat/Makefile 2008-08-30 11:35:09.000000000 +0200 ++++ ffmpeg-0.4.9-pre1/libavformat/Makefile 2008-08-30 11:35:34.000000000 +0200 +@@ -94,7 +94,7 @@ + $(CC) $(SHFLAGS) -Wl,--output-def,$(@:.dll=.def) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(VPATH)/../libavcodec/avcodec.dll + -lib /machine:i386 /def:$(@:.dll=.def) + else +- $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) -Wl,-soname -Wl,libavformat.so.0 ++ $(CC) $(SHFLAGS) -o $@ $(OBJS) $(PPOBJS) $(EXTRALIBS) $(LDFLAGS) -Wl,-soname -Wl,libavformat.so.0 + endif + + depend: $(SRCS) diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 5a2856aef5..c415ffa8bf 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,11 +1,12 @@ require ffmpeg.inc -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ + file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \ file://install-must-not-strip.patch;patch=1 \ " -- cgit v1.2.3 From 439d11db568087953260a0453b9c2f7eeea74ab5 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Sat, 30 Aug 2008 10:09:23 +0000 Subject: packages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Add libmp3lame if mp3 support is configured in --- .../ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch | 13 +++++++++++++ packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch diff --git a/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch new file mode 100644 index 0000000000..3c3969de43 --- /dev/null +++ b/packages/ffmpeg/ffmpeg-0.4.9-pre1/Makefile-add-liblame.patch @@ -0,0 +1,13 @@ +--- /orig-Makefile 2008-07-17 00:29:01.000000000 +0300 ++++ /Makefile 2008-07-17 00:29:35.000000000 +0300 +@@ -58,6 +58,10 @@ + EXTRALIBS+=-lfaac + endif + ++ifeq ($(CONFIG_MP3LAME),yes) ++EXTRALIBS+=-lmp3lame ++endif ++ + ifeq ($(BUILD_VHOOK),yes) + VHOOK=videohook + INSTALLVHOOK=install-vhook diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index c415ffa8bf..3e05040854 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,12 +1,13 @@ require ffmpeg.inc -PR = "r7" +PR = "r8" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ file://Makefile-avformat-use-LDFLAGS.patch;patch=1 \ + file://Makefile-add-liblame.patch;patch=1 \ file://install-must-not-strip.patch;patch=1 \ " -- cgit v1.2.3 From 53111d3366837cea191dad7862beb9351e2a763a Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Aug 2008 11:36:04 +0000 Subject: task-openmoko-feed: added epdfview --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 989c5fff48..2b5475bcb8 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r38" +PR = "r39" inherit task @@ -97,4 +97,5 @@ RDEPENDS_task-openmoko-feed = "\ firefox \ tichy \ pidgin \ + epdfview \ " -- cgit v1.2.3 From 3c55eb98ff6b0977c9d8733de49e1e3eaed2a52a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 15:52:24 +0000 Subject: opie-cardapplet: add detection of card insert/remove and fix postinst * Add udev scripts/rules to notify applet of card insertion/removal * Fix path to qcop used in postinst --- packages/opie-cardapplet/opie-cardapplet.inc | 10 +++++++--- packages/opie-cardapplet/opie-cardapplet_cvs.bb | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/packages/opie-cardapplet/opie-cardapplet.inc b/packages/opie-cardapplet/opie-cardapplet.inc index 848bfaa63a..a96f972423 100644 --- a/packages/opie-cardapplet/opie-cardapplet.inc +++ b/packages/opie-cardapplet/opie-cardapplet.inc @@ -13,22 +13,26 @@ inherit opie pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi if [ -n "$D" ]; then false; fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } -# FILES plugins/applets/libcardapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav +# FILES plugins/applets/libcardapplet.so* pics/cardmon/*.png sounds/cardmon/*.wav etc/opie-pcmcia.* do_install() { install -d ${D}${palmtopdir}/pics/cardmon/ install -d ${D}${palmtopdir}/sounds/cardmon/ + install -d ${D}${sysconfdir}/udev/rules.d/ + install -d ${D}${sysconfdir}/udev/scripts/ install -m 0644 ${WORKDIR}/pics/cardmon/*.png ${D}${palmtopdir}/pics/cardmon/ install -m 0644 ${WORKDIR}/sounds/cardmon/*.wav ${D}${palmtopdir}/sounds/cardmon/ + install -m 0644 ${WORKDIR}/etc/opie-pcmcia.rules ${D}${sysconfdir}/udev/rules.d/opie-pcmcia.rules + install -m 0755 ${WORKDIR}/etc/opie-pcmcia.sh ${D}${sysconfdir}/udev/scripts/opie-pcmcia.sh } diff --git a/packages/opie-cardapplet/opie-cardapplet_cvs.bb b/packages/opie-cardapplet/opie-cardapplet_cvs.bb index 0c5c645ad2..e791fe09fd 100644 --- a/packages/opie-cardapplet/opie-cardapplet_cvs.bb +++ b/packages/opie-cardapplet/opie-cardapplet_cvs.bb @@ -2,7 +2,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r2" + SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/applets/cardapplet \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/sounds \ - ${HANDHELDS_CVS};module=opie/apps" + ${HANDHELDS_CVS};module=opie/apps \ + ${HANDHELDS_CVS};module=opie/etc" -- cgit v1.2.3 From 82f7cf8e771bfbfa840a039b0f0f5b432e073f30 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 15:54:59 +0000 Subject: libqpe-opie: fix error in do_patch compilation for cvs version * Add citytime-path-2.patch which applies cleanly against current CVS --- packages/libqpe/libqpe-opie/citytime-path-2.patch | 11 +++++++++++ packages/libqpe/libqpe-opie_cvs.bb | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 packages/libqpe/libqpe-opie/citytime-path-2.patch diff --git a/packages/libqpe/libqpe-opie/citytime-path-2.patch b/packages/libqpe/libqpe-opie/citytime-path-2.patch new file mode 100644 index 0000000000..27cb9634c9 --- /dev/null +++ b/packages/libqpe/libqpe-opie/citytime-path-2.patch @@ -0,0 +1,11 @@ +--- library/tzselect.cpp 12 Jan 2008 10:14:42 -0000 1.13 ++++ library/tzselect.cpp 30 Aug 2008 15:32:13 -0000 +@@ -270,7 +270,7 @@ + void TimeZoneSelector::slotExecute( void ) + { + // execute the world time application... +- if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime")) ++ if (QFile::exists(OPIE_BINDIR "/citytime")) + Global::execute( "citytime" ); + else + QMessageBox::warning(this,tr("citytime executable not found"), diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index 0085003303..bbeac82431 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,12 +1,12 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r3" +PR = "r4" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ - file://citytime-path.patch;patch=1 \ + file://citytime-path-2.patch;patch=1 \ file://argv.patch;patch=1 \ " -- cgit v1.2.3 From a80a1b37fff54fddc648905bdeee6f2af1748c00 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 15:57:56 +0000 Subject: opie-security: install ownerinfo.png in cvs version --- packages/opie-security/opie-security_cvs.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/opie-security/opie-security_cvs.bb b/packages/opie-security/opie-security_cvs.bb index 43d8f431cc..8f8683175f 100644 --- a/packages/opie-security/opie-security_cvs.bb +++ b/packages/opie-security/opie-security_cvs.bb @@ -1,7 +1,19 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/settings/security \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/apps" + +# FILES plugins/application/libsecurity.so* bin/security apps/Settings/Security.desktop pics/security +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + + for icon in Security.png lock.png multiauth.png sync.png users.png ownerinfo.png; + do + install -m 0644 ${WORKDIR}/pics/${APPNAME}/$icon ${D}${palmtopdir}/pics/${APPNAME}/ + done +} + -- cgit v1.2.3 From f2feb35b72dba41bba9c30e4e1ef66c14b653e8d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 17:01:57 +0000 Subject: opie-clockapplet: install alarm icon image --- packages/opie-clockapplet/opie-clockapplet.inc | 6 ++++++ packages/opie-clockapplet/opie-clockapplet_1.2.3.bb | 2 +- packages/opie-clockapplet/opie-clockapplet_cvs.bb | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/opie-clockapplet/opie-clockapplet.inc b/packages/opie-clockapplet/opie-clockapplet.inc index 238819c071..88e46808e3 100644 --- a/packages/opie-clockapplet/opie-clockapplet.inc +++ b/packages/opie-clockapplet/opie-clockapplet.inc @@ -27,3 +27,9 @@ ${bindir}/qcop QPE/TaskBar "reloadApplets()" do_install() { } +# FILES plugins/applets/libclockapplet.so* pics/clockapplet/*.png +do_install() { + install -d ${D}${palmtopdir}/pics/clockapplet/ + install -m 0644 ${WORKDIR}/pics/clockapplet/*.png ${D}${palmtopdir}/pics/clockapplet/ +} + diff --git a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb index cc1a2b5376..2785b7cd29 100644 --- a/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb +++ b/packages/opie-clockapplet/opie-clockapplet_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-clockapplet/opie-clockapplet_cvs.bb b/packages/opie-clockapplet/opie-clockapplet_cvs.bb index 46a6d8c7e7..28ca4dac95 100644 --- a/packages/opie-clockapplet/opie-clockapplet_cvs.bb +++ b/packages/opie-clockapplet/opie-clockapplet_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/clockapplet \ ${HANDHELDS_CVS};module=opie/pics \ -- cgit v1.2.3 From 1627aeca6820879a898393689a647ce05be1ea2d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 17:04:22 +0000 Subject: opie-pics: install symlink icon for file selector --- packages/opie-pics/opie-pics.inc | 2 ++ packages/opie-pics/opie-pics_1.2.3.bb | 2 ++ packages/opie-pics/opie-pics_cvs.bb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/opie-pics/opie-pics.inc b/packages/opie-pics/opie-pics.inc index 1bd67a8077..68dbcb930b 100644 --- a/packages/opie-pics/opie-pics.inc +++ b/packages/opie-pics/opie-pics.inc @@ -13,10 +13,12 @@ do_install() { install -d ${D}${palmtopdir}/pics/addressbook/ install -d ${D}${palmtopdir}/pics/datebook/ install -d ${D}${palmtopdir}/pics/todo/ + install -d ${D}${palmtopdir}/pics/opie/ install -m 0664 pics/*.png ${D}${palmtopdir}/pics/ install -m 0664 pics/addressbook/*.png ${D}${palmtopdir}/pics/addressbook/ install -m 0664 pics/datebook/*.png ${D}${palmtopdir}/pics/datebook/ install -m 0664 pics/todo/*.png ${D}${palmtopdir}/pics/todo/ + install -m 0664 pics/opie/*.png ${D}${palmtopdir}/pics/opie/ if [ "${SHIP_INLINE_PICS}" == "yes" ]; then install -m 0664 ${INLINE_PICS}/*.png ${D}${palmtopdir}/pics/ diff --git a/packages/opie-pics/opie-pics_1.2.3.bb b/packages/opie-pics/opie-pics_1.2.3.bb index 5ca408ea5e..2c199b73fc 100644 --- a/packages/opie-pics/opie-pics_1.2.3.bb +++ b/packages/opie-pics/opie-pics_1.2.3.bb @@ -1,5 +1,7 @@ require ${PN}.inc +PR = "r1" + TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-pics/opie-pics_cvs.bb b/packages/opie-pics/opie-pics_cvs.bb index 78bce2c30a..08aa9ede5c 100644 --- a/packages/opie-pics/opie-pics_cvs.bb +++ b/packages/opie-pics/opie-pics_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/pics-hires" -- cgit v1.2.3 From 17429fbbbb7b1b1279756baec01e72ddf7628afc Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 20:37:45 +0000 Subject: Fix paths to qcop --- packages/opie-networkapplet/opie-networkapplet.inc | 4 ++-- packages/opie-networkapplet/opie-networkapplet_1.2.3.bb | 1 + packages/opie-notesapplet/opie-notesapplet.inc | 4 ++-- packages/opie-notesapplet/opie-notesapplet_1.2.3.bb | 1 + packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc | 4 ++-- packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb | 1 + packages/opie-vmemo/opie-vmemo.inc | 4 ++-- packages/opie-vmemo/opie-vmemo_1.2.3.bb | 1 + packages/opie-wirelessapplet/opie-wirelessapplet.inc | 4 ++-- packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb | 1 + packages/subapplet/subapplet_1.0.8.bb | 6 +++--- packages/tasklistapplet/tasklistapplet_1.0.5.bb | 6 ++++-- 12 files changed, 22 insertions(+), 15 deletions(-) diff --git a/packages/opie-networkapplet/opie-networkapplet.inc b/packages/opie-networkapplet/opie-networkapplet.inc index f67861e069..dcb5c930f1 100644 --- a/packages/opie-networkapplet/opie-networkapplet.inc +++ b/packages/opie-networkapplet/opie-networkapplet.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -22,7 +22,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } # FILES plugins/applets/libnetworkapplet.so* pics/networkapplet diff --git a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb index a965cbd2c0..0ee5f6a00d 100644 --- a/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb +++ b/packages/opie-networkapplet/opie-networkapplet_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/networkapplet \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-notesapplet/opie-notesapplet.inc b/packages/opie-notesapplet/opie-notesapplet.inc index 9c167fd4cd..ca4cae9d65 100644 --- a/packages/opie-notesapplet/opie-notesapplet.inc +++ b/packages/opie-notesapplet/opie-notesapplet.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -22,7 +22,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } # FILES plugins/applets/libnotesapplet.so* diff --git a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb index 4bfd335611..95160df5cd 100644 --- a/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb +++ b/packages/opie-notesapplet/opie-notesapplet_1.2.3.bb @@ -1,4 +1,5 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/notesapplet" diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc index 706fe4d434..cf83b28711 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet.inc @@ -11,13 +11,13 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } diff --git a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb index 56fe35ce52..8fa1eff6e3 100644 --- a/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb +++ b/packages/opie-pyquicklaunchapplet/opie-pyquicklaunchapplet_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pyquicklaunch \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-vmemo/opie-vmemo.inc b/packages/opie-vmemo/opie-vmemo.inc index d055034190..9b45eff34b 100644 --- a/packages/opie-vmemo/opie-vmemo.inc +++ b/packages/opie-vmemo/opie-vmemo.inc @@ -14,14 +14,14 @@ inherit opie pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi if [ -n "$D" ]; then exit 1; fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then exit 1; fi } diff --git a/packages/opie-vmemo/opie-vmemo_1.2.3.bb b/packages/opie-vmemo/opie-vmemo_1.2.3.bb index a7f91b1dee..096a162c0f 100644 --- a/packages/opie-vmemo/opie-vmemo_1.2.3.bb +++ b/packages/opie-vmemo/opie-vmemo_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/vmemo \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet.inc b/packages/opie-wirelessapplet/opie-wirelessapplet.inc index 037afc7044..d96ed43e87 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet.inc +++ b/packages/opie-wirelessapplet/opie-wirelessapplet.inc @@ -14,7 +14,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -23,5 +23,5 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" } diff --git a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb index 1a1bf963fb..39ed06b51b 100644 --- a/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb +++ b/packages/opie-wirelessapplet/opie-wirelessapplet_1.2.3.bb @@ -1,4 +1,5 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/wirelessapplet" diff --git a/packages/subapplet/subapplet_1.0.8.bb b/packages/subapplet/subapplet_1.0.8.bb index 3ef8091435..65b84bcf79 100644 --- a/packages/subapplet/subapplet_1.0.8.bb +++ b/packages/subapplet/subapplet_1.0.8.bb @@ -5,7 +5,7 @@ SECTION = "opie/applets" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/subapplet/" -PR = "r5" +PR = "r6" SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \ file://toolbar-resize-fix.patch;patch=1" @@ -25,7 +25,7 @@ do_install() { pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -34,6 +34,6 @@ fi pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } diff --git a/packages/tasklistapplet/tasklistapplet_1.0.5.bb b/packages/tasklistapplet/tasklistapplet_1.0.5.bb index b72ca63358..cf505370e9 100644 --- a/packages/tasklistapplet/tasklistapplet_1.0.5.bb +++ b/packages/tasklistapplet/tasklistapplet_1.0.5.bb @@ -4,6 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://sourceforge.net/projects/subapplet/" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/tasklist-105.tar.gz" S = "${WORKDIR}/TaskList-1.0.5" @@ -21,7 +23,7 @@ do_install() { pkg_postinst() { #!/bin/sh if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" else exit 0 fi @@ -30,6 +32,6 @@ fi pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } -- cgit v1.2.3 From 7da9943feb92200ece5edf8a353f908e295cb3dd Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 20:42:42 +0000 Subject: Fix path to qcop --- packages/opie-jumpx/opie-jumpx.inc | 4 ++-- packages/opie-jumpx/opie-jumpx_1.2.3.bb | 1 + packages/opie-kjumpx/opie-kjumpx.inc | 4 ++-- packages/opie-kjumpx/opie-kjumpx_1.2.3.bb | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/opie-jumpx/opie-jumpx.inc b/packages/opie-jumpx/opie-jumpx.inc index 8448e9a03c..06f810a73c 100644 --- a/packages/opie-jumpx/opie-jumpx.inc +++ b/packages/opie-jumpx/opie-jumpx.inc @@ -13,7 +13,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" + /usr/bin/qcop QPE/TaskBar "reloadInputMethods()" else exit 0 fi @@ -23,7 +23,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" +/usr/bin/qcop QPE/TaskBar "reloadInputMethods()" } # FILES plugins/inputmethods/libqjumpx.so* pics/jumpx diff --git a/packages/opie-jumpx/opie-jumpx_1.2.3.bb b/packages/opie-jumpx/opie-jumpx_1.2.3.bb index b1be4bf1a7..7e1de3b0ac 100644 --- a/packages/opie-jumpx/opie-jumpx_1.2.3.bb +++ b/packages/opie-jumpx/opie-jumpx_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/jumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-kjumpx/opie-kjumpx.inc b/packages/opie-kjumpx/opie-kjumpx.inc index 631f2353b6..95644a5428 100644 --- a/packages/opie-kjumpx/opie-kjumpx.inc +++ b/packages/opie-kjumpx/opie-kjumpx.inc @@ -14,7 +14,7 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" + /usr/bin/qcop QPE/TaskBar "reloadInputMethods()" else exit 0 fi @@ -24,7 +24,7 @@ fi pkg_postrm() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()" +/usr/bin/qcop QPE/TaskBar "reloadInputMethods()" } # FILES plugins/inputmethods/libqkjumpx.so* pics/kjumpx/* diff --git a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb index 0a13550770..587fa7924a 100644 --- a/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb +++ b/packages/opie-kjumpx/opie-kjumpx_1.2.3.bb @@ -1,5 +1,6 @@ require ${PN}.inc +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/inputmethods/kjumpx \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" -- cgit v1.2.3 From 0f87d84fdebaafab84a55636f4722c4ce31dec40 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 21:15:52 +0000 Subject: opie-mediaplayer1: Add 1.2.3 versions of mediaplayer1 and plugins --- .../opie-mediaplayer1-libmadplugin_1.2.3.bb | 5 +++++ .../opie-mediaplayer1-libmodplugin_1.2.3.bb | 5 +++++ .../opie-mediaplayer1-libtremorplugin_1.2.3.bb | 6 ++++++ .../opie-mediaplayer1-libwavplugin_1.2.3.bb | 5 +++++ packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb | 6 ++++++ packages/opie-mediaplayer1/opie-mediaplayer1.inc | 8 ++++++++ packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb | 9 +-------- packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb | 2 ++ packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb | 4 ++++ 9 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb create mode 100644 packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb create mode 100644 packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb create mode 100644 packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1.inc create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb create mode 100644 packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb diff --git a/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb new file mode 100644 index 0000000000..78f0796834 --- /dev/null +++ b/packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://libmadplugin.pro" diff --git a/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb new file mode 100644 index 0000000000..b40ab35295 --- /dev/null +++ b/packages/opie-mediaplayer1-libmodplugin/opie-mediaplayer1-libmodplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb new file mode 100644 index 0000000000..9b700fb85b --- /dev/null +++ b/packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + file://vorbis.pro " diff --git a/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb new file mode 100644 index 0000000000..b40ab35295 --- /dev/null +++ b/packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_1.2.3.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PR = "r0" + + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer " diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb new file mode 100644 index 0000000000..ca0beacb47 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1-core_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/multimedia/opieplayer \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1.inc new file mode 100644 index 0000000000..f60d7a55d9 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "The classic Opie media player (core+plugins)." +LICENSE = "GPL" +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "all" +RDEPENDS = "opie-mediaplayer1-core" +RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ +opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb index 7739f3bb15..10510e5566 100644 --- a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.2.bb @@ -1,9 +1,2 @@ -DESCRIPTION = "The classic Opie media player (core+plugins)." -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGE_ARCH = "all" -RDEPENDS = "opie-mediaplayer1-core" -RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \ -opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin" +require ${PN}.inc -PR = "r2" diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb new file mode 100644 index 0000000000..10510e5566 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_1.2.3.bb @@ -0,0 +1,2 @@ +require ${PN}.inc + diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb new file mode 100644 index 0000000000..cf67d0c2e8 --- /dev/null +++ b/packages/opie-mediaplayer1/opie-mediaplayer1_cvs.bb @@ -0,0 +1,4 @@ +require ${PN}.inc + +PV = "${OPIE_CVS_PV}" + -- cgit v1.2.3 From e5d10764336cfbda6210a7906d7baf4ca4ad163d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 21:33:31 +0000 Subject: Fix path to qcop --- packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb index a964f1feec..76f81a3d81 100644 --- a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb +++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb @@ -8,6 +8,8 @@ RDEPENDS = "qpealarmclock" RCONFLICTS = "opie-clockapplet" RREPLACES = "opie-clockapplet" +PR = "r1" + APPNAME = "qpealarmclockapplet" APPTYPE = "binary" @@ -23,13 +25,13 @@ pkg_postinst() { #!/bin/sh if [ -n "$D" ]; then exit 1; fi if pidof -s qpe >/dev/null; then - /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + /usr/bin/qcop QPE/TaskBar "reloadApplets()" fi } pkg_postrm() { #!/bin/sh -/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +/usr/bin/qcop QPE/TaskBar "reloadApplets()" if [ -n "$D" ]; then false; fi } -- cgit v1.2.3 From 8f70a312e212d5db3fba07136697e4b850051cfe Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 22:27:54 +0000 Subject: metakit: fix source URL --- packages/portabase/metakit_2.4.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/portabase/metakit_2.4.9.3.bb b/packages/portabase/metakit_2.4.9.3.bb index 51aec57012..52f40c9cc2 100644 --- a/packages/portabase/metakit_2.4.9.3.bb +++ b/packages/portabase/metakit_2.4.9.3.bb @@ -6,7 +6,7 @@ and instant schema evolution." LICENSE = "MetaKit" HOMEPAGE = "http://www.equi4.com/metakit.html" -SRC_URI = "http://www.equi4.com/pub/mk/older/metakit-${PV}.tar.gz \ +SRC_URI = "http://www.equi4.com/pub/mk/metakit-${PV}.tar.gz \ file://metakit-2.4.9.3.patch;patch=1" PR = "r1" -- cgit v1.2.3 From 99614be76e48a6b917e1c3680dc0ad8298da0635 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sat, 30 Aug 2008 22:28:42 +0000 Subject: zshopi: fix source URL --- packages/zshopi/zshopi_0.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/zshopi/zshopi_0.2.bb b/packages/zshopi/zshopi_0.2.bb index 154ea8c313..098ac2b664 100644 --- a/packages/zshopi/zshopi_0.2.bb +++ b/packages/zshopi/zshopi_0.2.bb @@ -10,7 +10,7 @@ APPNAME = "zshopi" APPDESKTOP = "${WORKDIR}" PR = "r1" -SRC_URI = "http://www.lachner-net.de/Frames/Software/zshopi_0.2.tar.bz2 \ +SRC_URI = "http://www.lachner-net.de/old/Frames/Software/zshopi_0.2.tar.bz2 \ file://zshopi.desktop \ file://zshopi.png" -- cgit v1.2.3 From 7295970a757953665c36f0e7f957cd19b9cb743b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 10:47:45 +0000 Subject: pixman 0.11.8: add more arm asm --- packages/xorg-lib/pixman/pixman-arm.patch | 680 ++++++++++++++++++++---------- packages/xorg-lib/pixman_0.11.8.bb | 2 + 2 files changed, 449 insertions(+), 233 deletions(-) diff --git a/packages/xorg-lib/pixman/pixman-arm.patch b/packages/xorg-lib/pixman/pixman-arm.patch index 224b612548..6520a52d68 100644 --- a/packages/xorg-lib/pixman/pixman-arm.patch +++ b/packages/xorg-lib/pixman/pixman-arm.patch @@ -1,76 +1,97 @@ -commit 23a7d5dea599efec1f459bac64cf9edc4bd5ae11 -Author: Ilpo Ruotsalainen -Date: Thu Nov 29 12:29:59 2007 +0000 +commit 44d4231272bdf08fac077cdcaeaac1aec0dd1500 +Author: Jeff Muizelaar +Date: Thu Aug 28 13:02:17 2008 -0400 - Implement ARM optimized version of fill routines. + arm-simd diff --git a/configure.ac b/configure.ac -index 22a91ef..3ac2a40 100644 +index 702bed0..7f24db5 100644 --- a/configure.ac +++ b/configure.ac -@@ -148,6 +148,32 @@ fi - AM_CONDITIONAL(USE_SSE, test $have_sse_intrinsics = yes) +@@ -301,6 +301,44 @@ AC_SUBST(VMX_CFLAGS) - dnl ======================================================== -+ -+dnl Test for architechture specific optimizations for this platform + AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes) + ++dnl Check for ARM + -+AC_MSG_CHECKING(for architechture specific optimizations) ++have_armv5_simd=no ++AC_MSG_CHECKING(whether to use ARM assembler) ++xserver_save_CFLAGS=$CFLAGS ++CFLAGS="$CFLAGS $ARM_CFLAGS" ++AC_COMPILE_IFELSE([ ++int main () { ++ asm("uqadd8 r1, r1, r2"); ++ return 0; ++}], have_armv5_simd=yes) ++CFLAGS=$xserver_save_CFLAGS + -+use_arch_opts=no ++AC_ARG_ENABLE(arm, ++ [AC_HELP_STRING([--disable-arm], ++ [disable ARM fast paths])], ++ [enable_arm=$enableval], [enable_arm=auto]) + -+case "$host_cpu" in -+arm) -+ if test "$GCC" = "yes" ; then -+ use_arch_opts=yes -+ ARCH_OPT_SOURCES='pixman-arch-arm.lo' -+ fi -+ ;; -+esac ++if test $enable_arm = no ; then ++ have_armv5_simd=disabled ++fi + -+AC_MSG_RESULT($use_arch_opts) ++if test $have_armv5_simd = yes ; then ++ AC_DEFINE(USE_ARM, 1, [use ARM compiler intrinsics]) ++else ++ ARM_CFLAGS= ++fi + -+if test $use_arch_opts = yes ; then -+ AC_DEFINE(USE_ARCH_OPTS, 1, [use architechture specific optimizations]) ++AC_MSG_RESULT($have_armv5_simd) ++if test $enable_arm = yes && test $have_armv5_simd = no ; then ++ AC_MSG_ERROR([ARM intrinsics not detected]) +fi + -+AC_SUBST([ARCH_OPT_SOURCES]) -+AM_CONDITIONAL(USE_ARCH_OPTS, test $use_arch_opts = yes) ++AC_SUBST(ARM_CFLAGS) + -+dnl ======================================================== - AC_SUBST(MMX_CFLAGS) - - PKG_CHECK_MODULES(GTK, [gtk+-2.0], [HAVE_GTK=yes], [HAVE_GTK=no]) ++AM_CONDITIONAL(USE_ARM, test $have_armv5_simd = yes) ++ ++ + AC_ARG_ENABLE(gtk, + [AC_HELP_STRING([--enable-gtk], + [enable tests using GTK+ [default=auto]])], diff --git a/pixman/Makefile.am b/pixman/Makefile.am -index 66283a2..dab6363 100644 +index 4f046f1..2cad71a 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am -@@ -20,6 +20,11 @@ libpixman_1_la_SOURCES = \ - libpixmanincludedir = $(includedir)/pixman-1/ - libpixmaninclude_HEADERS = pixman.h +@@ -77,3 +77,16 @@ libpixman_sse_la_LIBADD = $(DEP_LIBS) + libpixman_1_la_LIBADD += libpixman-sse.la + endif -+if USE_ARCH_OPTS -+libpixman_1_la_LIBADD += $(ARCH_OPT_SOURCES) -+libpixman_1_la_DEPENDENCIES = $(ARCH_OPT_SOURCES) ++# arm code ++if USE_ARM ++noinst_LTLIBRARIES += libpixman-arm.la ++libpixman_arm_la_SOURCES = \ ++ pixman-arm.c \ ++ pixman-arm.h \ ++ pixman-combine32.h ++libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS) ++libpixman_arm_la_LIBADD = $(DEP_LIBS) ++libpixman_1_la_LIBADD += libpixman-arm.la +endif + - # mmx code - if USE_MMX - noinst_LTLIBRARIES = libpixman-mmx.la -diff --git a/pixman/pixman-arch-arm.c b/pixman/pixman-arch-arm.c ++ +diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c new file mode 100644 -index 0000000..655092c +index 0000000..9750730 --- /dev/null -+++ b/pixman/pixman-arch-arm.c -@@ -0,0 +1,205 @@ ++++ b/pixman/pixman-arm.c +@@ -0,0 +1,312 @@ +/* -+ * Copyright © 2007 Movial Creative Technologies Inc ++ * Copyright © 2008 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting -+ * documentation. ++ * documentation, and that the name of Mozilla Corporation not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Mozilla Corporation makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND @@ -81,230 +102,423 @@ index 0000000..655092c + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + * -+ * Author: Ilpo Ruotsalainen ++ * Author: Jeff Muizelaar (jeff@infidigm.net) ++ * + */ -+ +#ifdef HAVE_CONFIG_H +#include +#endif + -+#include "pixman.h" -+#include "pixman-private.h" ++#include "pixman-arm.h" ++#include "pixman-combine32.h" + -+static void -+pixman_fill8 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ int byte_stride = stride * sizeof (uint32_t); -+ uint8_t *dst = (uint8_t *) bits; -+ uint8_t v = xor & 0xff; -+ -+ xor = v | (v << 8); -+ xor |= xor << 16; ++ uint8_t *dstLine, *dst; ++ uint8_t *srcLine, *src; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint8_t s, d; ++ uint16_t t; + -+ dst = dst + y * byte_stride + x; ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); ++ fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); + + while (height--) + { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #8\n" -+ " bcc 2f\n" -+ /* Output single pixels until aligned to word boundary */ -+ "1: tst %1, #3\n" -+ " strneb %4, [%1], #1\n" -+ " subne %0, %0, #1\n" -+ " bne 1b\n" -+ /* Output up to 16 pixels per iteration */ -+ "1: subs %0, %0, #8\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #8\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Finish up any remaining pixels */ -+ " and %0, %0, #7\n" -+ "2: subs %0, %0, #1\n" -+ " strcsb %4, [%1], #1\n" -+ " subcss %0, %0, #1\n" -+ " strcsb %4, [%1], #1\n" -+ " bcs 2b\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (dst), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ dst += byte_stride; -+ } -+} ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; + -+static void -+pixman_fill16 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) -+{ -+ int short_stride = (stride * sizeof (uint32_t)) / sizeof (uint16_t); -+ uint16_t *dst = (uint16_t *)bits; -+ uint16_t v = xor & 0xffff; ++ while (w && (unsigned long)dst & 3) ++ { ++ s = *src; ++ d = *dst; ++ t = d + s; ++ /* s = t | (0 - (t >> 8)); */ ++ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); ++ *dst = s; + -+ xor = v | v << 16; ++ dst++; ++ src++; ++ w--; ++ } + -+ dst = dst + y * short_stride + x; ++ while (w >= 4) ++ { ++ asm("uqadd8 %0, %1, %2" : "=r"(*(uint32_t*)dst) : "r"(*(uint32_t*)src), "r"(*(uint32_t*)dst)); ++ dst += 4; ++ src += 4; ++ w -= 4; ++ } + -+ while (height--) -+ { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #4\n" -+ " bcc 2f\n" -+ /* Output single pixels until aligned to word boundary */ -+ "1: tst %1, #2\n" -+ " strneh %4, [%1], #2\n" -+ " subne %0, %0, #1\n" -+ " bne 1b\n" -+ /* Output up to 8 pixels per iteration */ -+ "1: subs %0, %0, #4\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #4\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Finish up any remaining pixels */ -+ " and %0, %0, #3\n" -+ "2: subs %0, %0, #1\n" -+ " strcsh %4, [%1], #2\n" -+ " bcs 2b\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (dst), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ dst += short_stride; ++ while (w) ++ { ++ s = *src; ++ d = *dst; ++ t = d + s; ++ /* s = t | (0 - (t >> 8)); */ ++ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); ++ *dst = s; ++ ++ dst++; ++ src++; ++ w--; ++ } + } ++ +} + -+static void -+pixman_fill32 (uint32_t *bits, -+ int stride, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrc_8888x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ bits = bits + y * stride + x; -+ ++ uint32_t *dstLine, *dst; ++ uint32_t *srcLine, *src; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint32_t component_mask = 0xff00ff; ++ uint32_t component_half = 0x800080; ++ ++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ + while (height--) + { -+ uint32_t dummy1, dummy2; -+ -+ asm volatile( -+ /* Check if the fill width is very small */ -+ " cmp %0, #2\n" -+ " bcc 2f\n" -+ /* Output up to 4 pixels per iteration */ -+ "1: subs %0, %0, #2\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " subcss %0, %0, #2\n" -+ " strcs %4, [%1], #4\n" -+ " strcs %4, [%1], #4\n" -+ " bcs 1b\n" -+ /* Output last pixel if necessary */ -+ "2: tst %0, #1\n" -+ " strne %4, [%1], #4\n" -+ : "=r" (dummy1), "=r" (dummy2) -+ : "0" (width), "1" (bits), "r" (xor) -+ : "cc", "memory" -+ ); -+ -+ bits += stride; ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++//#define inner_branch ++ asm volatile ( ++ "cmp %[w], #0\n\t" ++ "beq 2f\n\t" ++ "1:\n\t" ++ /* load dest */ ++ "ldr r5, [%[src]], #4\n\t" ++#ifdef inner_branch ++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff. ++ * The 0x0 case also allows us to avoid doing an unecessary data ++ * write which is more valuable so we only check for that */ ++ "cmp r5, #0x1000000\n\t" ++ "blt 3f\n\t" ++ ++ /* = 255 - alpha */ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++ ++ "ldr r4, [%[dest]] \n\t" ++ ++#else ++ "ldr r4, [%[dest]] \n\t" ++ ++ /* = 255 - alpha */ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++#endif ++ "and r6, %[component_mask], r4\n\t" ++ "and r7, %[component_mask], r4, lsr #8\n\t" ++ ++ /* multiply by 257 and divide by 65536 */ ++ "mla r6, r6, r8, %[component_half]\n\t" ++ "mla r7, r7, r8, %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r6, r6, r7, lsl #8\n\t" ++ ++ "uqadd8 r5, r6, r5\n\t" ++ ++#ifdef inner_branch ++ "3:\n\t" ++ ++#endif ++ "str r5, [%[dest]], #4\n\t" ++ /* increment counter and jmp to top */ ++ "subs %[w], %[w], #1\n\t" ++ "bne 1b\n\t" ++ "2:\n\t" ++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) ++ : [component_half] "r" (component_half), [component_mask] "r" (component_mask) ++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" ++ ); + } +} + -+pixman_bool_t -+pixman_fill (uint32_t *bits, -+ int stride, -+ int bpp, -+ int x, -+ int y, -+ int width, -+ int height, -+ uint32_t xor) ++void ++fbCompositeSrc_8888x8x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height) +{ -+ switch (bpp) ++ uint32_t *dstLine, *dst; ++ uint32_t *srcLine, *src; ++ uint32_t mask; ++ int dstStride, srcStride; ++ uint16_t w; ++ uint32_t component_mask = 0xff00ff; ++ uint32_t component_half = 0x800080; ++ ++ fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); ++ fbComposeGetStart (pSrc, xSrc, ySrc, uint32_t, srcStride, srcLine, 1); ++ ++ fbComposeGetSolid (pMask, mask, pDst->bits.format); ++ mask = (mask) >> 24; ++ ++ while (height--) + { -+ case 8: -+ pixman_fill8 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ case 16: -+ pixman_fill16 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ case 32: -+ pixman_fill32 (bits, stride, x, y, width, height, xor); -+ break; -+ -+ default: -+ return FALSE; -+ break; ++ dst = dstLine; ++ dstLine += dstStride; ++ src = srcLine; ++ srcLine += srcStride; ++ w = width; ++ ++//#define inner_branch ++ asm volatile ( ++ "cmp %[w], #0\n\t" ++ "beq 2f\n\t" ++ "1:\n\t" ++ /* load dest */ ++ "ldr r5, [%[src]], #4\n\t" ++#ifdef inner_branch ++ /* We can avoid doing the multiplication in two cases: 0x0 or 0xff. ++ * The 0x0 case also allows us to avoid doing an unecessary data ++ * write which is more valuable so we only check for that */ ++ "cmp r5, #0x1000000\n\t" ++ "blt 3f\n\t" ++ ++#endif ++ "ldr r4, [%[dest]] \n\t" ++ ++ "and r6, %[component_mask], r5\n\t" ++ "and r7, %[component_mask], r5, lsr #8\n\t" ++ ++ /* multiply by alpha (r8) then by 257 and divide by 65536 */ ++ "mla r6, r6, %[mask_alpha], %[component_half]\n\t" ++ "mla r7, r7, %[mask_alpha], %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r5, r6, r7, lsl #8\n\t" ++ ++ "and r6, %[component_mask], r4\n\t" ++ "and r7, %[component_mask], r4, lsr #8\n\t" ++ ++ "mvn r8, r5\n\t" ++ "mov r8, r8, lsr #24\n\t" ++ ++ /* multiply by alpha (r8) then by 257 and divide by 65536 */ ++ "mla r6, r6, r8, %[component_half]\n\t" ++ "mla r7, r7, r8, %[component_half]\n\t" ++ ++ "and r8, %[component_mask], r6, lsr #8\n\t" ++ "and r9, %[component_mask], r7, lsr #8\n\t" ++ ++ "add r6, r6, r8\n\t" ++ "add r7, r7, r9\n\t" ++ ++ "and r6, %[component_mask], r6, lsr #8\n\t" ++ "and r7, %[component_mask], r7, lsr #8\n\t" ++ ++ /* recombine */ ++ "orr r6, r6, r7, lsl #8\n\t" ++ ++ "uqadd8 r5, r6, r5\n\t" ++ ++#ifdef inner_branch ++ "3:\n\t" ++ ++#endif ++ "str r5, [%[dest]], #4\n\t" ++ /* increment counter and jmp to top */ ++ "subs %[w], %[w], #1\n\t" ++ "bne 1b\n\t" ++ "2:\n\t" ++ : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) ++ : [component_half] "r" (component_half), [component_mask] "r" (component_mask), [mask_alpha] "r" (mask) ++ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" ++ ); + } -+ -+ return TRUE; +} -diff --git a/pixman/pixman-arch.h b/pixman/pixman-arch.h ++ ++ +diff --git a/pixman/pixman-arm.h b/pixman/pixman-arm.h new file mode 100644 -index 0000000..1eee9d3 +index 0000000..06a3121 --- /dev/null -+++ b/pixman/pixman-arch.h -@@ -0,0 +1,7 @@ -+#ifdef USE_ARCH_OPTS ++++ b/pixman/pixman-arm.h +@@ -0,0 +1,80 @@ ++/* ++ * Copyright © 2008 Mozilla Corporation ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the name of Mozilla Corporation not be used in ++ * advertising or publicity pertaining to distribution of the software without ++ * specific, written prior permission. Mozilla Corporation makes no ++ * representations about the suitability of this software for any purpose. It ++ * is provided "as is" without express or implied warranty. ++ * ++ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS ++ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND ++ * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN ++ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ * ++ * Author: Jeff Muizelaar (jeff@infidigm.net) ++ * ++ */ + -+#ifdef __arm__ -+#define USE_ARCH_FILL -+#endif ++#include "pixman-private.h" ++ ++#ifdef USE_ARM ++ ++static inline pixman_bool_t pixman_have_arm(void) { return TRUE; } + ++#else ++#define pixman_have_arm() FALSE +#endif ---- /tmp/pixman-utils.c 2008-08-14 12:38:44.000000000 +0200 -+++ pixman-0.11.8/pixman/pixman-utils.c 2008-08-14 12:40:03.503198000 +0200 -@@ -28,6 +28,7 @@ - #include - - #include "pixman-private.h" -+#include "pixman-arch.h" ++ ++#ifdef USE_ARM ++ ++void ++fbCompositeSrcAdd_8000x8000arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++void ++fbCompositeSrc_8888x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++ ++void ++fbCompositeSrc_8888x8x8888arm (pixman_op_t op, ++ pixman_image_t * pSrc, ++ pixman_image_t * pMask, ++ pixman_image_t * pDst, ++ int16_t xSrc, ++ int16_t ySrc, ++ int16_t xMask, ++ int16_t yMask, ++ int16_t xDst, ++ int16_t yDst, ++ uint16_t width, ++ uint16_t height); ++ ++#endif /* USE_ARM */ +diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c +index b918219..05abc82 100644 +--- a/pixman/pixman-pict.c ++++ b/pixman/pixman-pict.c +@@ -34,6 +34,7 @@ #include "pixman-mmx.h" + #include "pixman-vmx.h" + #include "pixman-sse.h" ++#include "pixman-arm.h" + #include "pixman-combine32.h" - PIXMAN_EXPORT pixman_bool_t -@@ -84,6 +85,7 @@ - return FALSE; - } + #ifdef __GNUC__ +@@ -1479,6 +1480,18 @@ static const FastPathInfo vmx_fast_paths[] = + }; + #endif -+#ifndef USE_ARCH_FILL - static void - pixman_fill8 (uint32_t *bits, - int stride, -@@ -197,7 +199,7 @@ ++#ifdef USE_ARM ++static const FastPathInfo arm_fast_paths[] = ++{ ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_null, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8888arm, 0 }, ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_a8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK }, ++ { PIXMAN_OP_OVER, PIXMAN_a8r8g8b8, PIXMAN_a8, PIXMAN_x8r8g8b8, fbCompositeSrc_8888x8x8888arm, NEED_SOLID_MASK }, ++ ++ { PIXMAN_OP_ADD, PIXMAN_a8, PIXMAN_null, PIXMAN_a8, fbCompositeSrcAdd_8000x8000arm, 0 }, ++ ++ { PIXMAN_OP_NONE }, ++}; ++#endif - return TRUE; - } -- + static const FastPathInfo c_fast_paths[] = + { +@@ -1829,6 +1842,12 @@ pixman_image_composite (pixman_op_t op, + if (!info && pixman_have_vmx()) + info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf); + #endif ++#ifdef USE_ARM ++ ++ if (!info && pixman_have_arm()) ++ info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf); +#endif ++ + if (!info) + info = get_fast_path (c_fast_paths, op, pSrc, pMask, pDst, pixbuf); - /* - * Compute the smallest value no less than y which is on a diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index a6cc53dabb..6a4ce74d8f 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,6 +3,8 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" +PR = "r2" + SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ " -- cgit v1.2.3 From f3a167168cc13a0faf3135081628b254bcb3da3f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 10:49:05 +0000 Subject: xserver-xorg: bump PR for pixman change --- packages/xorg-xserver/xserver-xorg_1.4.2.bb | 2 +- packages/xorg-xserver/xserver-xorg_1.4.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 0b0f847dff..0a61cb2c7e 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r2" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 0a61cb2c7e..c9f6e3d29b 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r3" +PR = "r4" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ -- cgit v1.2.3 From f18c10418286d03fc570b6006af05bb60f7f01c1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 10:50:04 +0000 Subject: angstrom 2008: prefer pixman 0.11.8 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index e52a8ddb68..9e500fc7c1 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -13,7 +13,7 @@ PREFERRED_VERSION_libtool-native = "2.2.4" PREFERRED_VERSION_libtool-cross = "2.2.4" PREFERRED_VERSION_libtool-sdk = "2.2.4" PREFERRED_VERSION_pango = "1.18.3" -PREFERRED_VERSION_pixman = "0.10.0" +PREFERRED_VERSION_pixman = "0.11.8" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" -- cgit v1.2.3 From 671998fc75f8f38dd7fb3be867e7206085771f4e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 10:51:18 +0000 Subject: cairo: bump PR for pixman change --- packages/cairo/cairo_1.6.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb index 53a71f71df..9cac359636 100644 --- a/packages/cairo/cairo_1.6.4.bb +++ b/packages/cairo/cairo_1.6.4.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch;patch=1 " -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 052400b90c12c17e5ec74a04bc7dea43472000b7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 11:17:17 +0000 Subject: sugar-base: add librsvg-gtk to RDEPENDS to get svg icons working --- packages/sugar/sugar-base_0.82.0.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index d7379381b4..e4875ead59 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r5" +PR = "r6" DEPENDS = "python-pygtk sugar-toolkit" -RDEPENDS = "hippo-canvas \ +RDEPENDS = "librsvg-gtk \ + hippo-canvas \ python-datetime \ python-netclient \ python-pygtk \ -- cgit v1.2.3 From a8e104a660dc214dfdbda1fed25eaa097d661db2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 11:34:53 +0000 Subject: ohm: sync with poky --- packages/hal/ohm/.mtn2git_empty | 0 packages/hal/ohm/fix_configure.patch | 39 ++++++++++++++++++++++++++++++++++++ packages/hal/ohm_git.bb | 31 +++++++++++++--------------- 3 files changed, 53 insertions(+), 17 deletions(-) create mode 100644 packages/hal/ohm/.mtn2git_empty create mode 100644 packages/hal/ohm/fix_configure.patch diff --git a/packages/hal/ohm/.mtn2git_empty b/packages/hal/ohm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/hal/ohm/fix_configure.patch b/packages/hal/ohm/fix_configure.patch new file mode 100644 index 0000000000..e4b774e785 --- /dev/null +++ b/packages/hal/ohm/fix_configure.patch @@ -0,0 +1,39 @@ +Index: git/configure.in +=================================================================== +--- git.orig/configure.in 2007-12-19 13:43:52.000000000 +0000 ++++ git/configure.in 2008-03-06 23:59:57.000000000 +0000 +@@ -201,9 +201,6 @@ + # Like AC_CHECK_HEADER, but it uses the already-computed -I directories. + AC_DEFUN(AC_CHECK_X_HEADER, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_CHECK_HEADER([$1],[$2],[$3],[$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -211,9 +208,6 @@ + # Like AC_TRY_COMPILE, but it uses the already-computed -I directories. + AC_DEFUN(AC_TRY_X_COMPILE, [ + ac_save_CPPFLAGS="$CPPFLAGS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + CPPFLAGS="$ac_save_CPPFLAGS"]) +@@ -224,14 +218,8 @@ + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + # ac_save_LIBS="$LIBS" +- if test \! -z "$includedir" ; then +- CPPFLAGS="$CPPFLAGS -I$includedir" +- fi + # note: $X_CFLAGS includes $x_includes + CPPFLAGS="$CPPFLAGS $X_CFLAGS" +- if test \! -z "$libdir" ; then +- LDFLAGS="$LDFLAGS -L$libdir" +- fi + # note: $X_LIBS includes $x_libraries + LDFLAGS="$LDFLAGS $ALL_X_LIBS" + AC_CHECK_LIB([$1], [$2], [$3], [$4], [$5]) diff --git a/packages/hal/ohm_git.bb b/packages/hal/ohm_git.bb index 11fbd1c929..a747c2ff1c 100644 --- a/packages/hal/ohm_git.bb +++ b/packages/hal/ohm_git.bb @@ -4,44 +4,41 @@ LICENSE = "LGPL" DEPENDS = "gtk+ dbus-glib intltool-native hal" RDEPENDS_${PN} += "udev hal-info" -SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git" +SRC_URI = "git://anongit.freedesktop.org/git/ohm/;protocol=git \ + file://fix_configure.patch;patch=1" -PV = "0.0+git${SRCDATE}" -PR = "r2" +SRCREV = "edfe25d49d67884bf004de7ae0724c162bb5e65e" +PV = "0.1.2+${PR}+git${SRCREV}" S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF = "--with-distro=debian --without-xauth" +EXTRA_OECONF = "--with-distro=debian \ + --without-xauth \ + --disable-gtk-doc \ + --disable-docbook-docs" do_configure_prepend() { touch gtk-doc.make } -do_configure_append() { - rm config.log -} - OE_LT_RPATH_ALLOW=":${libdir}/libohm:" OE_LT_RPATH_ALLOW[export]="1" PACKAGES =+ "libohm ohm-plugin-x11" -FILES_${PN}-dev += "${libdir}/ohm/*.la \ - ${libdir}/ohm/*.a " +FILES_${PN}-dev += "${libdir}/ohm/*.a" FILES_${PN} = "${sysconfdir} \ ${bindir}/* \ - ${sbindir}/* \ - ${libdir}/ohm/*.so \ - " + ${sbindir}/* \ + ${libdir}/ohm/*.so \ + " FILES_libohm = "${libdir}/libohm.so.*" FILES_ohm-plugin-x11 = "${libdir}/ohm/libohm_x*.so \ ${libdir}/ohm/libohm_idle.so \ ${sysconfdir}/ohm/plugins.d/x* \ - ${sysconfdir}/ohm/plugins.d/idle* \ - " - - + ${sysconfdir}/ohm/plugins.d/idle* \ + " -- cgit v1.2.3 From c8532126456803a16b1cfcfc50df52186a403dee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 11:38:06 +0000 Subject: angstrom 2008: prefer xorg 1.4.2 --- conf/distro/include/angstrom-2008-preferred-versions.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 9e500fc7c1..ebdca4a416 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -18,5 +18,6 @@ PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2" -PREFERRED_VERSION_udev = "118" +PREFERRED_VERSION_udev = "124" PREFERRED_VERSION_xserver-kdrive = "1.4.0.90" +PREFERRED_VERSION_xserver-xorg = "1.4.2" -- cgit v1.2.3 From 2543d12b22c2be249ffb27356083fa9faca245aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 11:42:53 +0000 Subject: clutter: sync with poky --- packages/clutter/aaina.inc | 12 +++++ packages/clutter/aaina_svn.bb | 7 +++ packages/clutter/clutter-box2d.inc | 19 ++++++++ packages/clutter/clutter-box2d_svn.bb | 10 +++++ packages/clutter/clutter-cairo.inc | 15 +++++++ packages/clutter/clutter-cairo/.mtn2git_empty | 0 .../clutter/clutter-cairo/enable_examples.patch | 28 ++++++++++++ packages/clutter/clutter-cairo_svn.bb | 10 +++++ packages/clutter/clutter-gst.inc | 19 ++++++++ packages/clutter/clutter-gst/.mtn2git_empty | 0 packages/clutter/clutter-gst/autofoo-0.4.patch | 15 +++++++ packages/clutter/clutter-gst/autofoo.patch | 25 +++++++++++ packages/clutter/clutter-gst_0.4svn.bb | 9 ++++ packages/clutter/clutter-gst_svn.bb | 8 ++++ packages/clutter/clutter.inc | 40 ++++++++++++++--- packages/clutter/clutter/.mtn2git_empty | 0 packages/clutter/clutter/enable-tests-r2990.patch | 50 +++++++++++++++++++++ packages/clutter/clutter/enable_tests-0.4.patch | 52 ++++++++++++++++++++++ packages/clutter/clutter/enable_tests-0.6.patch | 40 +++++++++++++++++ packages/clutter/clutter/enable_tests.patch | 48 ++++++++++++++++++++ packages/clutter/clutter_0.4svn.bb | 13 ++++++ packages/clutter/clutter_0.6svn.bb | 8 ++++ packages/clutter/clutter_svn.bb | 12 +++++ packages/clutter/moblin-proto/.mtn2git_empty | 0 packages/clutter/moblin-proto/fix.patch | 22 +++++++++ packages/clutter/moblin-proto/paths.patch | 15 +++++++ packages/clutter/moblin-proto_git.bb | 18 ++++++++ packages/clutter/table.inc | 17 +++++++ packages/clutter/table/.mtn2git_empty | 0 packages/clutter/table/fixes.patch | 14 ++++++ packages/clutter/table_svn.bb | 10 +++++ packages/clutter/tidy.inc | 24 ++++++++++ packages/clutter/tidy/.mtn2git_empty | 0 packages/clutter/tidy/autofoo.patch | 11 +++++ packages/clutter/tidy/tidy-enable-tests.patch | 20 +++++++++ packages/clutter/tidy_svn.bb | 10 +++++ 36 files changed, 594 insertions(+), 7 deletions(-) create mode 100644 packages/clutter/aaina.inc create mode 100644 packages/clutter/aaina_svn.bb create mode 100644 packages/clutter/clutter-box2d.inc create mode 100644 packages/clutter/clutter-box2d_svn.bb create mode 100644 packages/clutter/clutter-cairo.inc create mode 100644 packages/clutter/clutter-cairo/.mtn2git_empty create mode 100644 packages/clutter/clutter-cairo/enable_examples.patch create mode 100644 packages/clutter/clutter-cairo_svn.bb create mode 100644 packages/clutter/clutter-gst.inc create mode 100644 packages/clutter/clutter-gst/.mtn2git_empty create mode 100644 packages/clutter/clutter-gst/autofoo-0.4.patch create mode 100644 packages/clutter/clutter-gst/autofoo.patch create mode 100644 packages/clutter/clutter-gst_0.4svn.bb create mode 100644 packages/clutter/clutter-gst_svn.bb create mode 100644 packages/clutter/clutter/.mtn2git_empty create mode 100644 packages/clutter/clutter/enable-tests-r2990.patch create mode 100644 packages/clutter/clutter/enable_tests-0.4.patch create mode 100644 packages/clutter/clutter/enable_tests-0.6.patch create mode 100644 packages/clutter/clutter/enable_tests.patch create mode 100644 packages/clutter/clutter_0.4svn.bb create mode 100644 packages/clutter/clutter_0.6svn.bb create mode 100644 packages/clutter/clutter_svn.bb create mode 100644 packages/clutter/moblin-proto/.mtn2git_empty create mode 100644 packages/clutter/moblin-proto/fix.patch create mode 100644 packages/clutter/moblin-proto/paths.patch create mode 100644 packages/clutter/moblin-proto_git.bb create mode 100644 packages/clutter/table.inc create mode 100644 packages/clutter/table/.mtn2git_empty create mode 100644 packages/clutter/table/fixes.patch create mode 100644 packages/clutter/table_svn.bb create mode 100644 packages/clutter/tidy.inc create mode 100644 packages/clutter/tidy/.mtn2git_empty create mode 100644 packages/clutter/tidy/autofoo.patch create mode 100644 packages/clutter/tidy/tidy-enable-tests.patch create mode 100644 packages/clutter/tidy_svn.bb diff --git a/packages/clutter/aaina.inc b/packages/clutter/aaina.inc new file mode 100644 index 0000000000..fbef34f563 --- /dev/null +++ b/packages/clutter/aaina.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Aaina Clutter Demo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPL" + +DEPENDS = "clutter libxml2 gtk+ neon" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb new file mode 100644 index 0000000000..52a2b3ae0e --- /dev/null +++ b/packages/clutter/aaina_svn.bb @@ -0,0 +1,7 @@ +require aaina.inc + +PV = "0.3.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http" + +S = "${WORKDIR}/aaina" diff --git a/packages/clutter/clutter-box2d.inc b/packages/clutter/clutter-box2d.inc new file mode 100644 index 0000000000..8189d12bbb --- /dev/null +++ b/packages/clutter/clutter-box2d.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter Box2D" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "GPLv2" + +DEPENDS = "clutter" + +# The main clutter lib is machine specific so we need to be too +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig gtk-doc + +do_stage () { + autotools_stage_all +} + +do_install_append () { + install -d ${D}${bindir} + install ${S}/examples/.libs/blockbox ${D}${bindir} +} diff --git a/packages/clutter/clutter-box2d_svn.bb b/packages/clutter/clutter-box2d_svn.bb new file mode 100644 index 0000000000..f241622a50 --- /dev/null +++ b/packages/clutter/clutter-box2d_svn.bb @@ -0,0 +1,10 @@ +require clutter-box2d.inc + +PV = "0.0+svnr${SRCREV}" +PR = "r3" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-cairo.inc b/packages/clutter/clutter-cairo.inc new file mode 100644 index 0000000000..1095a7e8ef --- /dev/null +++ b/packages/clutter/clutter-cairo.inc @@ -0,0 +1,15 @@ +DESCRIPTION = "Clutter Cairo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter cairo" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-cairo/.mtn2git_empty b/packages/clutter/clutter-cairo/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/clutter-cairo/enable_examples.patch b/packages/clutter/clutter-cairo/enable_examples.patch new file mode 100644 index 0000000000..c5ed63ff12 --- /dev/null +++ b/packages/clutter/clutter-cairo/enable_examples.patch @@ -0,0 +1,28 @@ +--- + examples/Makefile.am | 2 +- + examples/flowers.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-cairo/examples/Makefile.am +=================================================================== +--- clutter-cairo.orig/examples/Makefile.am 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/Makefile.am 2008-08-11 16:30:24.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = clock flowers bubbles ++bin_PROGRAMS = clock flowers bubbles + + INCLUDES = -I$(top_srcdir)/ @GCC_FLAGS@ @DEPS_CFLAGS@ + AM_LDFLAGS = @DEPS_LIBS@ $(top_builddir)/libclutter-cairo-@CLUTTER_CAIRO_MAJORMINOR@.la +Index: clutter-cairo/examples/flowers.c +=================================================================== +--- clutter-cairo.orig/examples/flowers.c 2008-08-11 16:30:04.000000000 +0100 ++++ clutter-cairo/examples/flowers.c 2008-08-11 16:30:10.000000000 +0100 +@@ -11,7 +11,7 @@ + + #define PETAL_MIN 20 + #define PETAL_VAR 40 +-#define N_FLOWERS 40 /* reduce if you have a small card */ ++#define N_FLOWERS 8 /* reduce if you have a small card */ + + typedef struct Flower + { diff --git a/packages/clutter/clutter-cairo_svn.bb b/packages/clutter/clutter-cairo_svn.bb new file mode 100644 index 0000000000..1084c1cc16 --- /dev/null +++ b/packages/clutter/clutter-cairo_svn.bb @@ -0,0 +1,10 @@ +require clutter-cairo.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://enable_examples.patch;patch=1" + +S = "${WORKDIR}/${PN}" + + diff --git a/packages/clutter/clutter-gst.inc b/packages/clutter/clutter-gst.inc new file mode 100644 index 0000000000..caaa7559b8 --- /dev/null +++ b/packages/clutter/clutter-gst.inc @@ -0,0 +1,19 @@ +DESCRIPTION = "Clutter GStreamer" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter gstreamer gst-plugins-base" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio" + +inherit autotools pkgconfig + +do_configure_prepend() { + touch ${S}/gtk-doc.make +} + +do_stage () { + autotools_stage_all +} + diff --git a/packages/clutter/clutter-gst/.mtn2git_empty b/packages/clutter/clutter-gst/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/clutter-gst/autofoo-0.4.patch b/packages/clutter/clutter-gst/autofoo-0.4.patch new file mode 100644 index 0000000000..54df63d297 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo-0.4.patch @@ -0,0 +1,15 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + diff --git a/packages/clutter/clutter-gst/autofoo.patch b/packages/clutter/clutter-gst/autofoo.patch new file mode 100644 index 0000000000..569b0d8be9 --- /dev/null +++ b/packages/clutter/clutter-gst/autofoo.patch @@ -0,0 +1,25 @@ +--- + doc/reference/Makefile.am | 2 +- + examples/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: clutter-gst/examples/Makefile.am +=================================================================== +--- clutter-gst.orig/examples/Makefile.am 2007-11-06 12:31:36.000000000 +0000 ++++ clutter-gst/examples/Makefile.am 2007-11-06 18:53:59.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = video-player video-sink audio ++bin_PROGRAMS = video-player video-sink audio + + INCLUDES = -I$(top_srcdir)/ + +Index: clutter-gst/doc/reference/Makefile.am +=================================================================== +--- clutter-gst.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 ++++ clutter-gst/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 +@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in diff --git a/packages/clutter/clutter-gst_0.4svn.bb b/packages/clutter/clutter-gst_0.4svn.bb new file mode 100644 index 0000000000..1af797888c --- /dev/null +++ b/packages/clutter/clutter-gst_0.4svn.bb @@ -0,0 +1,9 @@ +require clutter-gst.inc + +PV = "0.4.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ + file://autofoo-0.4.patch;patch=1" + + +S = "${WORKDIR}/clutter-gst-0-4" diff --git a/packages/clutter/clutter-gst_svn.bb b/packages/clutter/clutter-gst_svn.bb new file mode 100644 index 0000000000..8ef87236f7 --- /dev/null +++ b/packages/clutter/clutter-gst_svn.bb @@ -0,0 +1,8 @@ +require clutter-gst.inc + +PV = "0.8.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/${PN}" diff --git a/packages/clutter/clutter.inc b/packages/clutter/clutter.inc index b89070f3ea..63773ad530 100644 --- a/packages/clutter/clutter.inc +++ b/packages/clutter/clutter.inc @@ -2,20 +2,47 @@ DESCRIPTION = "Clutter graphics library" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPL" -DEPENDS = "virtual/libx11 mesa gstreamer gtk-doc cairo pango gtk+" +COMPATIBLE_MACHINE = "(zylonite|mx31litekit|omap-3430ldp|omap-34030sdp|mx31ads|qemuarm|qemux86|ipodtouch|beagleboard|overo|omap3evm)" -inherit autotools pkgconfig +STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gtk+" +BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}" -EXTRA_OECONF = "--disable-gtk-doc " +DEPENDS = "${STDDEPENDS} mesa" +EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx" + +DEPENDS_zylonite = "${STDDEPENDS} libgles-zylonite tslib" +EXTRA_OECONF_zylonite = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_zylonite = "${MACHINE_ARCH}" +LDFLAGS_append_zylonite = " -lnws -lstdc++ " + +DEPENDS_mx31litekit = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31litekit = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31litekit = "${MACHINE_ARCH}" +LDFLAGS_append_mx31litekit = " -lpvrNULLWSEGL -lstdc++ " + +DEPENDS_omap-3430ldp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430ldp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430ldp = "${MACHINE_ARCH}" + +DEPENDS_omap-3430sdp = "${STDDEPENDS} libgles-omap3 tslib" +EXTRA_OECONF_omap-3430sdp = "${BASE_CONF} --with-flavour=eglx" +PACKAGE_ARCH_omap-3430sdp = "${MACHINE_ARCH}" + +DEPENDS_mx31ads = "${STDDEPENDS} libgles-mx31 tslib" +EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative" +PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}" +LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ " + +inherit autotools pkgconfig gtk-doc + +PACKAGES =+ "clutter-examples" +FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require clutter-fpu.inc -EXTRA_OECONF += "${@get_clutter_fpu_setting(bb, d)}" - #Fix up some weirdness in the docs do_configure_prepend() { - touch ${S}/gtk-doc.make sed -i s:doc/reference/Makefile::g ${S}/configure.ac sed -i s:doc::g ${S}/Makefile.am } @@ -23,4 +50,3 @@ do_configure_prepend() { do_stage () { autotools_stage_all } - diff --git a/packages/clutter/clutter/.mtn2git_empty b/packages/clutter/clutter/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/clutter/enable-tests-r2990.patch b/packages/clutter/clutter/enable-tests-r2990.patch new file mode 100644 index 0000000000..4f449b1177 --- /dev/null +++ b/packages/clutter/clutter/enable-tests-r2990.patch @@ -0,0 +1,50 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-06-26 16:46:50.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -17,8 +17,8 @@ + test-invariants + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap +-noinst_PROGRAMS += test-devices ++bin_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-devices + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_srcdir)/clutter -I$(top_builddir)/clutter +@@ -73,4 +73,9 @@ + test_invariants_SOURCES = test-invariants.c + test_devices_SOURCES = test-devices.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-06-26 16:46:26.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-06-26 16:46:31.000000000 +0100 +@@ -195,7 +195,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/packages/clutter/clutter/enable_tests-0.4.patch b/packages/clutter/clutter/enable_tests-0.4.patch new file mode 100644 index 0000000000..3178a2cd6c --- /dev/null +++ b/packages/clutter/clutter/enable_tests-0.4.patch @@ -0,0 +1,52 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter-0-4/tests/Makefile.am +=================================================================== +--- clutter-0-4.orig/tests/Makefile.am 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/Makefile.am 2007-11-06 21:49:48.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-boxes test-perspective test-rotate test-depth \ + test-threads test-timeline +@@ -24,4 +24,9 @@ test_depth_SOURCES = test-depth.c + test_threads_SOURCES = test-threads.c + test_timeline_SOURCES = test-timeline.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png +Index: clutter-0-4/tests/test-actors.c +=================================================================== +--- clutter-0-4.orig/tests/test-actors.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-actors.c 2007-11-06 21:49:28.000000000 +0000 +@@ -143,7 +143,7 @@ main (int argc, char *argv[]) + stage = clutter_stage_get_default (); + clutter_actor_set_size (stage, 800, 600); + +- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); ++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); + + if (!pixbuf) + g_error("pixbuf load failed"); +Index: clutter-0-4/tests/test-text.c +=================================================================== +--- clutter-0-4.orig/tests/test-text.c 2007-11-06 21:49:25.000000000 +0000 ++++ clutter-0-4/tests/test-text.c 2007-11-06 21:49:28.000000000 +0000 +@@ -27,7 +27,7 @@ main (int argc, char *argv[]) + + stage = clutter_stage_get_default (); + +- if (!g_file_get_contents ("test-text.c", &text, &size, NULL)) ++ if (!g_file_get_contents ("/usr/share/clutter/test-text.c", &text, &size, NULL)) + g_error("g_file_get_contents() of test-text.c failed"); + + clutter_actor_set_size (stage, 800, 600); diff --git a/packages/clutter/clutter/enable_tests-0.6.patch b/packages/clutter/clutter/enable_tests-0.6.patch new file mode 100644 index 0000000000..544a7e588c --- /dev/null +++ b/packages/clutter/clutter/enable_tests-0.6.patch @@ -0,0 +1,40 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter-0-6/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2007-11-06 12:29:17.000000000 +0000 ++++ clutter-0-6/tests/Makefile.am 2007-11-06 12:30:11.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-boxes test-perspective test-rotate test-depth \ + test-threads test-timeline test-score test-script +@@ -26,4 +26,9 @@ test_timeline_SOURCES = test-timeline.c + test_score_SOURCES = test-score.c + test_script_SOURCES = test-script.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter-0-6/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2007-11-06 12:29:17.000000000 +0000 ++++ clutter-0-6/tests/test-actors.c 2007-11-06 12:29:21.000000000 +0000 +@@ -143,7 +143,7 @@ main (int argc, char *argv[]) + stage = clutter_stage_get_default (); + clutter_actor_set_size (stage, 800, 600); + +- pixbuf = gdk_pixbuf_new_from_file ("redhand.png", NULL); ++ pixbuf = gdk_pixbuf_new_from_file ("/usr/share/clutter/redhand.png", NULL); + + if (!pixbuf) + g_error("pixbuf load failed"); + diff --git a/packages/clutter/clutter/enable_tests.patch b/packages/clutter/clutter/enable_tests.patch new file mode 100644 index 0000000000..4a99968fa3 --- /dev/null +++ b/packages/clutter/clutter/enable_tests.patch @@ -0,0 +1,48 @@ +--- + tests/Makefile.am | 7 ++++++- + tests/test-actors.c | 2 +- + tests/test-text.c | 2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Index: clutter/tests/Makefile.am +=================================================================== +--- clutter.orig/tests/Makefile.am 2008-04-25 16:45:17.000000000 +0100 ++++ clutter/tests/Makefile.am 2008-04-25 16:47:12.000000000 +0100 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \ ++bin_PROGRAMS = test-textures test-events test-offscreen test-scale \ + test-actors test-behave test-text test-entry test-project \ + test-perspective test-rotate test-depth \ + test-threads test-timeline test-timeline-dup-frames \ +@@ -14,7 +14,7 @@ + test-cogl-tex-polygon test-stage-read-pixels + + if X11_TESTS +-noinst_PROGRAMS += test-pixmap ++bin_PROGRAMS += test-pixmap + endif + + INCLUDES = -I$(top_srcdir)/ -I$(top_builddir)/clutter +@@ -61,4 +61,9 @@ + test_cogl_offscreen_SOURCES = test-cogl-offscreen.c + test_stage_read_pixels_SOURCES = test-stage-read-pixels.c + ++test_textdir = $(pkgdatadir) ++test_text_DATA = test-text.c ++test_actorsdir = $(pkgdatadir) ++test_actors_DATA = redhand.png ++ + EXTRA_DIST = redhand.png test-script.json +Index: clutter/tests/test-actors.c +=================================================================== +--- clutter.orig/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100 ++++ clutter/tests/test-actors.c 2008-04-25 16:45:17.000000000 +0100 +@@ -184,7 +184,7 @@ + /* Create a texture from file, then clone in to same resources */ + if (i == 0) + { +- if ((oh->hand[i] = clutter_texture_new_from_file ("redhand.png", ++ if ((oh->hand[i] = clutter_texture_new_from_file ("/usr/share/clutter/redhand.png", + &error)) == NULL) + { + g_error ("image load failed: %s", error->message); diff --git a/packages/clutter/clutter_0.4svn.bb b/packages/clutter/clutter_0.4svn.bb new file mode 100644 index 0000000000..fe1fbc29d3 --- /dev/null +++ b/packages/clutter/clutter_0.4svn.bb @@ -0,0 +1,13 @@ +require clutter.inc + +PV = "0.4.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ + file://enable_tests-0.4.patch;patch=1 " + +S = "${WORKDIR}/clutter-0-4" + +do_stage () { + cp ${S}/clutter.pc ${S}/clutter-0.4.pc + autotools_stage_all +} diff --git a/packages/clutter/clutter_0.6svn.bb b/packages/clutter/clutter_0.6svn.bb new file mode 100644 index 0000000000..79882d6ddf --- /dev/null +++ b/packages/clutter/clutter_0.6svn.bb @@ -0,0 +1,8 @@ +require clutter.inc + +PV = "0.6.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ + file://enable_tests-0.6.patch;patch=1 " + +S = "${WORKDIR}/clutter-0-6" diff --git a/packages/clutter/clutter_svn.bb b/packages/clutter/clutter_svn.bb new file mode 100644 index 0000000000..cf88871ae0 --- /dev/null +++ b/packages/clutter/clutter_svn.bb @@ -0,0 +1,12 @@ +require clutter.inc + +PV = "0.8.0+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ + file://enable_tests.patch;patch=1;maxrev=2989 \ + file://enable-tests-r2990.patch;patch=1;minrev=2990" + +S = "${WORKDIR}/clutter" + + diff --git a/packages/clutter/moblin-proto/.mtn2git_empty b/packages/clutter/moblin-proto/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/moblin-proto/fix.patch b/packages/clutter/moblin-proto/fix.patch new file mode 100644 index 0000000000..8bde67762c --- /dev/null +++ b/packages/clutter/moblin-proto/fix.patch @@ -0,0 +1,22 @@ +Index: git/Makefile +=================================================================== +--- git.orig/Makefile 2008-08-11 22:49:48.000000000 +0100 ++++ git/Makefile 2008-08-12 12:16:52.000000000 +0100 +@@ -15,7 +15,7 @@ + + SCP_DESTINATION=pug.vpn:tmp + +-BINARY=$(shell basename `pwd`)# ++BINARY=moblin-proto + PACKAGE=../$(BINARY).tar.bz2 # you can use both .gz and .bz2 as extension here + + #CFLAGS= -Wall -I /home/pippin/src/clutter-box2d/clutter-box2d +@@ -61,7 +61,7 @@ + %.o: %.c $(HFILES) + $(CC) -g $(CFLAGS) $(INCS) -c $< -o$@ + $(BINARY): $(OBJECTS) +- $(CC) -o $@ $(OBJECTS) $(LIBS) ++ $(CXX) -o $@ $(OBJECTS) $(LIBS) + + #$(BINARY): $(CFILES) + # $(LD) $(CFLAGS) $(INCS) $(CFILES) $(LIBS) -o $@ diff --git a/packages/clutter/moblin-proto/paths.patch b/packages/clutter/moblin-proto/paths.patch new file mode 100644 index 0000000000..d241c8ff71 --- /dev/null +++ b/packages/clutter/moblin-proto/paths.patch @@ -0,0 +1,15 @@ +diff --git a/moblin-desktop.h b/moblin-desktop.h +index 880a9ad..3d51a14 100644 +--- a/moblin-desktop.h ++++ b/moblin-desktop.h +@@ -29,8 +29,8 @@ + #define __MAIN_H__ + + +-#define ASSET_ROOT "./assets/" +-#define JSON_ROOT "./layouts/" ++#define ASSET_ROOT "/usr/share/moblin-proto/assets/" ++#define JSON_ROOT "/usr/share/moblin-proto/layouts/" + + typedef struct + { diff --git a/packages/clutter/moblin-proto_git.bb b/packages/clutter/moblin-proto_git.bb new file mode 100644 index 0000000000..8ce97bbeab --- /dev/null +++ b/packages/clutter/moblin-proto_git.bb @@ -0,0 +1,18 @@ +DEPENDS = "clutter-box2d" + +PV = "0.0+git${SRCREV}" +PR = "r1" + +SRC_URI = "git://moblin.org/repos/users/pippin/prototype.git/;protocol=http \ + file://paths.patch;patch=1" + +S = "${WORKDIR}/git" + +do_install () { + install -d ${D}${bindir} + install ${S}/moblin-proto ${D}${bindir} + + install -d ${D}${datadir}/moblin-proto/ + cp -a ${S}/assets ${D}${datadir}/moblin-proto/ + cp -a ${S}/layouts ${D}${datadir}/moblin-proto/ +} diff --git a/packages/clutter/table.inc b/packages/clutter/table.inc new file mode 100644 index 0000000000..6ee1672197 --- /dev/null +++ b/packages/clutter/table.inc @@ -0,0 +1,17 @@ +DESCRIPTION = "Table Clutter Demo" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +DEPENDS = "clutter-gst gnome-vfs" + +inherit autotools pkgconfig + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/table ${D}${bindir}/table +} + +#do_stage () { +# autotools_stage_all +#} + diff --git a/packages/clutter/table/.mtn2git_empty b/packages/clutter/table/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/table/fixes.patch b/packages/clutter/table/fixes.patch new file mode 100644 index 0000000000..a7cdc43713 --- /dev/null +++ b/packages/clutter/table/fixes.patch @@ -0,0 +1,14 @@ +Index: table/Makefile +=================================================================== +--- table.orig/Makefile 2007-07-10 13:24:18.000000000 +0100 ++++ table/Makefile 2007-07-10 13:28:10.000000000 +0100 +@@ -8,7 +8,7 @@ all: table + + + table: table.o clutter-dominatrix.o clutter-video-player.o +- $(CC) -g -Wall $(CFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) ++ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) -o $@ table.o clutter-dominatrix.o clutter-video-player.o $(LIBS) + + clean: + rm -fr *.o table +\ No newline at end of file diff --git a/packages/clutter/table_svn.bb b/packages/clutter/table_svn.bb new file mode 100644 index 0000000000..168ea4dfba --- /dev/null +++ b/packages/clutter/table_svn.bb @@ -0,0 +1,10 @@ +require table.inc + +PV = "0.3.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \ + file://fixes.patch;patch=1" + +S = "${WORKDIR}/table" + + diff --git a/packages/clutter/tidy.inc b/packages/clutter/tidy.inc new file mode 100644 index 0000000000..bac910a4f4 --- /dev/null +++ b/packages/clutter/tidy.inc @@ -0,0 +1,24 @@ +DESCRIPTION = "Tidy library" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPL" + +STDDEPENDS = "clutter" +BASE_CONF = "--disable-gtk-doc" + +DEPENDS = "${STDDEPENDS}" +EXTRA_OECONF = "${BASE_CONF}" + +inherit autotools pkgconfig + +PACKAGES =+ "tidy-examples" +FILES_tidy-examples = "${bindir}/test-*" + +do_configure_prepend() { + touch ${S}/gtk-doc.make + sed -i s:docs/reference/Makefile::g ${S}/configure.ac + sed -i s:docs::g ${S}/Makefile.am +} + +do_stage () { + autotools_stage_all +} diff --git a/packages/clutter/tidy/.mtn2git_empty b/packages/clutter/tidy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/clutter/tidy/autofoo.patch b/packages/clutter/tidy/autofoo.patch new file mode 100644 index 0000000000..7f54a3372a --- /dev/null +++ b/packages/clutter/tidy/autofoo.patch @@ -0,0 +1,11 @@ +Index: tidy/doc/reference/Makefile.am +=================================================================== +--- tidy.orig/doc/reference/Makefile.am 2007-11-06 19:36:56.000000000 +0000 ++++ tidy/doc/reference/Makefile.am 2007-11-06 19:37:02.000000000 +0000 +@@ -77,4 +77,4 @@ include $(top_srcdir)/gtk-doc.make + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in ++EXTRA_DIST = version.xml.in + diff --git a/packages/clutter/tidy/tidy-enable-tests.patch b/packages/clutter/tidy/tidy-enable-tests.patch new file mode 100644 index 0000000000..c5e1660c54 --- /dev/null +++ b/packages/clutter/tidy/tidy-enable-tests.patch @@ -0,0 +1,20 @@ +Index: trunk/tests/Makefile.am +=================================================================== +--- trunk.orig/tests/Makefile.am 2008-03-04 12:22:10.000000000 +0000 ++++ trunk/tests/Makefile.am 2008-03-04 12:23:46.000000000 +0000 +@@ -1,4 +1,4 @@ +-noinst_PROGRAMS = \ ++bin_PROGRAMS = \ + test-button \ + test-finger-scroll \ + test-list-view \ +@@ -14,6 +14,9 @@ + test-grow \ + test-viewport + ++test_texture_framedir = $(pkgdatadir) ++test_texture_frame_DATA = frame.png ++ + INCLUDES = -I$(top_srcdir) + LDADD = $(top_builddir)/tidy/libtidy-1.0.la + diff --git a/packages/clutter/tidy_svn.bb b/packages/clutter/tidy_svn.bb new file mode 100644 index 0000000000..348bba0a8e --- /dev/null +++ b/packages/clutter/tidy_svn.bb @@ -0,0 +1,10 @@ +require tidy.inc + +PV = "0.1.0+svnr${SRCREV}" +PR = "6" + +SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \ + file://tidy-enable-tests.patch;patch=1" + +S = "${WORKDIR}/trunk" + -- cgit v1.2.3 From ee0be38ce204932d658ee9dc4996206cfc18e0fd Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 11:43:24 +0000 Subject: sane-srcrevs: add clutter stuff --- conf/distro/include/sane-srcrevs.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 2c0ad6539d..5fb4dece1f 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -17,6 +17,10 @@ SRCREV_pn-assassin ?= "93" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-uclibc ?= "23129" SRCREV_pn-uclibc-initial ?= "23129" +SRCREV_pn-clutter-box2d = "3197" +SRCREV_pn-clutter-cairo ?= "3210" +SRCREV_pn-clutter-gst ?= "3188" +SRCREV_pn-clutter ?= "3240" SRCREV_pn-connman ?= "f9f84ccfa0cd338e2de22878f277352436570b83" SRCREV_pn-contact ?= "1410" SRCREV_pn-dasher-gpe ?= "1251" @@ -88,7 +92,7 @@ SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" -SRCREV_pn-mplayer ?= "27047" +SRCREV_pn-mplayer ?= "27380" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" @@ -168,6 +172,7 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-tichy ?= "168" +SRCREV_pn-tidy ?= "242" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" -- cgit v1.2.3 From fd22c89450b08a917c2ae373d6ee837bef8a8e6c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 12:05:32 +0000 Subject: gtk-doc bbclass: merge from poky --- classes/gtk-doc.bbclass | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 classes/gtk-doc.bbclass diff --git a/classes/gtk-doc.bbclass b/classes/gtk-doc.bbclass new file mode 100644 index 0000000000..58daaf39e2 --- /dev/null +++ b/classes/gtk-doc.bbclass @@ -0,0 +1,4 @@ +# We don't have gtk-doc so disable it +do_configure_prepend() { + echo "EXTRA_DIST=">> ${S}/gtk-doc.make +} -- cgit v1.2.3 From 90fcfa9df01c6020f8f5fb8480a2332a7b7d3989 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:13:25 +0000 Subject: loudmouth: update to 1.3.2 --- packages/loudmouth/loudmouth_1.3.2.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/loudmouth/loudmouth_1.3.2.bb diff --git a/packages/loudmouth/loudmouth_1.3.2.bb b/packages/loudmouth/loudmouth_1.3.2.bb new file mode 100644 index 0000000000..d8f519b611 --- /dev/null +++ b/packages/loudmouth/loudmouth_1.3.2.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Loudmouth is a lightweight and easy-to-use C library for programming with the Jabber protocol." +HOMEPAGE = "http://www.loudmouth-project.org/" +LICENSE = "LGPL" +DEPENDS = "glib-2.0 gnutls check" + +SRC_URI = "http://ftp.imendio.com/pub/imendio/${PN}/src/${PN}-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From a1ee98e06d2f58a9a3f1ebc32b664a4b07169a3d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:41:22 +0000 Subject: telepathy glib: update to 0.7.14 --- packages/telepathy/telepathy-glib_0.7.14.bb | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 packages/telepathy/telepathy-glib_0.7.14.bb diff --git a/packages/telepathy/telepathy-glib_0.7.14.bb b/packages/telepathy/telepathy-glib_0.7.14.bb new file mode 100644 index 0000000000..f6b6a6c6b3 --- /dev/null +++ b/packages/telepathy/telepathy-glib_0.7.14.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "Telepathy framework - GLib library" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus python-native dbus-native" +LICENSE = "LGPL" + +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz " + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + # + # copied autotools_stage_all because telepathy-glib has one lib only built as static + # so it can not be oe_libinstalled + # + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + if [ -d ${STAGE_TEMP}/${includedir} ]; then + cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} + fi + if [ -d ${STAGE_TEMP}/${libdir} ] + then + for i in ${STAGE_TEMP}/${libdir}/*.la + do + if [ ! -f "$i" ]; then + cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + break + fi + done + oe_libinstall -so -C telepathy-glib/.libs libtelepathy-glib ${STAGING_LIBDIR} + fi + if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then + install -d ${STAGING_DATADIR}/aclocal + cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal + fi + rm -rf ${STAGE_TEMP} +} -- cgit v1.2.3 From 133ec7b479b789209f93c780af9c66492b1ecbc2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:41:44 +0000 Subject: telepathy gablle: update to 0.7.8 --- .../telepathy-gabble-0.7.8/.mtn2git_empty | 0 .../telepathy-gabble-0.7.8/gabble.manager | 32 ++++++++++++++++++++++ packages/telepathy/telepathy-gabble_0.7.8.bb | 17 ++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty create mode 100644 packages/telepathy/telepathy-gabble-0.7.8/gabble.manager create mode 100644 packages/telepathy/telepathy-gabble_0.7.8.bb diff --git a/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty b/packages/telepathy/telepathy-gabble-0.7.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager new file mode 100644 index 0000000000..d09b838090 --- /dev/null +++ b/packages/telepathy/telepathy-gabble-0.7.8/gabble.manager @@ -0,0 +1,32 @@ + +[ConnectionManager] +BusName=org.freedesktop.Telepathy.ConnectionManager.gabble +ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/gabble + +[Protocol jabber] +param-account=s required register +param-password=s required register +param-server=s +param-resource=s +param-priority=n +param-port=q +param-old-ssl=b +param-require-encryption=b +param-register=b +param-low-bandwidth=b +param-https-proxy-server=s +param-https-proxy-port=q +param-fallback-conference-server=s +param-stun-server=s +param-stun-port=q +param-ignore-ssl-errors=b +param-alias=s +default-resource=Telepathy +default-priority=0 +default-old-ssl=false +default-require-encryption=false +default-register=false +default-low-bandwidth=false +default-https-proxy-port=443 +default-stun-port=3478 +default-ignore-ssl-errors=false diff --git a/packages/telepathy/telepathy-gabble_0.7.8.bb b/packages/telepathy/telepathy-gabble_0.7.8.bb new file mode 100644 index 0000000000..fbc209eeb5 --- /dev/null +++ b/packages/telepathy/telepathy-gabble_0.7.8.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Gabble: a Jabber/XMPP connection manager" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus loudmouth telepathy-glib" +LICENSE = "LGPL" + +# gabble.manager needs to get regenerated every release, so please don't copy it over blindly +SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-gabble/${P}.tar.gz \ + file://gabble.manager" + +inherit autotools pkgconfig + +do_compile_prepend() { + cp ${WORKDIR}/gabble.manager ${S}/data/ +} + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" -- cgit v1.2.3 From 76cf6864aaf3de0fe82ca23b2c903c7040811298 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:42:37 +0000 Subject: telepathy salut: add 0.3.4 --- .../telepathy/telepathy-salut-0.3.4/.mtn2git_empty | 0 .../telepathy-salut-0.3.4/keep-manager-file.diff | 11 +++++++++++ packages/telepathy/telepathy-salut-0.3.4/salut.manager | 13 +++++++++++++ packages/telepathy/telepathy-salut_0.3.4.bb | 18 ++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty create mode 100644 packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff create mode 100644 packages/telepathy/telepathy-salut-0.3.4/salut.manager create mode 100644 packages/telepathy/telepathy-salut_0.3.4.bb diff --git a/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty b/packages/telepathy/telepathy-salut-0.3.4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff new file mode 100644 index 0000000000..4c335e0c8b --- /dev/null +++ b/packages/telepathy/telepathy-salut-0.3.4/keep-manager-file.diff @@ -0,0 +1,11 @@ +--- /tmp/Makefile.am 2008-08-31 15:37:45.000000000 +0200 ++++ telepathy-salut-0.3.4/data/Makefile.am 2008-08-31 15:38:09.163198000 +0200 +@@ -15,8 +15,4 @@ + + CLEANFILES = $(service_DATA) $(manager_DATA) + +-$(manager_DATA): always-build +- $(MAKE) -C ../src write-mgr-file +- ../src/write-mgr-file > $@ +- + .PHONY: always-build diff --git a/packages/telepathy/telepathy-salut-0.3.4/salut.manager b/packages/telepathy/telepathy-salut-0.3.4/salut.manager new file mode 100644 index 0000000000..8fd84d5877 --- /dev/null +++ b/packages/telepathy/telepathy-salut-0.3.4/salut.manager @@ -0,0 +1,13 @@ + +[ConnectionManager] +Name=Salut +BusName=org.freedesktop.Telepathy.ConnectionManager.salut +ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/salut + +[Protocol local-xmpp] +param-nickname=s +param-first-name=s required +param-last-name=s required +param-jid=s +param-email=s +param-published-name=s diff --git a/packages/telepathy/telepathy-salut_0.3.4.bb b/packages/telepathy/telepathy-salut_0.3.4.bb new file mode 100644 index 0000000000..c8b9edaee1 --- /dev/null +++ b/packages/telepathy/telepathy-salut_0.3.4.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Salut: Link-local XMPP connection manager for the Telepathy framework" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "telepathy-glib avahi telepathy-gabble" +LICENSE = "LGPL" + +#salut.manager changes every release, don't copy it over blindly! +SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz \ + file://keep-manager-file.diff;patch=1 \ + file://salut.manager" + +inherit autotools pkgconfig + +do_compile_prepend() { + cp ${WORKDIR}/salut.manager ${S}/data/ +} + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" -- cgit v1.2.3 From 2dda093c30a4aa706d77e2c72e20093985d874c7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:45:08 +0000 Subject: telepathy python: update to 0.15.1 --- packages/telepathy/telepathy-python_0.15.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/telepathy/telepathy-python_0.15.1.bb diff --git a/packages/telepathy/telepathy-python_0.15.1.bb b/packages/telepathy/telepathy-python_0.15.1.bb new file mode 100644 index 0000000000..0898b321eb --- /dev/null +++ b/packages/telepathy/telepathy-python_0.15.1.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Telepathy framework - Python package" +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +LICENSE = "LGPL" +RDEPENDS_${PN} += "python-dbus" + +SRC_URI = "http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz " + +inherit distutils -- cgit v1.2.3 From 681b097e003ff776cc7fc5e66eeb17d4701b93a9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 13:52:29 +0000 Subject: libtelepathy: update to 0.3.3 --- packages/telepathy/libtelepathy_0.3.3.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/telepathy/libtelepathy_0.3.3.bb diff --git a/packages/telepathy/libtelepathy_0.3.3.bb b/packages/telepathy/libtelepathy_0.3.3.bb new file mode 100644 index 0000000000..d30b301d38 --- /dev/null +++ b/packages/telepathy/libtelepathy_0.3.3.bb @@ -0,0 +1,15 @@ +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +DEPENDS = "glib-2.0 dbus" +LICENSE = "LGPL" +PR = "r0" + +SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz" + +inherit autotools pkgconfig + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 205ceb64f20151fdf50ddfc01e90a94a05f3cf6c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:00:19 +0000 Subject: telepathy mission control: update to 4.67 --- .../telepathy/telepathy-mission-control_4.67.bb | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 packages/telepathy/telepathy-mission-control_4.67.bb diff --git a/packages/telepathy/telepathy-mission-control_4.67.bb b/packages/telepathy/telepathy-mission-control_4.67.bb new file mode 100644 index 0000000000..418a265512 --- /dev/null +++ b/packages/telepathy/telepathy-mission-control_4.67.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Telepathy Mission Control" +HOMEPAGE = "http://mission-control.sourceforge.net/" +LICENSE = "LGPL" +SECTION = "libs" +DEPENDS = "libtelepathy dbus-glib gconf" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mission-control/telepathy-mission-control-${PV}.tar.gz" + +inherit autotools + +PACKAGES =+ " \ + libmissioncontrol \ + libmissioncontrol-config \ + libmissioncontrol-server \ + libmissioncontrol-dev \ + libmissioncontrol-config-dev \ + libmissioncontrol-server-dev \ + libmissioncontrol-dbg \ + libmissioncontrol-config-dbg \ + libmissioncontrol-server-dbg \ +" + +FILES_${PN} += "${datadir}/dbus*" + +FILES_libmissioncontrol = "${libdir}/libmissioncontrol.so.*" +FILES_libmissioncontrol-config = "${libdir}/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server = "${libdir}/libmissioncontrol-server.so.*" + +FILES_libmissioncontrol-dev = "${libdir}/libmissioncontrol.* \ + ${includedir}/libmissioncontrol/ \ + ${libdir}/pkgconfig/libmissioncontrol.pc" +FILES_libmissioncontrol-config-dev = "${libdir}/libmissioncontrol-config.*" +FILES_libmissioncontrol-server-dev = "${libdir}/libmissioncontrol-server.*" + +FILES_libmissioncontrol-dbg += "${libdir}/.debug/libmissioncontrol.so.*" +FILES_libmissioncontrol-config-dbg += "${libdir}/.debug/libmissioncontrol-config.so.*" +FILES_libmissioncontrol-server-dbg += "${libdir}/.debug/libmissioncontrol-server.so.*" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_compile_append() { + for i in ${S}/*.pc ; do + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + $i + done +} + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From c8ccedddd5167c2e9c752b5cb8c87df16e80a7de Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:13:29 +0000 Subject: intltool native: fix up m4 --- packages/intltool/intltool-native_0.40.3.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/intltool/intltool-native_0.40.3.bb b/packages/intltool/intltool-native_0.40.3.bb index ca1c5ef5c9..a90b667d6d 100644 --- a/packages/intltool/intltool-native_0.40.3.bb +++ b/packages/intltool/intltool-native_0.40.3.bb @@ -1,6 +1,6 @@ require intltool_${PV}.bb -PR = "r1" +PR = "r2" inherit native DEPENDS = "libxml-parser-perl-native" @@ -13,3 +13,8 @@ do_configure_prepend() { sed -i -e s:-w::g $i done } + +do_configure_append() { + sed -i -e s:head\ -1:head\ -n1:g intltool.m4 +} + -- cgit v1.2.3 From a1d8f09532c0137751af93905c2bd485854094b1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:17:48 +0000 Subject: suagar base: more rdepends --- packages/sugar/sugar-base_0.82.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index e4875ead59..feda190723 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r6" +PR = "r7" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS = "librsvg-gtk \ - hippo-canvas \ + ohm-plugin-x11 ohm \ + hippo-canvas \ python-datetime \ python-netclient \ python-pygtk \ @@ -13,7 +14,7 @@ RDEPENDS = "librsvg-gtk \ python-logging \ python-dbus \ python-subprocess \ - telepathy-python \ + telepathy-gabble telepathy-salut telepathy-python \ python-crypt \ python-numpy \ python-compression \ -- cgit v1.2.3 From a6b122adf2a99438413322371d262043d25442df Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:28:07 +0000 Subject: empathy: add 2.23.90 --- packages/telepathy/empathy_2.23.90.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/telepathy/empathy_2.23.90.bb diff --git a/packages/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb new file mode 100644 index 0000000000..18e95b1430 --- /dev/null +++ b/packages/telepathy/empathy_2.23.90.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Empathy: a Telepathy based IM client" +HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0" +LICENSE = "GPL" +DEPENDS = "python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus" +RDEPENDS = "telepathy-mission-control" +RRECOMMENDS = "telepathy-gabble" + +inherit gnome + +PARALLEL_MAKE = "" + +FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ + ${datadir}/dbus-1/services/*.service \ + ${datadir}/telepathy/managers/*.chandler \ + ${datadir}/icons \ + ${libdir}/python*" + +FILES_${PN}-dbg += "${libdir}/python*/*/.debug" + -- cgit v1.2.3 From e68262c71dbd6eae802e6d360493fea3816db302 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:33:37 +0000 Subject: sugar-presence-service: add 0.82.1 --- packages/sugar/sugar-presence-service_0.82.1.bb | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/sugar/sugar-presence-service_0.82.1.bb diff --git a/packages/sugar/sugar-presence-service_0.82.1.bb b/packages/sugar/sugar-presence-service_0.82.1.bb new file mode 100644 index 0000000000..67b96f7b20 --- /dev/null +++ b/packages/sugar/sugar-presence-service_0.82.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Sugar presence service" +LICENSE = "GPLv2" + +DEPENDS = "sugar-toolkit" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/${PN}/${PN}-${PV}.tar.bz2" + +inherit autotools distutils-base + +do_configure_prepend() { + mkdir -p ${S}/m4 +} + +FILES_${PN} += "${datadir}/${PN} \ + ${datadir}/mime \ + ${datadir}/xsessions \ + ${datadir}/dbus-1 \ + ${sysconfdir} \ + ${libdir}/python*/site-packages/" + +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug" + + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From 9fe3b448d22bb457e69d2fa0788f8127966a3ca3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 14:34:00 +0000 Subject: sugar base: add presence service --- packages/sugar/sugar-base_0.82.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index feda190723..69c3cab21d 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r7" +PR = "r8" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS = "librsvg-gtk \ @@ -15,6 +15,7 @@ RDEPENDS = "librsvg-gtk \ python-dbus \ python-subprocess \ telepathy-gabble telepathy-salut telepathy-python \ + sugar-presence-service \ python-crypt \ python-numpy \ python-compression \ -- cgit v1.2.3 From c37b36b5891360514dc73ee51b3988892feb25c7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 31 Aug 2008 14:42:35 +0000 Subject: dcopidl: upgrade to 3.5.8 to fix fetch issues --- packages/dcop/dcopidl-native_3.5.4.bb | 26 -------------------------- packages/dcop/dcopidl-native_3.5.8.bb | 26 ++++++++++++++++++++++++++ packages/dcop/dcopidl2cpp-native_3.5.4.bb | 27 --------------------------- packages/dcop/dcopidl2cpp-native_3.5.8.bb | 27 +++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 packages/dcop/dcopidl-native_3.5.4.bb create mode 100644 packages/dcop/dcopidl-native_3.5.8.bb delete mode 100644 packages/dcop/dcopidl2cpp-native_3.5.4.bb create mode 100644 packages/dcop/dcopidl2cpp-native_3.5.8.bb diff --git a/packages/dcop/dcopidl-native_3.5.4.bb b/packages/dcop/dcopidl-native_3.5.4.bb deleted file mode 100644 index 62abe88bac..0000000000 --- a/packages/dcop/dcopidl-native_3.5.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/devel" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" - -SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 \ - file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl" - -inherit native qmake qt3e - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " -EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " - -# create a .pro file now -do_configure_prepend() { - echo "SOURCES += main.cpp yacc.cc scanner.cc " > dcopidl.pro - echo "HEADERS += yacc.cc.h " >> dcopidl.pro -} - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 0755 dcopidl ${STAGING_BINDIR} -} diff --git a/packages/dcop/dcopidl-native_3.5.8.bb b/packages/dcop/dcopidl-native_3.5.8.bb new file mode 100644 index 0000000000..43fd451d79 --- /dev/null +++ b/packages/dcop/dcopidl-native_3.5.8.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "DCOP IDL parser" +SECTION = "kde/devel" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + +SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2 \ + file://dcopidl-compile.patch;patch=1 " +S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl" + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " +EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " + +# create a .pro file now +do_configure_prepend() { + echo "SOURCES += main.cpp yacc.cc scanner.cc " > dcopidl.pro + echo "HEADERS += yacc.cc.h " >> dcopidl.pro +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 0755 dcopidl ${STAGING_BINDIR} +} diff --git a/packages/dcop/dcopidl2cpp-native_3.5.4.bb b/packages/dcop/dcopidl2cpp-native_3.5.4.bb deleted file mode 100644 index d7a1c6e338..0000000000 --- a/packages/dcop/dcopidl2cpp-native_3.5.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "DCOP IDL parser" -SECTION = "kde/devel" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "uicmoc3-native" - -SRC_URI = "ftp://download.kde.org/pub/kde/stable/3.5.4/src/kdelibs-3.5.4.tar.bz2 " -#\ -# file://dcopidl-compile.patch;patch=1 " -S = "${WORKDIR}/kdelibs-3.5.4/dcop/dcopidl2cpp" - -inherit native qmake qt3e - -export OE_QMAKE_LINK="${CXX}" -EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " -EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " - -# create a .pro file now -do_configure_prepend() { - echo "SOURCES += main.cpp skel.cpp stub.cpp stubimpl.cpp" > dcopidl2cpp.pro - echo "HEADERS += main.h " >> dcopidl2cpp.pro -} - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 0755 dcopidl2cpp ${STAGING_BINDIR} -} diff --git a/packages/dcop/dcopidl2cpp-native_3.5.8.bb b/packages/dcop/dcopidl2cpp-native_3.5.8.bb new file mode 100644 index 0000000000..136deb1f42 --- /dev/null +++ b/packages/dcop/dcopidl2cpp-native_3.5.8.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "DCOP IDL parser" +SECTION = "kde/devel" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "uicmoc3-native" + +SRC_URI = "ftp://download.kde.org/pub/kde/stable/${PV}/src/kdelibs-${PV}.tar.bz2" +#\ +# file://dcopidl-compile.patch;patch=1 " +S = "${WORKDIR}/kdelibs-${PV}/dcop/dcopidl2cpp" + +inherit native qmake qt3e + +export OE_QMAKE_LINK="${CXX}" +EXTRA_QMAKEVARS_POST_append = "LIBS+=-ldl " +EXTRA_QMAKEVARS_POST_append = "CONFIG-=thread " + +# create a .pro file now +do_configure_prepend() { + echo "SOURCES += main.cpp skel.cpp stub.cpp stubimpl.cpp" > dcopidl2cpp.pro + echo "HEADERS += main.h " >> dcopidl2cpp.pro +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 0755 dcopidl2cpp ${STAGING_BINDIR} +} -- cgit v1.2.3 From 443f6022df06d9f9dc221011c1744274deff2c2c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 16:12:35 +0000 Subject: python-numpy: fix wrong include paths, but it still tries to run generated code during configure * it wraps scons with distutils. crazy python dudes --- packages/python/python-numpy/.mtn2git_empty | 0 packages/python/python-numpy/unbreak-assumptions.diff | 16 ++++++++++++++++ packages/python/python-numpy_1.1.1.bb | 4 +++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-numpy/.mtn2git_empty create mode 100644 packages/python/python-numpy/unbreak-assumptions.diff diff --git a/packages/python/python-numpy/.mtn2git_empty b/packages/python/python-numpy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-numpy/unbreak-assumptions.diff b/packages/python/python-numpy/unbreak-assumptions.diff new file mode 100644 index 0000000000..c5b448167f --- /dev/null +++ b/packages/python/python-numpy/unbreak-assumptions.diff @@ -0,0 +1,16 @@ +--- /tmp/system_info.py 2008-08-22 00:38:16.000000000 +0200 ++++ numpy-1.1.1/numpy/distutils/system_info.py 2008-08-22 00:40:33.013198000 +0200 +@@ -137,11 +137,8 @@ + default_x11_lib_dirs = [] + default_x11_include_dirs = [] + else: +- default_lib_dirs = ['/usr/local/lib', '/opt/lib', '/usr/lib', +- '/opt/local/lib', '/sw/lib'] +- default_include_dirs = ['/usr/local/include', +- '/opt/include', '/usr/include', +- '/opt/local/include', '/sw/include'] ++ default_lib_dirs = ['/non-existant-dir'] ++ default_include_dirs = ['non-existant-dir'] + default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] + + try: diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index d688c93beb..e23c89e3cf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -5,7 +5,9 @@ LICENSE = "PSF" PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ - " + file://unbreak-assumptions.diff;patch=1 \ + " + S = "${WORKDIR}/numpy-${PV}" inherit distutils -- cgit v1.2.3 From fdfb98050fa955aa584d04beb603ee2685ee3b45 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 19:54:55 +0000 Subject: empathy: put scrollkeeper stuff that conflicts with other packages in its own package --- packages/telepathy/empathy_2.23.90.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/telepathy/empathy_2.23.90.bb b/packages/telepathy/empathy_2.23.90.bb index 18e95b1430..ff304f918e 100644 --- a/packages/telepathy/empathy_2.23.90.bb +++ b/packages/telepathy/empathy_2.23.90.bb @@ -8,6 +8,10 @@ RRECOMMENDS = "telepathy-gabble" inherit gnome PARALLEL_MAKE = "" +PR = "r1" + +PACKAGES =+ "empathy-scrollkeeper-junk" +FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper" FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \ ${datadir}/dbus-1/services/*.service \ -- cgit v1.2.3 From c72bf0978e84f8c39ceb3948be9c51f1ea2114e2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 31 Aug 2008 20:04:49 +0000 Subject: dia: update to 0.96.1 --- packages/dia/dia_0.96.1.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/dia/dia_0.96.1.bb diff --git a/packages/dia/dia_0.96.1.bb b/packages/dia/dia_0.96.1.bb new file mode 100644 index 0000000000..9e2f104831 --- /dev/null +++ b/packages/dia/dia_0.96.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Dia is a gtk+ based diagram creation program released under the GPL license." +LICENSE = "GPL" +SECTION = "x11/graphics" +DEPENDS = "libart-lgpl libpng cairo zlib gtk+ libxml2" + +inherit gnome pkgconfig + +#work around some pkgconfig breakages +LDFLAGS += "-lart_lgpl_2 -lxml2 -lgthread-2.0 -lglib-2.0" +CFLAGS += "-I${STAGING_INCDIR}/libart-2.0 " + +FILES_${PN} += "${datadir}/mime-info/" + + -- cgit v1.2.3 From 3a86cf2675b4a5eab2ed68f77d3b2d513d7d3d2b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 31 Aug 2008 22:44:11 +0000 Subject: konqueror-embedded: improve 20070316 version * Enable rtti (requires libqpe-opie with enabled rtti) * Change from qpe to road GUI --- packages/konqueror/konqueror-embedded_20070316.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/konqueror/konqueror-embedded_20070316.bb b/packages/konqueror/konqueror-embedded_20070316.bb index 5a127515bb..83b5ab40a3 100644 --- a/packages/konqueror/konqueror-embedded_20070316.bb +++ b/packages/konqueror/konqueror-embedded_20070316.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.konqueror.org/" DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native" LICENSE = "LGPL GPL" -PR = "r5" +PR = "r6" # this Konqueror needs the KDEDIR set and the font helvetica installed on the target @@ -22,7 +22,7 @@ export MOC = "${STAGING_BINDIR_NATIVE}/moc" export UIC = "${STAGING_BINDIR_NATIVE}/uic" #export exec_prefix = "${palmtopdir}" #export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS" -export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS" +export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS" export PCRE_CONFIG = "invalid" # uncomment this for a static build # EXTRAFLAGS = "-lts" @@ -47,7 +47,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --disable-static \ --enable-shared \ --disable-debug \ - --with-gui=qpe \ + --with-gui=road \ --with-ipv6-lookup=no \ --without-xinerama \ # --disable-scrollbars \ @@ -63,7 +63,7 @@ EXTRA_OECONF = '--prefix=${palmtopdir} \ --disable-selection \ --enable-final \ --enable-qt-embedded \ -# --enable-rtti-embedded \ + --enable-rtti-embedded \ --enable-mt \ --enable-qpe \ --enable-qt-mt \ -- cgit v1.2.3 From 9589fa37d16cb0c5052cf0a9d1ce83703cb4fb4c Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 31 Aug 2008 22:47:03 +0000 Subject: libqpe-opie: enable rtti --- packages/libqpe/libqpe-opie.inc | 3 ++- packages/libqpe/libqpe-opie_1.2.3.bb | 2 +- packages/libqpe/libqpe-opie_cvs.bb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 2218734fea..ebb49c0658 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -11,11 +11,12 @@ S = "${WORKDIR}/library" inherit palmtop +OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}" QMAKE_PROFILES = "library.pro" EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" +CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" do_compile() { mkdir -p ${STAGING_INCDIR}/qpe \ diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb index a51d6a9225..0822385b9d 100644 --- a/packages/libqpe/libqpe-opie_1.2.3.bb +++ b/packages/libqpe/libqpe-opie_1.2.3.bb @@ -1,6 +1,6 @@ require ${PN}.inc -PR = "r2" +PR = "r3" TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \ diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index bbeac82431..7c69904cd2 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r4" +PR = "r5" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ -- cgit v1.2.3 From 50a48e96bf069d02b6de21b23d4e7fb7e2b408de Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 07:32:02 +0000 Subject: openssh: package keygen seperately --- packages/openssh/openssh_4.6p1.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb index c1c84d9dc1..692c92fa1d 100644 --- a/packages/openssh/openssh_4.6p1.bb +++ b/packages/openssh/openssh_4.6p1.bb @@ -14,7 +14,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -PR = "r3" +PR = "r4" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sftp-server-nolibcrypto.patch;patch=1 \ @@ -57,17 +57,18 @@ do_install_append() { rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var } -PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" +PACKAGES =+ " ssh-keygen openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc openssh-sftp-server" FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug" FILES_openssh-scp = "${bindir}/scp.${PN}" FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" -FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" +FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd" FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config" FILES_openssh-sftp = "${bindir}/sftp" FILES_openssh-sftp-server = "${libdir}exec/sftp-server" FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" +FILES_ssh-keygen = "${bindir}/ssh-keygen" -RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd" +RDEPENDS_openssh += " openssh-scp openssh-ssh openssh-sshd ssh-keygen " DEPENDS_openssh-sshd += " update-rc.d" RDEPENDS_openssh-sshd += " update-rc.d" -- cgit v1.2.3 From 3973e9c28b98c1fe5cfbfd77d36f72252d86e648 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 07:32:43 +0000 Subject: sugar-base: depend on ssh-keygen --- packages/sugar/sugar-base_0.82.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index 69c3cab21d..b323bb7a26 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r8" +PR = "r9" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS = "librsvg-gtk \ @@ -23,7 +23,7 @@ RDEPENDS = "librsvg-gtk \ python-simplejson \ python-misc \ python-xmlrpc \ - " + ssh-keygen" SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 7692f82c912460ed855bfda75f061844306df0aa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 07:57:04 +0000 Subject: mythtv 0.21: directfb 1.2 changed headers, so disable it --- packages/mythtv/mythtv_0.21.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/mythtv/mythtv_0.21.bb b/packages/mythtv/mythtv_0.21.bb index fabe788ba6..4f533b03e8 100644 --- a/packages/mythtv/mythtv_0.21.bb +++ b/packages/mythtv/mythtv_0.21.bb @@ -73,7 +73,8 @@ do_configure_prepend() { --cpu=${MYTHTV_ARCH} \ --arch=${MYTHTV_ARCH} \ --disable-altivec \ - --disable-opengl-video \ + --disable-directfb \ + --disable-opengl-video \ --disable-strip \ --enable-v4l \ --enable-audio-oss \ @@ -81,7 +82,7 @@ do_configure_prepend() { --enable-dvb \ --enable-libmp3lame \ --cross-compile \ - --dvb-path=${STAGING_INCDIR} \ + --dvb-path=${STAGING_INCDIR} \ --with-bindings= \ ${EXTRA_OECONF} -- cgit v1.2.3 From bee3911fb913536746e67ecefd31194745e49247 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 1 Sep 2008 08:02:51 +0000 Subject: task-openmoko-feed: Added midori, microcom and emacs --- packages/tasks/task-openmoko-feed.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 2b5475bcb8..640e1d64ea 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r39" +PR = "r40" inherit task @@ -98,4 +98,7 @@ RDEPENDS_task-openmoko-feed = "\ tichy \ pidgin \ epdfview \ + midori \ + microcom \ + emacs \ " -- cgit v1.2.3 From 19a4b765a694c070bc50477026cda03143af34df Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 10:16:05 +0000 Subject: python-numpy: add gross hack to make it build --- packages/python/python-numpy/arm/.mtn2git_empty | 0 packages/python/python-numpy/arm/config.h | 21 ++++++++++++++++ packages/python/python-numpy/arm/numpyconfig.h | 17 +++++++++++++ packages/python/python-numpy/trycompile.diff | 33 +++++++++++++++++++++++++ packages/python/python-numpy_1.1.1.bb | 15 ++++++++--- 5 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 packages/python/python-numpy/arm/.mtn2git_empty create mode 100644 packages/python/python-numpy/arm/config.h create mode 100644 packages/python/python-numpy/arm/numpyconfig.h create mode 100644 packages/python/python-numpy/trycompile.diff diff --git a/packages/python/python-numpy/arm/.mtn2git_empty b/packages/python/python-numpy/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/python/python-numpy/arm/config.h b/packages/python/python-numpy/arm/config.h new file mode 100644 index 0000000000..17ef186d56 --- /dev/null +++ b/packages/python/python-numpy/arm/config.h @@ -0,0 +1,21 @@ +/* ./src.linux-i686-2.5/numpy/core/include/numpy/config.h */ +/* #define SIZEOF_SHORT 2 */ +/* #define SIZEOF_INT 4 */ +/* #define SIZEOF_LONG 4 */ +/* #define SIZEOF_FLOAT 4 */ +/* #define SIZEOF_DOUBLE 8 */ +#define SIZEOF_LONG_DOUBLE 12 +#define SIZEOF_PY_INTPTR_T 4 +/* #define SIZEOF_LONG_LONG 8 */ +#define SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ +#define MATHLIB m +#define HAVE_FLOAT_FUNCS +#define HAVE_LOG1P +#define HAVE_EXPM1 +#define HAVE_INVERSE_HYPERBOLIC +#define HAVE_INVERSE_HYPERBOLIC_FLOAT +#define HAVE_ISNAN +#define HAVE_ISINF +#define HAVE_RINT + diff --git a/packages/python/python-numpy/arm/numpyconfig.h b/packages/python/python-numpy/arm/numpyconfig.h new file mode 100644 index 0000000000..c4bf6547f0 --- /dev/null +++ b/packages/python/python-numpy/arm/numpyconfig.h @@ -0,0 +1,17 @@ +/* cat ./src.linux-i686-2.5/numpy/core/include/numpy/numpyconfig.h */ +/* + * * This file is generated by numpy/core/setup.pyc. DO NOT EDIT + * */ +#define NPY_SIZEOF_SHORT 2 +#define NPY_SIZEOF_INT 4 +#define NPY_SIZEOF_LONG 4 +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_LONGDOUBLE 12 +#define NPY_SIZEOF_PY_INTPTR_T 4 +#define NPY_NO_SMP 0 + +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +/* #define CHAR_BIT 8 */ + diff --git a/packages/python/python-numpy/trycompile.diff b/packages/python/python-numpy/trycompile.diff new file mode 100644 index 0000000000..3ab3d72f2c --- /dev/null +++ b/packages/python/python-numpy/trycompile.diff @@ -0,0 +1,33 @@ +--- /tmp/setup.py 2008-09-01 10:37:44.000000000 +0200 ++++ numpy-1.1.1/numpy/core/setup.py 2008-09-01 10:38:20.373198000 +0200 +@@ -80,8 +80,7 @@ + raise SystemError,\ + "Non-existing %s. Perhaps you need to install"\ + " python-dev|python-devel." % (python_h) +- result = config_cmd.try_run(tc,include_dirs=[python_include], +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(tc) + if not result: + raise SystemError,"Failed to test configuration. "\ + "See previous error messages for more information." +@@ -95,7 +94,7 @@ + if mathlib: + mathlibs_choices.insert(0,mathlib.split(',')) + for libs in mathlibs_choices: +- if config_cmd.try_run(tc,libraries=libs): ++ if config_cmd.try_compile(tc): + mathlibs = libs + break + else: +@@ -180,10 +179,7 @@ + " python-dev|python-devel." % (python_h) + + config.numpy_include_dirs +- result = config_cmd.try_run(testcode, +- include_dirs = [python_include] + \ +- config.numpy_include_dirs, +- library_dirs = default_lib_dirs) ++ result = config_cmd.try_compile(testcode) + + if not result: + raise SystemError,"Failed to generate numpy configuration. "\ diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb index e23c89e3cf..157dadadaf 100644 --- a/packages/python/python-numpy_1.1.1.bb +++ b/packages/python/python-numpy_1.1.1.bb @@ -6,13 +6,22 @@ PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \ file://unbreak-assumptions.diff;patch=1 \ - " + file://trycompile.diff;patch=1 \ + file://config.h \ + file://numpyconfig.h \ + " S = "${WORKDIR}/numpy-${PV}" inherit distutils -do_stage() { - cp -pPR Include/Num* ${STAGING_INCDIR} +# Make the build fail and replace *config.h with proper one +# This is a ugly, ugly hack - Koen +do_compile_prepend() { + BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ + true + cp ${WORKDIR}/*config.h ${S}/build/$(ls ${S}/build | grep src)/numpy/core/include/numpy/ } + -- cgit v1.2.3 From ebc7d54006478170041d4b5aec16fca4555e5b7f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 10:49:39 +0000 Subject: sugar-base: more rdepends, it gets to the 'desktop' now: http://www.flickr.com/photos/koenkooi/2817404996/ --- packages/sugar/sugar-base_0.82.0.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb index b323bb7a26..0e616e72cc 100644 --- a/packages/sugar/sugar-base_0.82.0.bb +++ b/packages/sugar/sugar-base_0.82.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Sugar base system" LICENSE = "LGPLv2" -PR = "r9" +PR = "r10" DEPENDS = "python-pygtk sugar-toolkit" RDEPENDS = "librsvg-gtk \ @@ -23,6 +23,10 @@ RDEPENDS = "librsvg-gtk \ python-simplejson \ python-misc \ python-xmlrpc \ + python-compiler \ + python-pydoc \ + python-mmap \ + python-doctest \ ssh-keygen" SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2" -- cgit v1.2.3 From 3f4780a8738d0aa00383155708d1a1a07e55007b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 11:40:52 +0000 Subject: etoys: add etoys from sugarlabs, build tested only --- packages/sugar/etoys/.mtn2git_empty | 0 packages/sugar/etoys/etoys.diff | 65 +++++++++++++++++++++++++++++++++++++ packages/sugar/etoys_3.0.2076.bb | 23 +++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 packages/sugar/etoys/.mtn2git_empty create mode 100644 packages/sugar/etoys/etoys.diff create mode 100644 packages/sugar/etoys_3.0.2076.bb diff --git a/packages/sugar/etoys/.mtn2git_empty b/packages/sugar/etoys/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sugar/etoys/etoys.diff b/packages/sugar/etoys/etoys.diff new file mode 100644 index 0000000000..79b9acf51d --- /dev/null +++ b/packages/sugar/etoys/etoys.diff @@ -0,0 +1,65 @@ +--- /tmp/Makefile.in 2008-09-01 13:20:20.000000000 +0200 ++++ etoys-3.0.2076/Makefile.in 2008-09-01 13:29:37.453198000 +0200 +@@ -79,23 +79,23 @@ + dirs = $(bindir) $(etoysdir) $(mimedir) $(exmpldir) $(guidedir) $(docsdir) + + install-etoys: Content +- for d in $(dirs) ; do mkdir -p $$d ; done +- install -v etoys $(bindir) +- for f in $(etoys) ; do install -v -m 644 $$f $(etoysdir); done +- for f in $(examples); do install -v -m 644 $$f $(exmpldir); done ++ for d in $(dirs) ; do mkdir -p $(DESTDIR)$$d ; done ++ install -v etoys $(DESTDIR)$(bindir) ++ for f in $(etoys) ; do install -v -m 644 $$f $(DESTDIR)$(etoysdir); done ++ for f in $(examples); do install -v -m 644 $$f $(DESTDIR)$(exmpldir); done + for f in $(guides); do \ + dest=$(guidedir)/`basename $$f`; \ + echo -n $$dest; \ +- ( gunzip -c $$f | gzip -v --rsyncable > $$dest ); \ +- chmod 644 $$dest; \ ++ ( gunzip -c $$f | gzip -v --rsyncable > $(DESTDIR)$$dest ); \ ++ chmod 644 $(DESTDIR)$$dest; \ + done +- for f in $(docs) ; do install -v -m 644 $$f $(docsdir); done ++ for f in $(docs) ; do install -v -m 644 $$f $(DESTDIR)$(docsdir); done + for f in $(mos) ; do \ + dir=`dirname $$f|sed 's/^Content.//'` ; \ +- mkdir -p $(etoysdir)/$$dir ; \ +- install -v -m 644 $$f $(etoysdir)/$$dir ; \ ++ mkdir -p $(DESTDIR)$(etoysdir)/$$dir ; \ ++ install -v -m 644 $$f $(DESTDIR)$(etoysdir)/$$dir ; \ + done +- install -v -m 644 etoys.xml $(mimedir) ++ install -v -m 644 etoys.xml $(DESTDIR)$(mimedir) + + + # install activity - only used from sugar-jhbuild +@@ -109,20 +109,20 @@ + ./mkNews > $@ + + install-activity: $(activityall) +- mkdir -p $(activitydir)/activity +- mkdir -p $(activitydir)/bin +- install -v etoys-activity $(activitydir)/bin +- rm -f $(activitydir)/etoys-activity +- install -v -m 644 NEWS $(activitydir) +- install -v -m 644 activity.info $(activitydir)/activity +- install -v -m 644 activity-etoys.svg $(activitydir)/activity ++ mkdir -p $(DESTDIR)$(activitydir)/activity ++ mkdir -p $(DESTDIR)$(activitydir)/bin ++ install -v etoys-activity $(DESTDIR)$(activitydir)/bin ++ rm -f $(DESTDIR)$(activitydir)/etoys-activity ++ install -v -m 644 NEWS $(DESTDIR)$(activitydir) ++ install -v -m 644 activity.info $(DESTDIR)$(activitydir)/activity ++ install -v -m 644 activity-etoys.svg $(DESTDIR)$(activitydir)/activity + + + # install both, etoys and activity. + # RPM uses install-etoys only, and runs update-mime as post script + + install: install-etoys install-activity +- update-mime-database $(datadir)/mime ++ update-mime-database $(DESTDIR)$(datadir)/mime + + # build .xo bundle - invoke "make xo" manually + diff --git a/packages/sugar/etoys_3.0.2076.bb b/packages/sugar/etoys_3.0.2076.bb new file mode 100644 index 0000000000..0e8504a704 --- /dev/null +++ b/packages/sugar/etoys_3.0.2076.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Sugar etoys" +LICENSE = "GPLv2" + +DEPENDS = "sugar" +RDEPENDS = "sugar" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/etoys/etoys-${PV}.tar.gz \ + file://etoys.diff;patch=1" + +inherit autotools distutils-base + +do_configure_prepend() { + mkdir -p ${S}/m4 +} + +FILES_${PN} += "${datadir}/${PN} \ + ${datadir}/mime \ + ${datadir}/xsessions \ + ${datadir}/dbus-1 \ + ${datadir}/sugar/activities \ + ${sysconfdir} " + + -- cgit v1.2.3 From e81a4b690ee4a08789ad0e9e791e940351a812be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 11:43:47 +0000 Subject: etoys: doesn't contain arch specific binaries --- packages/sugar/etoys_3.0.2076.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sugar/etoys_3.0.2076.bb b/packages/sugar/etoys_3.0.2076.bb index 0e8504a704..60e52227f8 100644 --- a/packages/sugar/etoys_3.0.2076.bb +++ b/packages/sugar/etoys_3.0.2076.bb @@ -13,6 +13,7 @@ do_configure_prepend() { mkdir -p ${S}/m4 } +PACKAGES_ARCH = "all" FILES_${PN} += "${datadir}/${PN} \ ${datadir}/mime \ ${datadir}/xsessions \ -- cgit v1.2.3 From 2261f191b0333d5a31dbd0fae70047616bfbe94d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 1 Sep 2008 12:34:16 +0000 Subject: aufs: added aufs(another union filesystem) * patch provided by Bernhard Guillon aka mr_nice * closes bug 4524 --- conf/distro/include/sane-srcdates.inc | 1 + packages/aufs/.mtn2git_empty | 0 packages/aufs/aufs/.mtn2git_empty | 0 packages/aufs/aufs/aufs_create_no_manpage.patch | 34 ++++++++++++++ packages/aufs/aufs_cvs.bb | 62 +++++++++++++++++++++++++ 5 files changed, 97 insertions(+) create mode 100644 packages/aufs/.mtn2git_empty create mode 100644 packages/aufs/aufs/.mtn2git_empty create mode 100644 packages/aufs/aufs/aufs_create_no_manpage.patch create mode 100644 packages/aufs/aufs_cvs.bb diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index f6888e760f..e8783abb4d 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -51,6 +51,7 @@ SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" # Misc packages, sorted by alphabet +SRCDATE_aufs ?= "20080826" SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" SRCDATE_python-pydirectfb = "20071210" diff --git a/packages/aufs/.mtn2git_empty b/packages/aufs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/aufs/aufs/.mtn2git_empty b/packages/aufs/aufs/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/aufs/aufs/aufs_create_no_manpage.patch b/packages/aufs/aufs/aufs_create_no_manpage.patch new file mode 100644 index 0000000000..ec7c0c1138 --- /dev/null +++ b/packages/aufs/aufs/aufs_create_no_manpage.patch @@ -0,0 +1,34 @@ +OE-only: +comment: Not building the manpage is just a hack. + +diff -Nur aufs.vanilla/util/Makefile aufs/util/Makefile +--- aufs.vanilla/util/Makefile 2008-08-23 13:00:37.000000000 +0200 ++++ aufs/util/Makefile 2008-08-23 15:40:26.000000000 +0200 +@@ -1,25 +1,10 @@ + + # $Id: Makefile,v 1.10 2008/05/26 04:02:40 sfjro Exp $ + +-all: aufs.5 aulchown ++all: aulchown + test -x ./mount.aufs || chmod a+x ./mount.aufs + +-aufs.5: aufs.in.5 ./c2tmac +- ${RM} $@ +- ./c2tmac > $@ +- awk '{ \ +- gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \ +- gsub(/\\\[oq\]\140/, "\\[oq]"); \ +- gsub(/\047\\\[cq\]/, "\\[cq]"); \ +- gsub(/\047/, "\\[aq]"); \ +- print; \ +- }' aufs.in.5 >> $@ +- chmod a-w $@ +- + CFLAGS += -O2 -Wall ${EXTRA_CFLAGS} ${ccflags-y} + +-.INTERMEDIATE: c2tmac.o c2tmac +-c2tmac.o: c2tmac.c ../include/linux/aufs_type.h +- + clean: +- ${RM} c2tmac aulchown aufs.5 *~ .*~ ++ ${RM} aulchown *~ .*~ diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb new file mode 100644 index 0000000000..e83071fa0b --- /dev/null +++ b/packages/aufs/aufs_cvs.bb @@ -0,0 +1,62 @@ +DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which unifies several directories and provides a merged single directory." +HOMEPAGE = "http://aufs.sourceforge.net/" +LICENSE = "GPL" +RDEPENDS = "kernel (${KERNEL_VERSION})" +DEPENDS = "virtual/kernel sed-native" +PV = "cvs${SRCDATE}" +PR = "r0" +S = "${WORKDIR}/aufs" +inherit module + +# We do not create the manpage for aufs because we do not install it anyway. +# If you want to have the manpage created you will need to add host cc to +# the makefile else it will fail to crosscompile. +# See http://svn.exactcode.de/t2/trunk/package/filesystem/aufs/compile.patch.cross +# as an example how this could be done. + +SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE} \ + file://aufs_create_no_manpage.patch;patch=1 " + +EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk" + +# We need to check the architecture and the kernel version to +# configure properly lokal.mk. We ignore the export CONFIG_AUFS_STAT option. +# If you want to have CONFIG_AUFS_STAT enabled you have to add some other ARCH checks. +# Debian does not enable CONFIG_AUFS_STAT for arm. +# We disable CONFIG_AUFS_SYSAUFS for arm because arm does not know about cmpxchg. +# If you want this feature enabled you have to define it. +# I suggest you to read http://osdir.com/ml/linux.kernel.tracing/2006-12/msg00020.html + +do_configure() { +echo ${S} > /home/nice/sdir + K_VERSION=$(echo ${KERNEL_VERSION} | awk 'BEGIN{FS="."}{print $3}') + cd ${S} + if [ $K_VERSION -ge 24 ] ; then + sed -i 's/CONFIG_AUFS_FAKE_DM\ =\ y/CONFIG_AUFS_FAKE_DM\ =/g' local.mk + fi + if [ $K_VERSION -eq 25 ] || [ $ARCH = "arm" ] ; then + sed -i 's/CONFIG_AUFS_SYSAUFS\ =\ y/CONFIG_AUFS_SYSAUFS\ =/g' local.mk + fi +} + +do_compile(){ + LDFLAGS="" + oe_runmake +} + +do_install() { + install -m 500 -p mount.aufs umount.aufs auplink aulchown ${D}/${sbindir} + mkdir -p ${D}/etc/default + echo FLUSH=ALL > ${D}/etc/default/auplink + mkdir -p ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/ + cp aufs.ko ${D}/${base_libdir}/modules/${KERNEL_VERSION}/drivers/extra/ +} + +pkg_postinst() { +if test "x$D" != "x"; then + exit 1 +else + depmod -ae +fi +} + -- cgit v1.2.3 From f0321ace2384b34a33069eddbd24d755d25a3ca1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 13:19:18 +0000 Subject: xapian-core: update to 1.0.7 --- packages/xapian/xapian-core_1.0.7.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/xapian/xapian-core_1.0.7.bb diff --git a/packages/xapian/xapian-core_1.0.7.bb b/packages/xapian/xapian-core_1.0.7.bb new file mode 100644 index 0000000000..289cae4ead --- /dev/null +++ b/packages/xapian/xapian-core_1.0.7.bb @@ -0,0 +1,16 @@ +DESCRPITION = "Open Source Search Engine Library" +HOMEPAGE = "http://xapian.org" +SECTION = "devel/libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "zlib" +PR = "r0" + +SRC_URI = "http://www.oligarchy.co.uk/xapian/${PV}/xapian-core-${PV}.tar.gz" + +inherit autotools + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From 0f5cb2adb11a4e26a87888c6c7be433d7470f3f2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 13:54:51 +0000 Subject: python-xappy: add 0.5 --- packages/python/python-xappy_0.5.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/python/python-xappy_0.5.bb diff --git a/packages/python/python-xappy_0.5.bb b/packages/python/python-xappy_0.5.bb new file mode 100644 index 0000000000..d257905896 --- /dev/null +++ b/packages/python/python-xappy_0.5.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "The xappy python module is an easy-to-use interface to the Xapian search engine" +LICENSE = "GPLv2" + +DEPENDS += "xapian-core" + +SRC_URI = "http://xappy.googlecode.com/files/xappy-${PV}.tar.gz" + +inherit distutils + +S = "${WORKDIR}/xappy-${PV}" + +do_stage() { + distutils_stage_all +} + -- cgit v1.2.3 From 0cca56e0c65a4d32e49ca726181f28759cac9a96 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 14:00:21 +0000 Subject: sugar-datastore: add 0.82 --- packages/sugar/sugar-datastore_0.82.0.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/sugar/sugar-datastore_0.82.0.bb diff --git a/packages/sugar/sugar-datastore_0.82.0.bb b/packages/sugar/sugar-datastore_0.82.0.bb new file mode 100644 index 0000000000..918a8d01e8 --- /dev/null +++ b/packages/sugar/sugar-datastore_0.82.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Sugar datastore" +LICENSE = "GPLv2" + +PR = "r0" + +DEPENDS = "sugar-toolkit python-xappy " +RDEPENDS = "sugar-toolkit sugar-base python-xappy" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-datastore/${PN}-${PV}.tar.bz2" + +inherit autotools distutils-base + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + + +FILES_${PN} += "${datadir}/dbus-1" -- cgit v1.2.3 From 9a05084a4d58bd67ac02ab7f591fe8bcd1931356 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 15:40:55 +0000 Subject: gphoto2: update to 2.4.2 and fix libtool 2.x issues --- packages/gphoto2/gphoto2_2.4.0.bb | 2 +- packages/gphoto2/gphoto2_2.4.2.bb | 14 +++++++++++++ packages/gphoto2/libgphoto2_2.1.4.bb | 29 ++++++++++++++++++++++++++ packages/gphoto2/libgphoto2_2.1.5.bb | 32 +++++++++++++++++++++++++++++ packages/gphoto2/libgphoto2_2.1.6.bb | 36 +++++++++++++++++++++++++++++++++ packages/gphoto2/libgphoto2_2.4.2.bb | 31 ++++++++++++++++++++++++++++ packages/libgphoto2/libgphoto2_2.1.4.bb | 29 -------------------------- packages/libgphoto2/libgphoto2_2.1.5.bb | 32 ----------------------------- packages/libgphoto2/libgphoto2_2.1.6.bb | 36 --------------------------------- 9 files changed, 143 insertions(+), 98 deletions(-) create mode 100644 packages/gphoto2/gphoto2_2.4.2.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.4.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.5.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.6.bb create mode 100644 packages/gphoto2/libgphoto2_2.4.2.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.1.4.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.1.5.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.1.6.bb diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb index 6bc1a42f9e..996edb25a0 100644 --- a/packages/gphoto2/gphoto2_2.4.0.bb +++ b/packages/gphoto2/gphoto2_2.4.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" +DEPENDS = "libtool libgphoto2 popt" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" diff --git a/packages/gphoto2/gphoto2_2.4.2.bb b/packages/gphoto2/gphoto2_2.4.2.bb new file mode 100644 index 0000000000..996edb25a0 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.4.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libtool libgphoto2 popt" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/gphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb new file mode 100644 index 0000000000..fed7c41e40 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.4.bb @@ -0,0 +1,29 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/gphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb new file mode 100644 index 0000000000..67efc38785 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.5.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/gphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb new file mode 100644 index 0000000000..ad57ba8cf1 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.6.bb @@ -0,0 +1,36 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r6" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} +PACKAGES =+ "libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" +RDEPENDS_libgphoto2 = "libgphoto2-camlibs" + diff --git a/packages/gphoto2/libgphoto2_2.4.2.bb b/packages/gphoto2/libgphoto2_2.4.2.bb new file mode 100644 index 0000000000..991f3ec759 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.4.2.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "libtool jpeg libusb libexif" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +inherit autotools pkgconfig lib_package + +OE_LT_RPATH_ALLOW=":${libdir}:" +OE_LT_RPATH_ALLOW[export]="1" + +EXTRA_OECONF = " --with-drivers=all ac_cv_lib_ltdl_lt_dlcaller_register=yes" + +PACKAGES =+ "libgphotoport libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" +RDEPENDS_${PN} = "libgphoto2-camlibs" + +FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" + +FILES_${PN} += "${libdir}/udev/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/libgphoto2/libgphoto2_2.1.4.bb deleted file mode 100644 index fed7c41e40..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/libgphoto2/libgphoto2_2.1.5.bb deleted file mode 100644 index 67efc38785..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb deleted file mode 100644 index ad57ba8cf1..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} -PACKAGES =+ "libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" -RDEPENDS_libgphoto2 = "libgphoto2-camlibs" - -- cgit v1.2.3 From 282080022fd318c6239f9723e789be33655fe056 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 16:48:53 +0000 Subject: gnome-panel: update to 2.22.2 libgweather: dep for gnome-panel --- packages/gnome/gnome-panel_2.22.2.bb | 21 +++++++++++++++++++++ packages/gnome/libgweather_2.22.3.bb | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 packages/gnome/gnome-panel_2.22.2.bb create mode 100644 packages/gnome/libgweather_2.22.3.bb diff --git a/packages/gnome/gnome-panel_2.22.2.bb b/packages/gnome/gnome-panel_2.22.2.bb new file mode 100644 index 0000000000..b5f207a632 --- /dev/null +++ b/packages/gnome/gnome-panel_2.22.2.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL" +DEPENDS = "libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" + +inherit gnome pkgconfig + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +FILES_${PN} =+ "${datadir}/gnome* \ + ${datadir}/icons" + +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgweather_2.22.3.bb b/packages/gnome/libgweather_2.22.3.bb new file mode 100644 index 0000000000..83fe45eb41 --- /dev/null +++ b/packages/gnome/libgweather_2.22.3.bb @@ -0,0 +1,21 @@ +LICENSE = "LGPL" +DEPENDS = "libgnome" + +inherit gnome + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +FILES_${PN} =+ "${datadir}/gnome* \ + ${datadir}/icons" + +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From 9b9b0aa0ef830ad6a4da5c0681d2a4d557d3dd0c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 Sep 2008 17:02:16 +0000 Subject: sane-backends: update to 1.0.19 and fix libtool issues --- packages/sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 - .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 -- packages/sane/sane-backends-1.0.17/saned.xinetd | 10 - packages/sane/sane-backends-1.0.19/.mtn2git_empty | 0 .../sane/sane-backends-1.0.19/Makefile.in.patch | 11 + packages/sane/sane-backends-1.0.19/byteorder.m4 | 354 ++++++++++ .../sane/sane-backends-1.0.19/sane-plustek.patch | 52 ++ .../sane/sane-backends-1.0.19/sane-symbols.diff | 11 + packages/sane/sane-backends-1.0.19/saned.xinetd | 10 + packages/sane/sane-backends-1.0.19/stdint.m4 | 734 +++++++++++++++++++++ packages/sane/sane-backends_1.0.17.bb | 42 -- packages/sane/sane-backends_1.0.19.bb | 54 ++ 13 files changed, 1226 insertions(+), 115 deletions(-) delete mode 100644 packages/sane/sane-backends-1.0.17/.mtn2git_empty delete mode 100644 packages/sane/sane-backends-1.0.17/Makefile.in.patch delete mode 100644 packages/sane/sane-backends-1.0.17/sane-plustek.patch delete mode 100644 packages/sane/sane-backends-1.0.17/saned.xinetd create mode 100644 packages/sane/sane-backends-1.0.19/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.19/Makefile.in.patch create mode 100644 packages/sane/sane-backends-1.0.19/byteorder.m4 create mode 100644 packages/sane/sane-backends-1.0.19/sane-plustek.patch create mode 100644 packages/sane/sane-backends-1.0.19/sane-symbols.diff create mode 100644 packages/sane/sane-backends-1.0.19/saned.xinetd create mode 100644 packages/sane/sane-backends-1.0.19/stdint.m4 delete mode 100644 packages/sane/sane-backends_1.0.17.bb create mode 100644 packages/sane/sane-backends_1.0.19.bb diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch deleted file mode 100644 index d73a2f0fb5..0000000000 --- a/packages/sane/sane-backends-1.0.17/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 -+++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 -@@ -33,7 +33,7 @@ - - @SET_MAKE@ - --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend tools po - - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ - ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch deleted file mode 100644 index f6920c6e22..0000000000 --- a/packages/sane/sane-backends-1.0.17/sane-plustek.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 -+++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 -@@ -106,17 +106,20 @@ - #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) - - /* useful for RGB-values */ -+#define PACKED8 __attribute__ ((packed,aligned(1))) -+#define PACKED16 __attribute__ ((packed,aligned(2))) -+ - typedef struct { - u_char Red; - u_char Green; - u_char Blue; --} RGBByteDef, *pRGBByteDef; -+} PACKED8 RGBByteDef, *pRGBByteDef; - - typedef struct { - u_short Red; - u_short Green; - u_short Blue; --} RGBUShortDef, *pRGBUShortDef; -+} PACKED16 RGBUShortDef, *pRGBUShortDef; - - typedef struct { - u_long Red; -@@ -126,22 +129,22 @@ - - typedef struct { - u_char a_bColor[3]; --} ColorByteDef, *pColorByteDef; -+} PACKED8 ColorByteDef, *pColorByteDef; - - typedef struct { - u_char bHi; - u_char bLo; --} HiLoDef, *pHiLoDef; -+} PACKED8 HiLoDef, *pHiLoDef; - - typedef union { - HiLoDef HiLo[3]; - u_short Colors[3]; --} ColorWordDef, *pColorWordDef; -+} PACKED16 ColorWordDef, *pColorWordDef; - - typedef union { - HiLoDef HiLo; - u_short Mono; --} MonoWordDef, *pMonoWordDef; -+} PACKED16 MonoWordDef, *pMonoWordDef; - - typedef union { - diff --git a/packages/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd deleted file mode 100644 index f4e890fdbe..0000000000 --- a/packages/sane/sane-backends-1.0.17/saned.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service sane-port -{ - socket_type = stream - server = /usr/sbin/saned - protocol = tcp - user = nobody - group = nogroup - wait = no - disable = no -} diff --git a/packages/sane/sane-backends-1.0.19/.mtn2git_empty b/packages/sane/sane-backends-1.0.19/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.19/Makefile.in.patch b/packages/sane/sane-backends-1.0.19/Makefile.in.patch new file mode 100644 index 0000000000..d73a2f0fb5 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/Makefile.in.patch @@ -0,0 +1,11 @@ +--- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 ++++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 +@@ -33,7 +33,7 @@ + + @SET_MAKE@ + +-SUBDIRS = include lib sanei backend frontend tools doc po ++SUBDIRS = include lib sanei backend frontend tools po + + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ + ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/sane/sane-backends-1.0.19/byteorder.m4 b/packages/sane/sane-backends-1.0.19/byteorder.m4 new file mode 100644 index 0000000000..693f939b7d --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/byteorder.m4 @@ -0,0 +1,354 @@ +dnl AC_NEED_BYTEORDER_H ( HEADER-TO-GENERATE ) +dnl Copyright 2001-2002 by Dan Fandrich +dnl This file may be copied and used freely without restrictions. No warranty +dnl is expressed or implied. +dnl +dnl Create a header file that guarantees that byte swapping macros of the +dnl ntohl variety as well as the extended types included in OpenBSD and +dnl NetBSD such as le32toh are defined. If possible, the standard ntohl +dnl are overloaded as they are optimized for the given platform, but when +dnl this is not possible (e.g. on a big-endian machine) they are defined +dnl in this file. + +dnl Look for a symbol in a header file +dnl AC_HAVE_SYMBOL ( IDENTIFIER, HEADER-FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND ) +AC_DEFUN([AC_HAVE_SYMBOL], +[ +AC_MSG_CHECKING(for $1 in $2) +AC_EGREP_CPP([symbol is present|\<$1\>],[ +#include <$2> +#ifdef $1 + symbol is present +#endif + ], +[AC_MSG_RESULT(yes) +$3 +], +[AC_MSG_RESULT(no) +$4 +])]) + + +dnl Create a header file that defines extended byte swapping macros +AC_DEFUN([AC_NEED_BYTEORDER_H], +[ +changequote(, )dnl +ac_dir=`echo $1|sed 's%/[^/][^/]*$%%'` +changequote([, ])dnl +if test "$ac_dir" != "$1" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" +fi + +# We're only interested in the target CPU, but it's not always set +effective_target="$target" +if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then + effective_target="$host" +fi +AC_SUBST(effective_target) + +cat > "$1" << EOF +/* This file is generated automatically by configure */ +/* It is valid only for the system type ${effective_target} */ + +#ifndef __BYTEORDER_H +#define __BYTEORDER_H + +EOF + +dnl First, do an endian check +AC_C_BIGENDIAN + +dnl Look for NetBSD-style extended byte swapping macros +AC_HAVE_SYMBOL(le32toh,machine/endian.h, + [HAVE_LE32TOH=1 + cat >> "$1" << EOF +/* extended byte swapping macros are already available */ +#include + +EOF], + +[ + +dnl Look for standard byte swapping macros +AC_HAVE_SYMBOL(ntohl,arpa/inet.h, + [cat >> "$1" << EOF +/* ntohl and relatives live here */ +#include + +EOF], + + [AC_HAVE_SYMBOL(ntohl,netinet/in.h, + [cat >> "$1" << EOF +/* ntohl and relatives live here */ +#include + +EOF],true)]) +]) + +dnl Look for generic byte swapping macros + +dnl OpenBSD +AC_HAVE_SYMBOL(swap32,machine/endian.h, + [cat >> "$1" << EOF +/* swap32 and swap16 are defined in machine/endian.h */ + +EOF], + + [ +dnl Linux GLIBC + AC_HAVE_SYMBOL(bswap_32,byteswap.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include +#define swap16(x) bswap_16(x) +#define swap32(x) bswap_32(x) +#define swap64(x) bswap_64(x) + +EOF], + + [ +dnl NetBSD + AC_HAVE_SYMBOL(bswap32,machine/endian.h, + dnl We're already including machine/endian.h if this test succeeds + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +EOF + if test "$HAVE_LE32TOH" != "1"; then + echo '#include '>> "$1" + fi +cat >> "$1" << EOF +#define swap16(x) bswap16(x) +#define swap32(x) bswap32(x) +#define swap64(x) bswap64(x) + +EOF], + + [ +dnl FreeBSD + AC_HAVE_SYMBOL(__byte_swap_long,sys/types.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include +#define swap16(x) __byte_swap_word(x) +#define swap32(x) __byte_swap_long(x) +/* No optimized 64 bit byte swapping macro is available */ +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF], + + [ +dnl OS X + AC_HAVE_SYMBOL(NXSwapLong,machine/byte_order.h, + [cat >> "$1" << EOF +/* Define generic byte swapping functions */ +#include +#define swap16(x) NXSwapShort(x) +#define swap32(x) NXSwapLong(x) +#define swap64(x) NXSwapLongLong(x) + +EOF], + [ + if test $ac_cv_c_bigendian = yes; then + cat >> "$1" << EOF +/* No other byte swapping functions are available on this big-endian system */ +#define swap16(x) ((uint16_t)(((x) << 8) | ((uint16_t)(x) >> 8))) +#define swap32(x) ((uint32_t)(((uint32_t)(x) << 24) & 0xff000000UL | \\ + ((uint32_t)(x) << 8) & 0x00ff0000UL | \\ + ((x) >> 8) & 0x0000ff00UL | \\ + ((x) >> 24) & 0x000000ffUL)) +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF + else + cat >> "$1" << EOF +/* Use these as generic byteswapping macros on this little endian system */ +#define swap16(x) ntohs(x) +#define swap32(x) ntohl(x) +/* No optimized 64 bit byte swapping macro is available */ +#define swap64(x) ((uint64_t)(((uint64_t)(x) << 56) & 0xff00000000000000ULL | \\ + ((uint64_t)(x) << 40) & 0x00ff000000000000ULL | \\ + ((uint64_t)(x) << 24) & 0x0000ff0000000000ULL | \\ + ((uint64_t)(x) << 8) & 0x000000ff00000000ULL | \\ + ((x) >> 8) & 0x00000000ff000000ULL | \\ + ((x) >> 24) & 0x0000000000ff0000ULL | \\ + ((x) >> 40) & 0x000000000000ff00ULL | \\ + ((x) >> 56) & 0x00000000000000ffULL)) + +EOF + fi +]) + ]) + ]) + ]) +]) + + +[ +if test "$HAVE_LE32TOH" != "1"; then + cat >> "$1" << EOF +/* The byte swapping macros have the form: */ +/* EENN[a]toh or htoEENN[a] where EE is be (big endian) or */ +/* le (little-endian), NN is 16 or 32 (number of bits) and a, */ +/* if present, indicates that the endian side is a pointer to an */ +/* array of uint8_t bytes instead of an integer of the specified length. */ +/* h refers to the host's ordering method. */ + +/* So, to convert a 32-bit integer stored in a buffer in little-endian */ +/* format into a uint32_t usable on this machine, you could use: */ +/* uint32_t value = le32atoh(&buf[3]); */ +/* To put that value back into the buffer, you could use: */ +/* htole32a(&buf[3], value); */ + +/* Define aliases for the standard byte swapping macros */ +/* Arguments to these macros must be properly aligned on natural word */ +/* boundaries in order to work properly on all architectures */ +#define htobe16(x) htons(x) +#define htobe32(x) htonl(x) +#define be16toh(x) ntohs(x) +#define be32toh(x) ntohl(x) + +#define HTOBE16(x) (x) = htobe16(x) +#define HTOBE32(x) (x) = htobe32(x) +#define BE32TOH(x) (x) = be32toh(x) +#define BE16TOH(x) (x) = be16toh(x) + +EOF + + if test $ac_cv_c_bigendian = yes; then + cat >> "$1" << EOF +/* Define our own extended byte swapping macros for big-endian machines */ +#define htole16(x) swap16(x) +#define htole32(x) swap32(x) +#define le16toh(x) swap16(x) +#define le32toh(x) swap32(x) + +#define htobe64(x) (x) +#define be64toh(x) (x) + +#define HTOLE16(x) (x) = htole16(x) +#define HTOLE32(x) (x) = htole32(x) +#define LE16TOH(x) (x) = le16toh(x) +#define LE32TOH(x) (x) = le32toh(x) + +#define HTOBE64(x) (void) (x) +#define BE64TOH(x) (void) (x) + +EOF + else + cat >> "$1" << EOF +/* On little endian machines, these macros are null */ +#define htole16(x) (x) +#define htole32(x) (x) +#define htole64(x) (x) +#define le16toh(x) (x) +#define le32toh(x) (x) +#define le64toh(x) (x) + +#define HTOLE16(x) (void) (x) +#define HTOLE32(x) (void) (x) +#define HTOLE64(x) (void) (x) +#define LE16TOH(x) (void) (x) +#define LE32TOH(x) (void) (x) +#define LE64TOH(x) (void) (x) + +/* These don't have standard aliases */ +#define htobe64(x) swap64(x) +#define be64toh(x) swap64(x) + +#define HTOBE64(x) (x) = htobe64(x) +#define BE64TOH(x) (x) = be64toh(x) + +EOF + fi +fi + +cat >> "$1" << EOF +/* Define the C99 standard length-specific integer types */ +#include <_stdint.h> + +EOF + +case "${effective_target}" in + i[3456]86-*) + cat >> "$1" << EOF +/* Here are some macros to create integers from a byte array */ +/* These are used to get and put integers from/into a uint8_t array */ +/* with a specific endianness. This is the most portable way to generate */ +/* and read messages to a network or serial device. Each member of a */ +/* packet structure must be handled separately. */ + +/* The i386 and compatibles can handle unaligned memory access, */ +/* so use the optimized macros above to do this job */ +#define be16atoh(x) be16toh(*(uint16_t*)(x)) +#define be32atoh(x) be32toh(*(uint32_t*)(x)) +#define be64atoh(x) be64toh(*(uint64_t*)(x)) +#define le16atoh(x) le16toh(*(uint16_t*)(x)) +#define le32atoh(x) le32toh(*(uint32_t*)(x)) +#define le64atoh(x) le64toh(*(uint64_t*)(x)) + +#define htobe16a(a,x) *(uint16_t*)(a) = htobe16(x) +#define htobe32a(a,x) *(uint32_t*)(a) = htobe32(x) +#define htobe64a(a,x) *(uint64_t*)(a) = htobe64(x) +#define htole16a(a,x) *(uint16_t*)(a) = htole16(x) +#define htole32a(a,x) *(uint32_t*)(a) = htole32(x) +#define htole64a(a,x) *(uint64_t*)(a) = htole64(x) + +EOF + ;; + + *) + cat >> "$1" << EOF +/* Here are some macros to create integers from a byte array */ +/* These are used to get and put integers from/into a uint8_t array */ +/* with a specific endianness. This is the most portable way to generate */ +/* and read messages to a network or serial device. Each member of a */ +/* packet structure must be handled separately. */ + +/* Non-optimized but portable macros */ +#define be16atoh(x) ((uint16_t)(((x)[0]<<8)|(x)[1])) +#define be32atoh(x) ((uint32_t)(((x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3])) +#define be64atoh(x) ((uint64_t)(((x)[0]<<56)|((x)[1]<<48)|((x)[2]<<40)| \\ + ((x)[3]<<32)|((x)[4]<<24)|((x)[5]<<16)|((x)[6]<<8)|(x)[7])) +#define le16atoh(x) ((uint16_t)(((x)[1]<<8)|(x)[0])) +#define le32atoh(x) ((uint32_t)(((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) +#define le64atoh(x) ((uint64_t)(((x)[7]<<56)|((x)[6]<<48)|((x)[5]<<40)| \\ + ((x)[4]<<32)|((x)[3]<<24)|((x)[2]<<16)|((x)[1]<<8)|(x)[0])) + +#define htobe16a(a,x) (a)[0]=(uint8_t)((x)>>8), (a)[1]=(uint8_t)(x) +#define htobe32a(a,x) (a)[0]=(uint8_t)((x)>>24), (a)[1]=(uint8_t)((x)>>16), \\ + (a)[2]=(uint8_t)((x)>>8), (a)[3]=(uint8_t)(x) +#define htobe64a(a,x) (a)[0]=(uint8_t)((x)>>56), (a)[1]=(uint8_t)((x)>>48), \\ + (a)[2]=(uint8_t)((x)>>40), (a)[3]=(uint8_t)((x)>>32), \\ + (a)[4]=(uint8_t)((x)>>24), (a)[5]=(uint8_t)((x)>>16), \\ + (a)[6]=(uint8_t)((x)>>8), (a)[7]=(uint8_t)(x) +#define htole16a(a,x) (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) +#define htole32a(a,x) (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\ + (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) +#define htole64a(a,x) (a)[7]=(uint8_t)((x)>>56), (a)[6]=(uint8_t)((x)>>48), \\ + (a)[5]=(uint8_t)((x)>>40), (a)[4]=(uint8_t)((x)>>32), \\ + (a)[3]=(uint8_t)((x)>>24), (a)[2]=(uint8_t)((x)>>16), \\ + (a)[1]=(uint8_t)((x)>>8), (a)[0]=(uint8_t)(x) + +EOF + ;; +esac +] + +cat >> "$1" << EOF +#endif /*__BYTEORDER_H*/ +EOF]) diff --git a/packages/sane/sane-backends-1.0.19/sane-plustek.patch b/packages/sane/sane-backends-1.0.19/sane-plustek.patch new file mode 100644 index 0000000000..f6920c6e22 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/sane-plustek.patch @@ -0,0 +1,52 @@ +--- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 ++++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 +@@ -106,17 +106,20 @@ + #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) + + /* useful for RGB-values */ ++#define PACKED8 __attribute__ ((packed,aligned(1))) ++#define PACKED16 __attribute__ ((packed,aligned(2))) ++ + typedef struct { + u_char Red; + u_char Green; + u_char Blue; +-} RGBByteDef, *pRGBByteDef; ++} PACKED8 RGBByteDef, *pRGBByteDef; + + typedef struct { + u_short Red; + u_short Green; + u_short Blue; +-} RGBUShortDef, *pRGBUShortDef; ++} PACKED16 RGBUShortDef, *pRGBUShortDef; + + typedef struct { + u_long Red; +@@ -126,22 +129,22 @@ + + typedef struct { + u_char a_bColor[3]; +-} ColorByteDef, *pColorByteDef; ++} PACKED8 ColorByteDef, *pColorByteDef; + + typedef struct { + u_char bHi; + u_char bLo; +-} HiLoDef, *pHiLoDef; ++} PACKED8 HiLoDef, *pHiLoDef; + + typedef union { + HiLoDef HiLo[3]; + u_short Colors[3]; +-} ColorWordDef, *pColorWordDef; ++} PACKED16 ColorWordDef, *pColorWordDef; + + typedef union { + HiLoDef HiLo; + u_short Mono; +-} MonoWordDef, *pMonoWordDef; ++} PACKED16 MonoWordDef, *pMonoWordDef; + + typedef union { + diff --git a/packages/sane/sane-backends-1.0.19/sane-symbols.diff b/packages/sane/sane-backends-1.0.19/sane-symbols.diff new file mode 100644 index 0000000000..268c50bac0 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/sane-symbols.diff @@ -0,0 +1,11 @@ +--- /tmp/Makefile.in 2008-09-01 18:46:13.000000000 +0200 ++++ sane-backends-1.0.19/frontend/Makefile.in 2008-09-01 18:46:31.773198000 +0200 +@@ -98,7 +98,7 @@ + $(LIBS) + + scanimage: $(SCAN_OBJS) $(LIBSANE) $(LIBLIB) +- @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANE) $(LIBS) ++ @$(LIBTOOL) $(MLINK) $(LINK) $(SCAN_OBJS) $(LIBLIB) $(LIBSANEI) $(LIBSANE) $(LIBSANEI) $(LIBS) + + # tstbackend is not compiled by default. + # To compile it, add tstbackend to BINPROGS. diff --git a/packages/sane/sane-backends-1.0.19/saned.xinetd b/packages/sane/sane-backends-1.0.19/saned.xinetd new file mode 100644 index 0000000000..f4e890fdbe --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/saned.xinetd @@ -0,0 +1,10 @@ +service sane-port +{ + socket_type = stream + server = /usr/sbin/saned + protocol = tcp + user = nobody + group = nogroup + wait = no + disable = no +} diff --git a/packages/sane/sane-backends-1.0.19/stdint.m4 b/packages/sane/sane-backends-1.0.19/stdint.m4 new file mode 100644 index 0000000000..f95b28c773 --- /dev/null +++ b/packages/sane/sane-backends-1.0.19/stdint.m4 @@ -0,0 +1,734 @@ +dnl AC_NEED_STDINT_H ( HEADER-TO-GENERATE ) +dnl Copyright 2001-2002 by Dan Fandrich +dnl This file may be copied and used freely without restrictions. No warranty +dnl is expressed or implied. +dnl +dnl Look for a header file that defines size-specific integer types like the +dnl ones recommended to be in stdint.h in the C99 standard (e.g. uint32_t). +dnl This is a dumbed-down version of the macro of the same name in the file +dnl ac_need_stdint_h.m4 which is part of the ac-archive, available at +dnl (also, another macro +dnl AC_CREATE_STDINT_H by the same author). This version is not as smart, +dnl but works on older autoconf versions and has a different license. + +dnl AX_CHECK_DEFINED_TYPE ( TYPE, FILE, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND ) +dnl This is similar to _AC_CHECK_TYPE_NEW (a.k.a. new syntax version of +dnl AC_CHECK_TYPE) in autoconf 2.50 but works on older versions +AC_DEFUN([AX_CHECK_DEFINED_TYPE], +[AC_MSG_CHECKING([for $1 in $2]) +AC_EGREP_CPP(changequote(<<,>>)dnl +<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl +changequote([,]), [#include <$2>], +ac_cv_type_$1=yes, ac_cv_type_$1=no)dnl +AC_MSG_RESULT($ac_cv_type_$1) +if test $ac_cv_type_$1 = yes; then + $3 +else + $4 +fi +]) + +dnl Look for a header file that defines size-specific integer types +AC_DEFUN([AX_NEED_STDINT_H], +[ +changequote(, )dnl +ac_dir=`echo "$1"|sed 's%/[^/][^/]*$%%'` +changequote([, ])dnl +if test "$ac_dir" != "$1" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" +fi + +AX_CHECK_DEFINED_TYPE(uint8_t, +stdint.h, +[ +cat > "$1" < +EOF], +[AX_CHECK_DEFINED_TYPE(uint8_t, +inttypes.h, +[cat > "$1" < +EOF], +[AX_CHECK_DEFINED_TYPE(uint8_t, +sys/types.h, +[cat > "$1" < +EOF], +[AX_CHECK_DEFINED_TYPE(u_int8_t, +sys/types.h, +[cat > "$1" < +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; +EOF + +AX_CHECK_DEFINED_TYPE(u_int64_t, +sys/types.h, +[cat >> "$1" <> "$1" <]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + done + AC_MSG_CHECKING([for stdint uintptr_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_O],[ +AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ + ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[inttypes.h sys/inttypes.h stdint.h]) ; do + unset ac_cv_type_uint32_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + break; + done + AC_MSG_CHECKING([for stdint uint32_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_U],[ +AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ + ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[sys/types.h inttypes.h sys/inttypes.h]) ; do + unset ac_cv_type_u_int32_t + unset ac_cv_type_u_int64_t + AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$1],[$1]) break + break; + done + AC_MSG_CHECKING([for stdint u_int32_t]) + ]) +]) + +AC_DEFUN([AX_CREATE_STDINT_H], +[# ------ AX CREATE STDINT H ------------------------------------- +AC_MSG_CHECKING([for stdint types]) +ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` +# try to shortcircuit - if the default include path of the compiler +# can find a "stdint.h" header then we assume that all compilers can. +AC_CACHE_VAL([ac_cv_header_stdint_t],[ +old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +old_CFLAGS="$CFLAGS" ; CFLAGS="" +AC_TRY_COMPILE([#include ],[int_least32_t v = 0;], +[ac_cv_stdint_result="(assuming C99 compatible system)" + ac_cv_header_stdint_t="stdint.h"; ], +[ac_cv_header_stdint_t=""]) +CXXFLAGS="$old_CXXFLAGS" +CPPFLAGS="$old_CPPFLAGS" +CFLAGS="$old_CFLAGS" ]) + +v="... $ac_cv_header_stdint_h" +if test "$ac_stdint_h" = "stdint.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) +elif test "$ac_stdint_h" = "inttypes.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) +elif test "_$ac_cv_header_stdint_t" = "_" ; then + AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) +else + ac_cv_header_stdint="$ac_cv_header_stdint_t" + AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) +fi + +if test "_$ac_cv_header_stdint_t" = "_" ; then # can not shortcircuit.. + +dnl .....intro message done, now do a few system checks..... +dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type, +dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW +dnl instead that is triggered with 3 or more arguments (see types.m4) + +inttype_headers=`echo $2 | sed -e 's/,/ /g'` + +ac_cv_stdint_result="(no helpful system typedefs seen)" +AX_CHECK_HEADER_STDINT_X(dnl + stdint.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen uintptr_t$and64 in $i)") + +if test "_$ac_cv_header_stdint_x" = "_" ; then +AX_CHECK_HEADER_STDINT_O(dnl, + inttypes.h sys/inttypes.h stdint.h $inttype_headers, + ac_cv_stdint_result="(seen uint32_t$and64 in $i)") +fi + +if test "_$ac_cv_header_stdint_x" = "_" ; then +if test "_$ac_cv_header_stdint_o" = "_" ; then +AX_CHECK_HEADER_STDINT_U(dnl, + sys/types.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen u_int32_t$and64 in $i)") +fi fi + +dnl if there was no good C99 header file, do some typedef checks... +if test "_$ac_cv_header_stdint_x" = "_" ; then + AC_MSG_CHECKING([for stdint datatype model]) + AC_MSG_RESULT([(..)]) + AX_CHECK_DATA_MODEL +fi + +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_x" +elif test "_$ac_cv_header_stdint_o" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_o" +elif test "_$ac_cv_header_stdint_u" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_u" +else + ac_cv_header_stdint="stddef.h" +fi + +AC_MSG_CHECKING([for extra inttypes in chosen header]) +AC_MSG_RESULT([($ac_cv_header_stdint)]) +dnl see if int_least and int_fast types are present in _this_ header. +unset ac_cv_type_int_least32_t +unset ac_cv_type_int_fast32_t +AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) +AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) +AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) + +fi # shortcircut to system "stdint.h" +# ------------------ PREPARE VARIABLES ------------------------------ +if test "$GCC" = "yes" ; then +ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` +else +ac_cv_stdint_message="using $CC" +fi + +AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl +$ac_cv_stdint_result]) + +dnl ----------------------------------------------------------------- +# ----------------- DONE inttypes.h checks START header ------------- +AC_CONFIG_COMMANDS([$ac_stdint_h],[ +AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) +ac_stdint=$tmp/_stdint.h + +echo "#ifndef" $_ac_stdint_h >$ac_stdint +echo "#define" $_ac_stdint_h "1" >>$ac_stdint +echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint +echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint +if test "_$ac_cv_header_stdint_t" != "_" ; then +echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint +echo "#include " >>$ac_stdint +echo "#endif" >>$ac_stdint +echo "#endif" >>$ac_stdint +else + +cat >>$ac_stdint < +#else +#include + +/* .................... configured part ............................ */ + +STDINT_EOF + +echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_header="$ac_cv_header_stdint_x" + echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint +fi + +echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_o" != "_" ; then + ac_header="$ac_cv_header_stdint_o" + echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint +fi + +echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint +if test "_$ac_cv_header_stdint_u" != "_" ; then + ac_header="$ac_cv_header_stdint_u" + echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint +fi + +echo "" >>$ac_stdint + +if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then + echo "#include <$ac_header>" >>$ac_stdint + echo "" >>$ac_stdint +fi fi + +echo "/* which 64bit typedef has been found */" >>$ac_stdint +if test "$ac_cv_type_uint64_t" = "yes" ; then +echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint +fi +if test "$ac_cv_type_u_int64_t" = "yes" ; then +echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* which type model has been detected */" >>$ac_stdint +if test "_$ac_cv_char_data_model" != "_" ; then +echo "#define _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint +echo "#define _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint +else +echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint +echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* whether int_least types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_least32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint +fi +echo "/* whether int_fast types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_fast32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint +fi +echo "/* whether intmax_t type was detected */" >>$ac_stdint +if test "$ac_cv_type_intmax_t" = "yes"; then +echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + + cat >>$ac_stdint <= 199901L +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; + +#elif !defined __STRICT_ANSI__ +#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ +#define _HAVE_UINT64_T +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ +/* note: all ELF-systems seem to have loff-support which needs 64-bit */ +#if !defined _NO_LONGLONG +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; +#endif + +#elif defined __alpha || (defined __mips && defined _ABIN32) +#if !defined _NO_LONGLONG +typedef long int64_t; +typedef unsigned long uint64_t; +#endif + /* compiler/cpu type to define int64_t */ +#endif +#endif +#endif + +#if defined _STDINT_HAVE_U_INT_TYPES +/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; + +/* glibc compatibility */ +#ifndef __int8_t_defined +#define __int8_t_defined +#endif +#endif + +#ifdef _STDINT_NEED_INT_MODEL_T +/* we must guess all the basic types. Apart from byte-adressable system, */ +/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ +/* (btw, those nibble-addressable systems are way off, or so we assume) */ + +dnl /* have a look at "64bit and data size neutrality" at */ +dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ +dnl /* (the shorthand "ILP" types always have a "P" part) */ + +#if defined _STDINT_BYTE_MODEL +#if _STDINT_LONG_MODEL+0 == 242 +/* 2:4:2 = IP16 = a normal 16-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef long int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 +/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ +/* 4:4:4 = ILP32 = a normal 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 +/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ +/* 4:8:8 = LP64 = a normal 64-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* this system has a "long" of 64bit */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +typedef unsigned long uint64_t; +typedef long int64_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 448 +/* LLP64 a 64-bit system derived from a 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* assuming the system has a "long long" */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef unsigned long long uint64_t; +typedef long long int64_t; +#endif +#else +#define _STDINT_NO_INT32_T +#endif +#else +#define _STDINT_NO_INT8_T +#define _STDINT_NO_INT32_T +#endif +#endif + +/* + * quote from SunOS-5.8 sys/inttypes.h: + * Use at your own risk. As of February 1996, the committee is squarely + * behind the fixed sized types; the "least" and "fast" types are still being + * discussed. The probability that the "fast" types may be removed before + * the standard is finalized is high enough that they are not currently + * implemented. + */ + +#if defined _STDINT_NEED_INT_LEAST_T +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_least64_t; +#endif + +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_least64_t; +#endif + /* least types */ +#endif + +#if defined _STDINT_NEED_INT_FAST_T +typedef int8_t int_fast8_t; +typedef int int_fast16_t; +typedef int32_t int_fast32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_fast64_t; +#endif + +typedef uint8_t uint_fast8_t; +typedef unsigned uint_fast16_t; +typedef uint32_t uint_fast32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_fast64_t; +#endif + /* fast types */ +#endif + +#ifdef _STDINT_NEED_INTMAX_T +#ifdef _HAVE_UINT64_T +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; +#else +typedef long intmax_t; +typedef unsigned long uintmax_t; +#endif +#endif + +#ifdef _STDINT_NEED_INTPTR_T +#ifndef __intptr_t_defined +#define __intptr_t_defined +/* we encourage using "long" to store pointer values, never use "int" ! */ +#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 +typedef unsinged int uintptr_t; +typedef int intptr_t; +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 +typedef unsigned long uintptr_t; +typedef long intptr_t; +#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ +typedef unsigned long uintptr_t; +typedef long intptr_t; +#endif +#endif +#endif + +/* The ISO C99 standard specifies that in C++ implementations these + should only be defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS +#ifndef UINT32_C + +/* Signed. */ +# define INT8_C(c) c +# define INT16_C(c) c +# define INT32_C(c) c +# ifdef _HAVE_LONGLONG_UINT64_T +# define INT64_C(c) c ## L +# else +# define INT64_C(c) c ## LL +# endif + +/* Unsigned. */ +# define UINT8_C(c) c ## U +# define UINT16_C(c) c ## U +# define UINT32_C(c) c ## U +# ifdef _HAVE_LONGLONG_UINT64_T +# define UINT64_C(c) c ## UL +# else +# define UINT64_C(c) c ## ULL +# endif + +/* Maximal type. */ +# ifdef _HAVE_LONGLONG_UINT64_T +# define INTMAX_C(c) c ## L +# define UINTMAX_C(c) c ## UL +# else +# define INTMAX_C(c) c ## LL +# define UINTMAX_C(c) c ## ULL +# endif + + /* literalnumbers */ +#endif +#endif + +/* These limits are merily those of a two complement byte-oriented system */ + +/* Minimum of signed integral types. */ +# define INT8_MIN (-128) +# define INT16_MIN (-32767-1) +# define INT32_MIN (-2147483647-1) +# define INT64_MIN (-__INT64_C(9223372036854775807)-1) +/* Maximum of signed integral types. */ +# define INT8_MAX (127) +# define INT16_MAX (32767) +# define INT32_MAX (2147483647) +# define INT64_MAX (__INT64_C(9223372036854775807)) + +/* Maximum of unsigned integral types. */ +# define UINT8_MAX (255) +# define UINT16_MAX (65535) +# define UINT32_MAX (4294967295U) +# define UINT64_MAX (__UINT64_C(18446744073709551615)) + +/* Minimum of signed integral types having a minimum size. */ +# define INT_LEAST8_MIN INT8_MIN +# define INT_LEAST16_MIN INT16_MIN +# define INT_LEAST32_MIN INT32_MIN +# define INT_LEAST64_MIN INT64_MIN +/* Maximum of signed integral types having a minimum size. */ +# define INT_LEAST8_MAX INT8_MAX +# define INT_LEAST16_MAX INT16_MAX +# define INT_LEAST32_MAX INT32_MAX +# define INT_LEAST64_MAX INT64_MAX + +/* Maximum of unsigned integral types having a minimum size. */ +# define UINT_LEAST8_MAX UINT8_MAX +# define UINT_LEAST16_MAX UINT16_MAX +# define UINT_LEAST32_MAX UINT32_MAX +# define UINT_LEAST64_MAX UINT64_MAX + + /* shortcircuit*/ +#endif + /* once */ +#endif +#endif +STDINT_EOF +fi + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then + AC_MSG_NOTICE([$ac_stdint_h is unchanged]) + else + ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` + AS_MKDIR_P(["$ac_dir"]) + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +],[# variables for create stdint.h replacement +PACKAGE="$PACKAGE" +VERSION="$VERSION" +ac_stdint_h="$ac_stdint_h" +_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) +ac_cv_stdint_message="$ac_cv_stdint_message" +ac_cv_header_stdint_t="$ac_cv_header_stdint_t" +ac_cv_header_stdint_x="$ac_cv_header_stdint_x" +ac_cv_header_stdint_o="$ac_cv_header_stdint_o" +ac_cv_header_stdint_u="$ac_cv_header_stdint_u" +ac_cv_type_uint64_t="$ac_cv_type_uint64_t" +ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" +ac_cv_char_data_model="$ac_cv_char_data_model" +ac_cv_long_data_model="$ac_cv_long_data_model" +ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" +ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" +ac_cv_type_intmax_t="$ac_cv_type_intmax_t" +]) +]) diff --git a/packages/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb deleted file mode 100644 index 4854f4d10c..0000000000 --- a/packages/sane/sane-backends_1.0.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Scanner drivers for SANE" -DEPENDS = "gphoto2 jpeg libusb" -LICENSE = "LGPL" - -PR = "r2" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ - file://Makefile.in.patch;patch=1 \ - file://saned.xinetd \ - " - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--disable-translations" - -do_install_append() { - install -d "${D}/${sysconfdir}/xinetd.d" - install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" - install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" -} - -PACKAGES =+ "libsane libsane-dev saned sane-utils" - -FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" -RRECOMMENDS_libsane = "saned sane-utils" -FILES_libsane-dev += "${libdir}/sane/*" - -RRECOMMENDS_saned = "xinetd" -FILES_saned = "${sbindir}/saned" - -FILES_sane-utils = "${bindir}/*" -FILES_${PN}-dbg += "${libdir}/sane/.debug" - - -CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" - -do_stage() { - autotools_stage_all -} - - - diff --git a/packages/sane/sane-backends_1.0.19.bb b/packages/sane/sane-backends_1.0.19.bb new file mode 100644 index 0000000000..95ce49ede0 --- /dev/null +++ b/packages/sane/sane-backends_1.0.19.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Scanner drivers for SANE" +DEPENDS = "hal gphoto2 jpeg libusb" +LICENSE = "LGPL" + +SRC_URI = "http://alioth.debian.org/frs/download.php/2318/sane-backends-${PV}.tar.gz \ + file://Makefile.in.patch;patch=1 \ + file://saned.xinetd \ + file://byteorder.m4 \ + file://stdint.m4 \ + file://sane-symbols.diff;patch=1 \ + " + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--disable-translations" + +do_configure_prepend() { + mkdir -p ${S}/m4 + cp ${STAGING_DATADIR}/aclocal/libtool.m4 ${S}/m4/ + cp ${WORKDIR}/*.m4 ${S}/m4/ +} + +PARALLEL_MAKE = "" +do_compile_prepend() { + ln -sf ${S}/${TARGET_PREFIX}libtool ${S}/libtool +} + +do_install_append() { + install -d "${D}/${sysconfdir}/xinetd.d" + install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" + install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" +} + +PACKAGES =+ "libsane libsane-dev saned sane-utils" + +FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" +RRECOMMENDS_libsane = "saned sane-utils" +FILES_libsane-dev += "${libdir}/sane/*" + +RRECOMMENDS_saned = "xinetd" +FILES_saned = "${sbindir}/saned" + +FILES_sane-utils = "${bindir}/*" +FILES_${PN}-dbg += "${libdir}/sane/.debug" + + +CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" + +do_stage() { + autotools_stage_all +} + + + -- cgit v1.2.3 From 2bad67782e38ad0dc2f27a956dbb933ae4bbd32c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 1 Sep 2008 18:03:25 +0000 Subject: tslib 1.0 remove all traces of tslib-input_raw-grab_events patch. This patch was too invasive and has been solved in the Openmoko kernel otherwise. Bump linux-openmoko-devel to catch up with the necessary changes in kernel. NOTE: linux-openmoko will be broken until upstream merges the unbreak-grab patch. --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/tslib/tslib/om-gta01/ts.conf | 2 +- packages/tslib/tslib/om-gta02/ts.conf | 2 +- packages/tslib/tslib/ts.conf | 2 +- .../tslib/tslib/tslib-input_raw-grab_events.patch | 120 --------------------- packages/tslib/tslib_1.0.bb | 24 +++-- 6 files changed, 17 insertions(+), 135 deletions(-) delete mode 100644 packages/tslib/tslib/tslib-input_raw-grab_events.patch diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5fb4dece1f..2e8dcb3690 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -79,7 +79,7 @@ SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e" -SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" +SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" diff --git a/packages/tslib/tslib/om-gta01/ts.conf b/packages/tslib/tslib/om-gta01/ts.conf index 82f712ef41..1b0da937e8 100644 --- a/packages/tslib/tslib/om-gta01/ts.conf +++ b/packages/tslib/tslib/om-gta01/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=1 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/om-gta02/ts.conf b/packages/tslib/tslib/om-gta02/ts.conf index 82f712ef41..1b0da937e8 100644 --- a/packages/tslib/tslib/om-gta02/ts.conf +++ b/packages/tslib/tslib/om-gta02/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=1 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/ts.conf b/packages/tslib/tslib/ts.conf index 1abde2fc7f..1b0da937e8 100644 --- a/packages/tslib/tslib/ts.conf +++ b/packages/tslib/tslib/ts.conf @@ -1,5 +1,5 @@ # Uncomment if you wish to use the linux input layer event interface -module_raw input grab_events=0 +module_raw input # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d # module_raw collie diff --git a/packages/tslib/tslib/tslib-input_raw-grab_events.patch b/packages/tslib/tslib/tslib-input_raw-grab_events.patch deleted file mode 100644 index 4bd0a05531..0000000000 --- a/packages/tslib/tslib/tslib-input_raw-grab_events.patch +++ /dev/null @@ -1,120 +0,0 @@ -This patch adds support for "EVIOCGRAB" on the input device, which -tells the kernel _not_ to deliver events of the touchscreen to -/dev/input/mice. - -This is probably what most people want, since unprocessed raw touchscreen -events should not be converted to emulated PS/2 mouse movements. - -Signed-off-by: Harald Welte - -Index: a/plugins/input-raw.c -=================================================================== ---- a/plugins/input-raw.c (revision 49) -+++ b/plugins/input-raw.c (working copy) -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - #include - #ifdef HAVE_UNISTD_H -@@ -33,6 +34,9 @@ - - #include "tslib-private.h" - -+#define GRAB_EVENTS_WANTED 1 -+#define GRAB_EVENTS_ACTIVE 2 -+ - struct tslib_input { - struct tslib_module_info module; - -@@ -42,6 +46,7 @@ - - int sane_fd; - int using_syn; -+ int grab_events; - }; - - static int check_fd(struct tslib_input *i) -@@ -64,6 +69,14 @@ - - if (bit & (1 << EV_SYN)) - i->using_syn = 1; -+ -+ if (i->grab_events == GRAB_EVENTS_WANTED) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) { -+ fprintf(stderr, "Unable to grab selected input device\n"); -+ return -1; -+ } -+ i->grab_events = GRAB_EVENTS_ACTIVE; -+ } - - return 0; - } -@@ -222,6 +235,15 @@ - - static int ts_input_fini(struct tslib_module_info *inf) - { -+ struct tslib_input *i = (struct tslib_input *)inf; -+ struct tsdev *ts = inf->dev; -+ -+ if (i->grab_events == GRAB_EVENTS_ACTIVE) { -+ if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) { -+ fprintf(stderr, "Unable to un-grab selected input device\n"); -+ } -+ } -+ - free(inf); - return 0; - } -@@ -231,6 +253,36 @@ - .fini = ts_input_fini, - }; - -+static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data) -+{ -+ struct tslib_input *i = (struct tslib_input *)inf; -+ unsigned long v; -+ int err = errno; -+ -+ v = strtoul(str, NULL, 0); -+ -+ if (v == ULONG_MAX && errno == ERANGE) -+ return -1; -+ -+ errno = err; -+ switch ((int)data) { -+ case 1: -+ if (v) -+ i->grab_events = GRAB_EVENTS_WANTED; -+ break; -+ default: -+ return -1; -+ } -+ return 0; -+} -+ -+static const struct tslib_vars raw_vars[] = -+{ -+ { "grab_events", (void *)1, parse_raw_grab }, -+}; -+ -+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) -+ - TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) - { - struct tslib_input *i; -@@ -245,5 +297,12 @@ - i->current_p = 0; - i->sane_fd = 0; - i->using_syn = 0; -+ i->grab_events = 0; -+ -+ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { -+ free(i); -+ return NULL; -+ } -+ - return &(i->module); - } diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb index 6fa0b3fccc..c707eecb27 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -3,18 +3,20 @@ HOMEPAGE = "http://tslib.berlios.de/" AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" +PR = "r20" -PR = "r19" - -SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ - file://tslib-input_raw-grab_events.patch;patch=1 \ - file://fix_version.patch;patch=1 \ - file://ts.conf \ - file://ts.conf-simpad-2.4 \ - file://ts.conf-collie-2.4 \ - file://tslib.sh" -SRC_URI_append_mnci += " file://devfs.patch;patch=1" -SRC_URI_append_mnci += " file://event1.patch;patch=1" +SRC_URI = "\ + http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ + file://fix_version.patch;patch=1 \ + file://ts.conf \ + file://ts.conf-simpad-2.4 \ + file://ts.conf-collie-2.4 \ + file://tslib.sh \ +" +SRC_URI_append_mnci += "\ + file://devfs.patch;patch=1 \ + file://event1.patch;patch=1 \ +" inherit autotools pkgconfig -- cgit v1.2.3 From 754959a5d8683ad7bb10b87e8042d9edcc3a53fe Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 1 Sep 2008 18:10:32 +0000 Subject: sane-srcrevs.inc: bump neod as per tslib input event grab patches --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5fb4dece1f..7baa18781c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -96,7 +96,7 @@ SRCREV_pn-mplayer ?= "27380" SRCREV_pn-mplayer-maemo ?= "342" SRCREV_pn-multitap-pad ?= "373" SRCREV_pn-navit ?= "1096" -SRCREV_pn-neod ?= "4336" +SRCREV_pn-neod ?= "4617" SRCREV_pn-netsurf ?= "3859" SRCREV_pn-networkmanager ?= "3202" SRCREV_pn-networkmanager-applet ?= "200" -- cgit v1.2.3 From 0146a4619c7980803cfeb4cc6b468ee232b33c2e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 1 Sep 2008 22:36:06 +0000 Subject: remove linux-openmoko 2.6.22.5 --- packages/linux/linux-openmoko_2.6.22.5.bb | 71 ------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 packages/linux/linux-openmoko_2.6.22.5.bb diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb deleted file mode 100644 index e099e7db95..0000000000 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ /dev/null @@ -1,71 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x kernel for FIC SmartPhones shipping w/ Openmoko" -VANILLA_VERSION = "2.6.22" -KERNEL_RELEASE = "2.6.22.5" - -# If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" - -PV = "${KERNEL_RELEASE}-moko11+svnr${SRCREV}" -PR = "r13" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ - svn://svn.openmoko.org/trunk/src/target/kernel;module=patches;proto=http \ - file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ - file://fix-gta01-flowcontrol2-2.6.22.5.patch;patch=1 \ - file://gta02-sound.patch;patch=1 \ - file://soc-core-suspend.patch;patch=1 \ - file://iis-suspend.patch;patch=1 \ - file://s3c24xx-pcm-suspend.patch;patch=1 \ - file://gta-vibro-pwm-suspend.patch;patch=1 \ - file://defconfig-${KERNEL_RELEASE}" - -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'om-gta01|om-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" - -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch - -- cgit v1.2.3 From 782d02a1bf03416213b5290f01886fb8fb5b7b80 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 08:22:57 +0000 Subject: ffmpeg: move improved staging method from _git to .inc --- packages/ffmpeg/ffmpeg.inc | 76 +++++++++++++++++++++++++++++++++++++++++++ packages/ffmpeg/ffmpeg_git.bb | 75 +----------------------------------------- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index aab2c62fa9..44e00e6764 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -26,6 +26,49 @@ EXTRA_OECONF = "\ \ " +do_stage() { + for lib in libavcodec libavdevice libavformat \ + libavutil libpostproc libswscale + do + oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true + install -d ${STAGING_INCDIR}/$lib + done + + install -d ${STAGING_INCDIR}/ffmpeg + + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h + install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h + install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h + + install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h + + for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h + do + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h + install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h + done + + for h in adler32.h avstring.h avutil.h base64.h bswap.h \ + common.h crc.h fifo.h integer.h intfloat_readwrite.h \ + log.h lzo.h mathematics.h md5.h mem.h random.h \ + rational.h sha1.h + do + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h + install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h + done + + install -d ${STAGING_INCDIR}/libswscale/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ + install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ + + install -d ${STAGING_INCDIR}/libpostproc + install -d ${STAGING_INCDIR}/postproc + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h + install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h +} + + PACKAGES += "${PN}-vhook-dbg ${PN}-vhook" FILES_${PN} = "${bindir}" @@ -33,3 +76,36 @@ FILES_${PN}-dev = "${includedir}/${PN}" FILES_${PN}-vhook = "${libdir}/vhook" FILES_${PN}-vhook-dbg += "${libdir}/vhook/.debug" + + +PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \ + libavdevice libavdevice-dev libavdevice-dbg \ + libavformat libavformat-dev libavformat-dbg \ + libavutil libavutil-dev libavutil-dbg \ + libpostproc libpostproc-dev libpostproc-dbg \ + libswscale libswscale-dev libswscale-dbg" + +FILES_${PN}-dev = "${includedir}" +FILES_libavcodec = "${libdir}/libavcodec*.so.*" +FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a" +FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*" + +FILES_libavdevice = "${libdir}/libavdevice*.so.*" +FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a" +FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*" + +FILES_libavformat = "${libdir}/libavformat*.so.*" +FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a" +FILES_libavformat-dbg += "${libdir}/.debug/libavformat*" + +FILES_libavutil = "${libdir}/libavutil*.so.*" +FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a" +FILES_libavutil-dbg += "${libdir}/.debug/libavutil*" + +FILES_libpostproc = "${libdir}/libpostproc*.so.*" +FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc" +FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*" + +FILES_libswscale = "${libdir}/libswscale*.so.*" +FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a" +FILES_libswscale-dbg += "${libdir}/.debug/libswscale*" diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index b8bebebd0b..2bd61240b0 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -56,83 +56,10 @@ EXTRA_OECONF = " \ do_configure() { sed -i -e s:'check_cflags -std=c99'::g ${S}/configure - cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true + cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true mkdir -p ${B} cd ${B} ${S}/configure ${EXTRA_OECONF} sed -i -e s:Os:O4:g ${B}/config.h } -do_stage() { - for lib in libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale - do - oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true - install -d ${STAGING_INCDIR}/$lib - done - - install -d ${STAGING_INCDIR}/ffmpeg - - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/ffmpeg/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/ffmpeg/opt.h - install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h - install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h - - install -m 0644 ${S}/libavdevice/avdevice.h ${STAGING_INCDIR}/ffmpeg/avdevice.h - - for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h - do - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavformat/$h ${STAGING_INCDIR}/libavformat/$h - done - - for h in adler32.h avstring.h avutil.h base64.h bswap.h \ - common.h crc.h fifo.h integer.h intfloat_readwrite.h \ - log.h lzo.h mathematics.h md5.h mem.h random.h \ - rational.h sha1.h - do - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/ffmpeg/$h - install -m 0644 ${S}/libavutil/$h ${STAGING_INCDIR}/libavutil/$h - done - - install -d ${STAGING_INCDIR}/libswscale/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/ - install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/ - - install -d ${STAGING_INCDIR}/libpostproc - install -d ${STAGING_INCDIR}/postproc - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h - install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/postproc/postprocess.h -} - -PACKAGES += "libavcodec libavcodec-dev libavcodec-dbg \ - libavdevice libavdevice-dev libavdevice-dbg \ - libavformat libavformat-dev libavformat-dbg \ - libavutil libavutil-dev libavutil-dbg \ - libpostproc libpostproc-dev libpostproc-dbg \ - libswscale libswscale-dev libswscale-dbg" - -FILES_${PN}-dev = "${includedir}" -FILES_libavcodec = "${libdir}/libavcodec*.so.*" -FILES_libavcodec-dev = "${libdir}/libavcodec*.so ${libdir}/pkgconfig/libavcodec.pc ${libdir}/libavcodec*.a" -FILES_libavcodec-dbg += "${libdir}/.debug/libavcodec*" - -FILES_libavdevice = "${libdir}/libavdevice*.so.*" -FILES_libavdevice-dev = "${libdir}/libavdevice*.so ${libdir}/pkgconfig/libavdevice.pc ${libdir}/libavdevice*.a" -FILES_libavdevice-dbg += "${libdir}/.debug/libavdevice*" - -FILES_libavformat = "${libdir}/libavformat*.so.*" -FILES_libavformat-dev = "${libdir}/libavformat*.so ${libdir}/pkgconfig/libavformat.pc ${libdir}/libavformat*.a" -FILES_libavformat-dbg += "${libdir}/.debug/libavformat*" - -FILES_libavutil = "${libdir}/libavutil*.so.*" -FILES_libavutil-dev = "${libdir}/libavutil*.so ${libdir}/pkgconfig/libavutil.pc ${libdir}/libavutil*.a" -FILES_libavutil-dbg += "${libdir}/.debug/libavutil*" - -FILES_libpostproc = "${libdir}/libpostproc*.so.*" -FILES_libpostproc-dev = "${libdir}/libpostproc*.so ${libdir}/pkgconfig/libpostproc.pc ${libdir}/libpostproc*.a ${includedir}/postproc" -FILES_libpostproc-dbg += "${libdir}/.debug/libpostproc*" - -FILES_libswscale = "${libdir}/libswscale*.so.*" -FILES_libswscale-dev = "${libdir}/libswscale*.so ${libdir}/pkgconfig/libswscale.pc ${libdir}/libswscale*.a" -FILES_libswscale-dbg += "${libdir}/.debug/libswscale*" -- cgit v1.2.3 From 0a98f71c8131f2df6e759e06cd81d4513e742e58 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 08:30:06 +0000 Subject: angstrom feed builder: more tweaks --- contrib/angstrom/build-feeds.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index dab687e291..0f6597454a 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -1,34 +1,33 @@ #!/bin/bash -DO_UCLIBC=1 +DO_UCLIBC=0 do_build() { - echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf + #echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf BUILD_MODE="glibc" if [ "$BUILD_CLEAN" != "" ] then - bitbake -c clean $BUILD_CLEAN + MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN fi for target in $BUILD_TARGETS do - bitbake $target && do_report_success + MACHINE=$BUILD_MACHINE bitbake $target && do_report_success done if [ $DO_UCLIBC = 1 ] then BUILD_MODE="uclibc" - echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf if [ "$BUILD_CLEAN" != "" ] then - bitbake -c clean $BUILD_CLEAN + ANGSTROM_MODE=uclibc MACHINE=$BUILD_MACHINE bitbake -c clean $BUILD_CLEAN fi for target in $BUILD_TARGETS do - bitbake $target && do_report_success + ANGSTROM_MODE=uclibc MACHINE=$BUILD_MACHINE bitbake $target && do_report_success done fi } @@ -38,7 +37,7 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 +for machine in gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" -- cgit v1.2.3 From 41c19448c31f90f0f0a31b31dee3ba14ebbc5977 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 11:17:52 +0000 Subject: ffmpeg git: make default for avr32 --- packages/ffmpeg/ffmpeg_git.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 2bd61240b0..12c8a2c7d3 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,18 +3,19 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r29" +PR = "r30" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" DEFAULT_PREFERENCE_armv6 = "1" DEFAULT_PREFERENCE_armv7a = "1" +DEFAULT_PREFERENCE_avr32 = "1" FFBRANCH_arm = "arm" FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes -SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" +SRCREV = "b06c88bbec744970e023a03abed314f10d6936da" SRCREV_arm = "2a56b3705935a53fb48d605340095fb462d6acc5" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3 From d1cf4ab9116fbea812d339d7f06c631927a446e4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 13:56:26 +0000 Subject: gnas-minimal: add ffmpeg support --- packages/gnash/gnash-minimal.inc | 14 +++++++++----- packages/gnash/gnash-minimal_0.8.2.bb | 2 +- packages/gnash/gnash-minimal_0.8.3.bb | 2 +- packages/gnash/gnash-minimal_cvs.bb | 4 ++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 9845638663..86c4a4278e 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 featu HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "virtual/libiconv virtual/libintl libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" +DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" RDEPENDS = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" @@ -30,19 +30,23 @@ EXTRA_OECONF="--enable-gui=gtk \ --disable-expat \ --enable-mad \ --disable-gstreamer \ - --disable-cairo \ + --enable-media=ffmpeg \ --disable-plugin \ --disable-cygnal \ - --disable-testsuite \ + --disable-testsuite \ --enable-maintainer-mode \ --enable-fps-debug \ --enable-allstatic \ --with-top-level=${STAGING_DIR_HOST}/usr \ - " + --disable-ltdl-install \ + --without-included-ltdl \ +# --with-ltdl-include=${STAGING_INCDIR} \ +# --with-ltdl-lib=${STAGING_LIBDIR} \ +" # the test for error_t is wrong for uclibc, needs _GNU_SOURCE for correct # detection because uclibc does not have argz.h which enables error_t -CFLAGS += " -D_GNU_SOURCE " +CFLAGS += " -D_GNU_SOURCE -I${S}/libltdl -I${STAGING_INCDIR}/libltdl" PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" diff --git a/packages/gnash/gnash-minimal_0.8.2.bb b/packages/gnash/gnash-minimal_0.8.2.bb index b5a9ca35a9..1c6065e74e 100644 --- a/packages/gnash/gnash-minimal_0.8.2.bb +++ b/packages/gnash/gnash-minimal_0.8.2.bb @@ -1,3 +1,3 @@ require gnash-minimal.inc -PR = "r1" +PR = "r2" diff --git a/packages/gnash/gnash-minimal_0.8.3.bb b/packages/gnash/gnash-minimal_0.8.3.bb index 55748151c5..237097b94a 100644 --- a/packages/gnash/gnash-minimal_0.8.3.bb +++ b/packages/gnash/gnash-minimal_0.8.3.bb @@ -1,6 +1,6 @@ require gnash-minimal.inc -PR = "r7" +PR = "r8" EXTRA_OECONF += " --without-included-ltdl \ --with-ltdl-include=${STAGING_INCDIR} \ diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index 73a7e8f9b2..ba9e2afb67 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -1,6 +1,10 @@ require gnash-minimal.inc + +PR = "r1" + PV = "0.8.3+cvs${SRCDATE}" SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" +SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1" S = ${WORKDIR}/gnash -- cgit v1.2.3 From c826cf9b7488b54130e7df6887851a7db2e9fed9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 14:50:48 +0000 Subject: gnash-minimal cvs: fix missing trunc() definition, https://savannah.gnu.org/bugs/?24188 --- packages/gnash/files/fix-trunc.diff | 13 +++++++++++++ packages/gnash/gnash-minimal_cvs.bb | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 packages/gnash/files/fix-trunc.diff diff --git a/packages/gnash/files/fix-trunc.diff b/packages/gnash/files/fix-trunc.diff new file mode 100644 index 0000000000..a01ca311d0 --- /dev/null +++ b/packages/gnash/files/fix-trunc.diff @@ -0,0 +1,13 @@ +--- /tmp/utility.h 2008-09-02 16:35:44.000000000 +0200 ++++ gnash/libbase/utility.h 2008-09-02 16:36:10.000000000 +0200 +@@ -327,6 +327,10 @@ + #endif + } + ++#ifndef HAVE_TRUNC ++inline double trunc(double x) { return (x < 0 ? -(std::floor(-x)) : std::floor(x)); } ++#endif ++ + #endif // UTILITY_H + + diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb index ba9e2afb67..992998bf55 100644 --- a/packages/gnash/gnash-minimal_cvs.bb +++ b/packages/gnash/gnash-minimal_cvs.bb @@ -6,5 +6,15 @@ PR = "r1" PV = "0.8.3+cvs${SRCDATE}" SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash" -SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1" +SRC_URI += "file://libtool-2.2.patch;patch=1 \ + file://libintl.patch;patch=1 \ + file://fix-trunc.diff;patch=1" + S = ${WORKDIR}/gnash + + +do_configure_prepend() { + sed -i -e 's:dnl AC_CHECK_LIB(m, trunc:AC_CHECK_LIB(m, trunc:g' ${S}/configure.ac +} + + -- cgit v1.2.3 From 86d0e7b062ff037adb68f7de6f4c43dd9bb82157 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 19:13:12 +0000 Subject: bluez-utils: reenable hidd --- packages/bluez/bluez-utils_3.33.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/bluez/bluez-utils_3.33.bb b/packages/bluez/bluez-utils_3.33.bb index dc0ee8e739..314a83620d 100644 --- a/packages/bluez/bluez-utils_3.33.bb +++ b/packages/bluez/bluez-utils_3.33.bb @@ -1,12 +1,13 @@ require bluez-utils3.inc -PR = "r1" +PR = "r2" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ --enable-bccmd \ --enable-hid2hci \ - --disable-alsa \ + --enable-hidd \ + --disable-alsa \ --disable-cups \ --enable-glib \ --disable-sdpd \ -- cgit v1.2.3 From f1a9b3c832e23031e7393e8636d3d19bf7aaed82 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 20:46:15 +0000 Subject: ffmpeg: bump SRCREV gst-ffmpeg, libomxil: bump PR --- packages/ffmpeg/ffmpeg_git.bb | 4 ++-- packages/gstreamer/gst-ffmpeg_0.10.4.bb | 2 +- packages/openmax/libomxil-bellagio_0.9.0.bb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 12c8a2c7d3..7f7b6cdba2 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r30" +PR = "r31" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" @@ -16,7 +16,7 @@ FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes SRCREV = "b06c88bbec744970e023a03abed314f10d6936da" -SRCREV_arm = "2a56b3705935a53fb48d605340095fb462d6acc5" +SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index 3efccbc3af..f72772a61e 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" LICENSE = "LGPL" HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" -PR = "r4" +PR = "r5" inherit autotools pkgconfig diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb index 1e9eb4f217..ca9e4fbade 100644 --- a/packages/openmax/libomxil-bellagio_0.9.0.bb +++ b/packages/openmax/libomxil-bellagio_0.9.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim LICENSE = "LGPLv2" DEPENDS = "libmad alsa-lib ffmpeg" -PR = "r2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz" -- cgit v1.2.3 From db589754f96fd0671ea7370fbf640f98f2f87c8d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 Sep 2008 21:11:00 +0000 Subject: fennec: add skeletor to build fennec, the mobile browser from mozilla mozilla.bbclass: fixup do_configure --- classes/mozilla.bbclass | 6 +++-- packages/mozilla/fennec/.mtn2git_empty | 0 packages/mozilla/fennec/arm/.mtn2git_empty | 0 packages/mozilla/fennec/arm/mozconfig | 10 +++++++ packages/mozilla/fennec/mozconfig | 25 ++++++++++++++++++ packages/mozilla/fennec_hg.bb | 42 ++++++++++++++++++++++++++++++ 6 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 packages/mozilla/fennec/.mtn2git_empty create mode 100644 packages/mozilla/fennec/arm/.mtn2git_empty create mode 100644 packages/mozilla/fennec/arm/mozconfig create mode 100644 packages/mozilla/fennec/mozconfig create mode 100644 packages/mozilla/fennec_hg.bb diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index 84c83ebe05..c9a3966709 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -38,8 +38,10 @@ mozilla_do_configure() { `dirname $cg`/ done ) - oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ - ${MOZ_OBJDIR}/config.status + if [ -e ${MOZ_OBJDIR}/Makefile ] ; then + oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ + ${MOZ_OBJDIR}/config.status + fi } mozilla_do_compile() { diff --git a/packages/mozilla/fennec/.mtn2git_empty b/packages/mozilla/fennec/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mozilla/fennec/arm/.mtn2git_empty b/packages/mozilla/fennec/arm/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mozilla/fennec/arm/mozconfig b/packages/mozilla/fennec/arm/mozconfig new file mode 100644 index 0000000000..0e25c7e248 --- /dev/null +++ b/packages/mozilla/fennec/arm/mozconfig @@ -0,0 +1,10 @@ +mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir +mk_add_options AUTOCONF=autoconf2.13 + +ac_add_options --disable-javaxpcom + +ac_add_app_options xulrunner --with-arm-kuser +ac_add_app_options xulrunner --enable-application=xulrunner + +ac_add_app_options mobile --enable-application=mobile diff --git a/packages/mozilla/fennec/mozconfig b/packages/mozilla/fennec/mozconfig new file mode 100644 index 0000000000..f4b2c5aa95 --- /dev/null +++ b/packages/mozilla/fennec/mozconfig @@ -0,0 +1,25 @@ +# Options for client.mk. +mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile" +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mobilebase + +# Global options +#ac_add_options --enable-debug +#ac_add_options --disable-optimize +#ac_add_options --enable-logging +#ac_cv_visibility_pragma=no + +#ac_add_options --enable-timeline + +# XULRunner options +ac_add_app_options xulrunner --enable-application=xulrunner +ac_add_app_options xulrunner --disable-javaxpcom + +# mobile options +ac_add_app_options mobile --enable-application=mobile +ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist + +# configure will be automatically generated using the 'autoconf-2.13' +# command. If autoconf-2.13 isn't the right name for your system, as +# is the case on OS X using MacPorts, use the real command name as +# demonstrated below. +mk_add_options AUTOCONF=autoconf2.13 diff --git a/packages/mozilla/fennec_hg.bb b/packages/mozilla/fennec_hg.bb new file mode 100644 index 0000000000..8aeca90f6e --- /dev/null +++ b/packages/mozilla/fennec_hg.bb @@ -0,0 +1,42 @@ +DEPENDS += "cairo" + +PV = "0.0" + +SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=d14db8996980 \ + hg://hg.mozilla.org/;module=mobile-browser;rev=60dd20721284 \ + file://jsautocfg.h \ +" + +S = "${WORKDIR}/mozilla-central" + +inherit mozilla +require firefox.inc + +export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2" +FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" + +do_configure_prepend() { + if [ -e ${WORKDIR}/mobile-browser ] ; then + mv ${WORKDIR}/mobile-browser ${S}/mobile + fi + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure +} + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + install -d ${STAGING_INCDIR}/fennec-${PV} + cd dist/sdk/include + rm -rf obsolete + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/fennec-${PV}/ + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/fennec-${PV}/nsIServiceManager.h +} + -- cgit v1.2.3 From 913c60585ff62d1cfb115e14e957c8a54e61c4e4 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Wed, 3 Sep 2008 08:25:23 +0000 Subject: classpath-native 0.97.2: Removed automake <1.10 incompatible part from autotools patch - added patch to fix bug in java.util.DecimalFormat classpath-minimal 0.97.2: Dito. classpath 0.97.2: Dito. --- packages/classpath/classpath-0.97.2/autotools.patch | 13 ------------- packages/classpath/classpath-minimal-0.97.2/autotools.patch | 13 ------------- packages/classpath/classpath-minimal_0.97.2.bb | 3 ++- packages/classpath/classpath-native-0.97.2/autotools.patch | 13 ------------- packages/classpath/classpath-native_0.97.2.bb | 3 ++- packages/classpath/classpath_0.97.2.bb | 3 ++- packages/classpath/files/autotools.patch | 13 ------------- 7 files changed, 6 insertions(+), 55 deletions(-) diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-0.97.2/autotools.patch +++ b/packages/classpath/classpath-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-minimal-0.97.2/autotools.patch +++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb index 5e6d53224e..8a87d1f636 100644 --- a/packages/classpath/classpath-minimal_0.97.2.bb +++ b/packages/classpath/classpath-minimal_0.97.2.bb @@ -6,9 +6,10 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ " -PR = "r1" +PR = "r2" PROVIDES = "${PN} classpath" diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch index 3df65cf892..e36e143b5f 100644 --- a/packages/classpath/classpath-native-0.97.2/autotools.patch +++ b/packages/classpath/classpath-native-0.97.2/autotools.patch @@ -11,16 +11,3 @@ Index: classpath-0.97.2/configure.ac dnl ----------------------------------------------------------- dnl Enable collections.jar (disabled by default) dnl ----------------------------------------------------------- -Index: classpath-0.97.2/Makefile.am -=================================================================== ---- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 -+++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 -@@ -5,7 +5,7 @@ - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - - # Allow users to pass site-specific flags to autoreconf via an env var. --ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} -+ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} - - native: lib - diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index c9a239418b..499ad9f5fb 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -1,6 +1,6 @@ require classpath-native.inc -PR = "r1" +PR = "r2" # The code affected by the javanet-local patch # is usually not compiled. However if someone changes @@ -12,5 +12,6 @@ SRC_URI += "\ file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ " diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index 1393e2c453..5267222104 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -6,9 +6,10 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ " -PR = "r2" +PR = "r3" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch index baae366d5f..663c0340cd 100644 --- a/packages/classpath/files/autotools.patch +++ b/packages/classpath/files/autotools.patch @@ -22,16 +22,3 @@ Index: classpath-0.93/configure.ac # Handle -Werror default case. if test "$ENABLE_WERROR" = default; then -Index: classpath-0.93/Makefile.am -=================================================================== ---- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100 -+++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200 -@@ -4,7 +4,7 @@ - SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) - DIST_SUBDIRS = lib doc external include native resource scripts tools examples - --ACLOCAL_AMFLAGS = -I m4 -+ACLOCAL_AMFLAGS = -I m4 --install - - native: lib - -- cgit v1.2.3 From 543721ec95621f1b5cb57703d8a52b16bf6041d4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 10:58:42 +0000 Subject: gnash-minimal: don't package libltdl, we have libtool for that --- packages/gnash/gnash-minimal.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/gnash/gnash-minimal.inc b/packages/gnash/gnash-minimal.inc index 86c4a4278e..597f22bd70 100644 --- a/packages/gnash/gnash-minimal.inc +++ b/packages/gnash/gnash-minimal.inc @@ -3,7 +3,6 @@ HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype" -RDEPENDS = "libltdl" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" S = ${WORKDIR}/gnash-${PV} @@ -48,11 +47,10 @@ EXTRA_OECONF="--enable-gui=gtk \ # detection because uclibc does not have argz.h which enables error_t CFLAGS += " -D_GNU_SOURCE -I${S}/libltdl -I${STAGING_INCDIR}/libltdl" -PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl" +PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia" FILES_${PN}-dbg += "${libdir}/gnash/.debug" FILES_${PN}-dev += "${libdir}/gnash/*a" -FILES_libltdl = "${libdir}/gnash/libltdl*.so*" FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so" FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so" FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so" -- cgit v1.2.3 From 4d95876748db57907dff07cb42695b7c5edfdc62 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 10:59:56 +0000 Subject: chromium: add recipe for the google chrome browser * From the website: "Note: There is no working Chromium-based browser on Linux. Although many Chromium submodules build under Linux and a few unit tests pass, all that runs is a command-line 'all tests pass' executable." --- packages/chromium/.mtn2git_empty | 0 packages/chromium/chromium_svn.bb | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 packages/chromium/.mtn2git_empty create mode 100644 packages/chromium/chromium_svn.bb diff --git a/packages/chromium/.mtn2git_empty b/packages/chromium/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/chromium/chromium_svn.bb b/packages/chromium/chromium_svn.bb new file mode 100644 index 0000000000..98f4f10881 --- /dev/null +++ b/packages/chromium/chromium_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Google Chrome browser" +LICENSE = "BSD" + +DEPENDS = "perl-native python-native flex-native gperf-native" + +PV = "0.0+svnr${SRCREV}" + +SRCREV = "1665" +SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http" + +S = "${WORKDIR}/src/chrome" + +do_compile() { + cd ${S} + ../third_party/scons/scons.py Hammer +} -- cgit v1.2.3 From a91d36ab71dc62c24699a04ae807b9314e127522 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 12:16:51 +0000 Subject: gnash: enable ffmpeg and plugin --- packages/gnash/gnash.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index ce66beec45..60162ed1bd 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,8 +1,8 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" HOMEPAGE = "http://www.gnu.org/software/gnash" LICENSE = "GPL-2" -DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" -PR = "r1" +DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" +PR = "r2" SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ " @@ -11,7 +11,7 @@ inherit autotools pkgconfig EXTRA_OECONF = "--enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=none \ + --enable-media=ffmpeg \ --disable-klash \ --enable-z \ --enable-jpeg \ @@ -20,7 +20,7 @@ EXTRA_OECONF = "--enable-gui=gtk \ --enable-expat \ --enable-mad \ --enable-cairo \ - --disable-plugin \ + --enable-plugin \ --disable-cygnal \ --with-top-level=${STAGING_DIR_HOST}/usr \ " -- cgit v1.2.3 From e6d60a638dbeeff8d57561a31d6a6bc0c0c729ea Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 3 Sep 2008 12:44:53 +0000 Subject: bison updated to version 2.3: * required for the latest webkit-gtk (2.0 generates bad code) * version 2.0 kept, as it is listed in preferred-om-2008-versions.inc. --- packages/bison/bison-2.0/.mtn2git_empty | 0 packages/bison/bison-2.0/m4.patch | 589 -------------------------------- packages/bison/bison-native_2.3.bb | 20 ++ packages/bison/bison_2.3.bb | 10 + packages/bison/files/.mtn2git_empty | 0 packages/bison/files/m4.patch | 589 ++++++++++++++++++++++++++++++++ 6 files changed, 619 insertions(+), 589 deletions(-) delete mode 100644 packages/bison/bison-2.0/.mtn2git_empty delete mode 100644 packages/bison/bison-2.0/m4.patch create mode 100644 packages/bison/bison-native_2.3.bb create mode 100644 packages/bison/bison_2.3.bb create mode 100644 packages/bison/files/.mtn2git_empty create mode 100644 packages/bison/files/m4.patch diff --git a/packages/bison/bison-2.0/.mtn2git_empty b/packages/bison/bison-2.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bison/bison-2.0/m4.patch b/packages/bison/bison-2.0/m4.patch deleted file mode 100644 index b62fe89d04..0000000000 --- a/packages/bison/bison-2.0/m4.patch +++ /dev/null @@ -1,589 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- /dev/null -+++ bison-1.875/m4/inttypes-pri.m4 -@@ -0,0 +1,32 @@ -+# inttypes-pri.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+# Define PRI_MACROS_BROKEN if exists and defines the PRI* -+# macros to non-string values. This is the case on AIX 4.3.3. -+ -+AC_DEFUN([gt_INTTYPES_PRI], -+[ -+ AC_REQUIRE([gt_HEADER_INTTYPES_H]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], -+ gt_cv_inttypes_pri_broken, -+ [ -+ AC_TRY_COMPILE([#include -+#ifdef PRId32 -+char *p = PRId32; -+#endif -+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) -+ ]) -+ fi -+ if test "$gt_cv_inttypes_pri_broken" = yes; then -+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, -+ [Define if exists and defines unusable PRI* macros.]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/lcmessage.m4 -@@ -0,0 +1,32 @@ -+# lcmessage.m4 serial 3 (gettext-0.11.3) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper , 1995. -+ -+# Check whether LC_MESSAGES is available in . -+ -+AC_DEFUN([AM_LC_MESSAGES], -+[ -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include ], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your file defines LC_MESSAGES.]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/uintmax_t.m4 -@@ -0,0 +1,29 @@ -+# uintmax_t.m4 serial 6 (gettext-0.11) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_PREREQ(2.13) -+ -+# Define uintmax_t to `unsigned long' or `unsigned long long' -+# if does not exist. -+ -+AC_DEFUN([jm_AC_TYPE_UINTMAX_T], -+[ -+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) -+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then -+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) -+ test $ac_cv_type_unsigned_long_long = yes \ -+ && ac_type='unsigned long long' \ -+ || ac_type='unsigned long' -+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -+ [Define to unsigned long or unsigned long long -+ if and don't define.]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/glibc21.m4 -@@ -0,0 +1,32 @@ -+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# 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 -+#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 -+++ bison-1.875/m4/stdint_h.m4 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/inttypes_h.m4 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/ulonglong.m4 -@@ -0,0 +1,23 @@ -+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -+[ -+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, -+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], -+ [unsigned long long ullmax = (unsigned long long) -1; -+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;], -+ ac_cv_type_unsigned_long_long=yes, -+ ac_cv_type_unsigned_long_long=no)]) -+ if test $ac_cv_type_unsigned_long_long = yes; then -+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, -+ [Define if you have the unsigned long long type.]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/codeset.m4 -@@ -0,0 +1,23 @@ -+# codeset.m4 serial AM1 (gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+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 ], -+ [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 and nl_langinfo(CODESET).]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/intdiv0.m4 -@@ -0,0 +1,72 @@ -+# intdiv0.m4 serial 1 (gettext-0.11.3) -+dnl Copyright (C) 2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gt_INTDIV0], -+[ -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], -+ gt_cv_int_divbyzero_sigfpe, -+ [ -+ AC_TRY_RUN([ -+#include -+#include -+ -+static void -+#ifdef __cplusplus -+sigfpe_handler (int sig) -+#else -+sigfpe_handler (sig) int sig; -+#endif -+{ -+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ -+ exit (sig != SIGFPE); -+} -+ -+int x = 1; -+int y = 0; -+int z; -+int nan; -+ -+int main () -+{ -+ signal (SIGFPE, sigfpe_handler); -+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) -+ signal (SIGTRAP, sigfpe_handler); -+#endif -+/* Linux/SPARC yields signal SIGILL. */ -+#if defined (__sparc__) && defined (__linux__) -+ signal (SIGILL, sigfpe_handler); -+#endif -+ -+ z = x / y; -+ nan = y / y; -+ exit (1); -+} -+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, -+ [ -+ # Guess based on the CPU. -+ case "$host_cpu" in -+ alpha* | i[34567]86 | m68k | s390*) -+ gt_cv_int_divbyzero_sigfpe="guessing yes";; -+ *) -+ gt_cv_int_divbyzero_sigfpe="guessing no";; -+ esac -+ ]) -+ ]) -+ case "$gt_cv_int_divbyzero_sigfpe" in -+ *yes) value=1;; -+ *) value=0;; -+ esac -+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, -+ [Define if integer division by zero raises signal SIGFPE.]) -+]) ---- /dev/null -+++ bison-1.875/m4/glib.m4 -@@ -0,0 +1,196 @@ -+# Configure paths for GLIB -+# Owen Taylor 97-11-3 -+ -+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -+dnl gthread is specified in MODULES, pass to glib-config -+dnl -+AC_DEFUN(AM_PATH_GLIB, -+[dnl -+dnl Get the cflags and libraries from the glib-config script -+dnl -+AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], -+ glib_config_prefix="$withval", glib_config_prefix="") -+AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], -+ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -+AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], -+ , enable_glibtest=yes) -+ -+ if test x$glib_config_exec_prefix != x ; then -+ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" -+ if test x${GLIB_CONFIG+set} != xset ; then -+ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config -+ fi -+ fi -+ if test x$glib_config_prefix != x ; then -+ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" -+ if test x${GLIB_CONFIG+set} != xset ; then -+ GLIB_CONFIG=$glib_config_prefix/bin/glib-config -+ fi -+ fi -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gmodule) -+ glib_config_args="$glib_config_args gmodule" -+ ;; -+ gthread) -+ glib_config_args="$glib_config_args gthread" -+ ;; -+ esac -+ done -+ -+ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) -+ min_glib_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) -+ no_glib="" -+ if test "$GLIB_CONFIG" = "no" ; then -+ no_glib=yes -+ else -+ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` -+ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` -+ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_glibtest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$GLIB_LIBS $LIBS" -+dnl -+dnl Now check if the installed GLIB is sufficiently new. (Also sanity -+dnl checks the results of glib-config to some extent -+dnl -+ rm -f conf.glibtest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.glibtest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_glib_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_glib_version"); -+ exit(1); -+ } -+ -+ if ((glib_major_version != $glib_config_major_version) || -+ (glib_minor_version != $glib_config_minor_version) || -+ (glib_micro_version != $glib_config_micro_version)) -+ { -+ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", -+ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf ("*** was found! If glib-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); -+ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+ else if ((glib_major_version != GLIB_MAJOR_VERSION) || -+ (glib_minor_version != GLIB_MINOR_VERSION) || -+ (glib_micro_version != GLIB_MICRO_VERSION)) -+ { -+ printf("*** GLIB header files (version %d.%d.%d) do not match\n", -+ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ } -+ else -+ { -+ if ((glib_major_version > major) || -+ ((glib_major_version == major) && (glib_minor_version > minor)) || -+ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", -+ glib_major_version, glib_minor_version, glib_micro_version); -+ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the glib-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); -+ printf("*** correct copy of glib-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_glib" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GLIB_CONFIG" = "no" ; then -+ echo "*** The glib-config script installed by GLIB could not be found" -+ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GLIB_CONFIG environment variable to the" -+ echo "*** full path to glib-config." -+ else -+ if test -f conf.glibtest ; then -+ : -+ else -+ echo "*** Could not run GLIB test program, checking why..." -+ CFLAGS="$CFLAGS $GLIB_CFLAGS" -+ LIBS="$LIBS $GLIB_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GLIB or finding the wrong" -+ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GLIB was incorrectly installed" -+ echo "*** or that you have moved GLIB since it was installed. In the latter case, you" -+ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GLIB_CFLAGS="" -+ GLIB_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GLIB_CFLAGS) -+ AC_SUBST(GLIB_LIBS) -+ rm -f conf.glibtest -+]) ---- /dev/null -+++ bison-1.875/m4/inttypes.m4 -@@ -0,0 +1,27 @@ -+# inttypes.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H if exists and doesn't clash with -+# . -+ -+AC_DEFUN([gt_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, -+ [ -+ AC_TRY_COMPILE( -+ [#include -+#include ], -+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) -+ ]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, -+ [Define if exists and doesn't clash with .]) -+ fi -+]) ---- /dev/null -+++ bison-1.875/m4/isc-posix.m4 -@@ -0,0 +1,26 @@ -+# isc-posix.m4 serial 2 (gettext-0.11.2) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -+ -+# This test replaces the one in autoconf. -+# Currently this macro should have the same name as the autoconf macro -+# because gettext's gettext.m4 (distributed in the automake package) -+# still uses it. Otherwise, the use in gettext.m4 makes autoheader -+# give these diagnostics: -+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -+ -+undefine([AC_ISC_POSIX]) -+ -+AC_DEFUN([AC_ISC_POSIX], -+ [ -+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -+ ] -+) diff --git a/packages/bison/bison-native_2.3.bb b/packages/bison/bison-native_2.3.bb new file mode 100644 index 0000000000..ec2f269eec --- /dev/null +++ b/packages/bison/bison-native_2.3.bb @@ -0,0 +1,20 @@ +require bison_${PV}.bb +SECTION = "devel" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}" +S = "${WORKDIR}/bison-${PV}" + +inherit native autotools + +do_stage() { + rm -f ${STAGING_BINDIR}/yacc + rm -f ${STAGING_BINDIR}/bison + install -m 0755 src/bison ${STAGING_BINDIR}/ + cat >${STAGING_BINDIR}/yacc < exists and defines the PRI* ++# macros to non-string values. This is the case on AIX 4.3.3. ++ ++AC_DEFUN([gt_INTTYPES_PRI], ++[ ++ AC_REQUIRE([gt_HEADER_INTTYPES_H]) ++ if test $gt_cv_header_inttypes_h = yes; then ++ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], ++ gt_cv_inttypes_pri_broken, ++ [ ++ AC_TRY_COMPILE([#include ++#ifdef PRId32 ++char *p = PRId32; ++#endif ++], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) ++ ]) ++ fi ++ if test "$gt_cv_inttypes_pri_broken" = yes; then ++ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, ++ [Define if exists and defines unusable PRI* macros.]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/lcmessage.m4 +@@ -0,0 +1,32 @@ ++# lcmessage.m4 serial 3 (gettext-0.11.3) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++dnl ++dnl This file can can be used in projects which are not available under ++dnl the GNU General Public License or the GNU Library General Public ++dnl License but which still want to provide support for the GNU gettext ++dnl functionality. ++dnl Please note that the actual code of the GNU gettext library is covered ++dnl by the GNU Library General Public License, and the rest of the GNU ++dnl gettext package package is covered by the GNU General Public License. ++dnl They are *not* in the public domain. ++ ++dnl Authors: ++dnl Ulrich Drepper , 1995. ++ ++# Check whether LC_MESSAGES is available in . ++ ++AC_DEFUN([AM_LC_MESSAGES], ++[ ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/uintmax_t.m4 +@@ -0,0 +1,29 @@ ++# uintmax_t.m4 serial 6 (gettext-0.11) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++AC_PREREQ(2.13) ++ ++# Define uintmax_t to `unsigned long' or `unsigned long long' ++# if does not exist. ++ ++AC_DEFUN([jm_AC_TYPE_UINTMAX_T], ++[ ++ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) ++ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) ++ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then ++ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) ++ test $ac_cv_type_unsigned_long_long = yes \ ++ && ac_type='unsigned long long' \ ++ || ac_type='unsigned long' ++ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, ++ [Define to unsigned long or unsigned long long ++ if and don't define.]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/glibc21.m4 +@@ -0,0 +1,32 @@ ++# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++# 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 ++#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 ++++ bison-1.875/m4/stdint_h.m4 +@@ -0,0 +1,28 @@ ++# stdint_h.m4 serial 2 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++# Define HAVE_STDINT_H_WITH_UINTMAX if exists, ++# doesn't clash with , and declares uintmax_t. ++ ++AC_DEFUN([jm_AC_HEADER_STDINT_H], ++[ ++ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, ++ [AC_TRY_COMPILE( ++ [#include ++#include ], ++ [uintmax_t i = (uintmax_t) -1;], ++ jm_ac_cv_header_stdint_h=yes, ++ jm_ac_cv_header_stdint_h=no)]) ++ if test $jm_ac_cv_header_stdint_h = yes; then ++ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, ++[Define if exists, doesn't clash with , ++ and declares uintmax_t. ]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/inttypes_h.m4 +@@ -0,0 +1,28 @@ ++# inttypes_h.m4 serial 4 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, ++# doesn't clash with , and declares uintmax_t. ++ ++AC_DEFUN([jm_AC_HEADER_INTTYPES_H], ++[ ++ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, ++ [AC_TRY_COMPILE( ++ [#include ++#include ], ++ [uintmax_t i = (uintmax_t) -1;], ++ jm_ac_cv_header_inttypes_h=yes, ++ jm_ac_cv_header_inttypes_h=no)]) ++ if test $jm_ac_cv_header_inttypes_h = yes; then ++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, ++[Define if exists, doesn't clash with , ++ and declares uintmax_t. ]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/ulonglong.m4 +@@ -0,0 +1,23 @@ ++# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) ++dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], ++[ ++ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, ++ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], ++ [unsigned long long ullmax = (unsigned long long) -1; ++ return ull << i | ull >> i | ullmax / ull | ullmax % ull;], ++ ac_cv_type_unsigned_long_long=yes, ++ ac_cv_type_unsigned_long_long=no)]) ++ if test $ac_cv_type_unsigned_long_long = yes; then ++ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, ++ [Define if you have the unsigned long long type.]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/codeset.m4 +@@ -0,0 +1,23 @@ ++# codeset.m4 serial AM1 (gettext-0.10.40) ++dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++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 ], ++ [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 and nl_langinfo(CODESET).]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/intdiv0.m4 +@@ -0,0 +1,72 @@ ++# intdiv0.m4 serial 1 (gettext-0.11.3) ++dnl Copyright (C) 2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Bruno Haible. ++ ++AC_DEFUN([gt_INTDIV0], ++[ ++ AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_CANONICAL_HOST])dnl ++ ++ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], ++ gt_cv_int_divbyzero_sigfpe, ++ [ ++ AC_TRY_RUN([ ++#include ++#include ++ ++static void ++#ifdef __cplusplus ++sigfpe_handler (int sig) ++#else ++sigfpe_handler (sig) int sig; ++#endif ++{ ++ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ ++ exit (sig != SIGFPE); ++} ++ ++int x = 1; ++int y = 0; ++int z; ++int nan; ++ ++int main () ++{ ++ signal (SIGFPE, sigfpe_handler); ++/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ ++#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) ++ signal (SIGTRAP, sigfpe_handler); ++#endif ++/* Linux/SPARC yields signal SIGILL. */ ++#if defined (__sparc__) && defined (__linux__) ++ signal (SIGILL, sigfpe_handler); ++#endif ++ ++ z = x / y; ++ nan = y / y; ++ exit (1); ++} ++], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, ++ [ ++ # Guess based on the CPU. ++ case "$host_cpu" in ++ alpha* | i[34567]86 | m68k | s390*) ++ gt_cv_int_divbyzero_sigfpe="guessing yes";; ++ *) ++ gt_cv_int_divbyzero_sigfpe="guessing no";; ++ esac ++ ]) ++ ]) ++ case "$gt_cv_int_divbyzero_sigfpe" in ++ *yes) value=1;; ++ *) value=0;; ++ esac ++ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, ++ [Define if integer division by zero raises signal SIGFPE.]) ++]) +--- /dev/null ++++ bison-1.875/m4/glib.m4 +@@ -0,0 +1,196 @@ ++# Configure paths for GLIB ++# Owen Taylor 97-11-3 ++ ++dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or ++dnl gthread is specified in MODULES, pass to glib-config ++dnl ++AC_DEFUN(AM_PATH_GLIB, ++[dnl ++dnl Get the cflags and libraries from the glib-config script ++dnl ++AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], ++ glib_config_prefix="$withval", glib_config_prefix="") ++AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], ++ glib_config_exec_prefix="$withval", glib_config_exec_prefix="") ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ if test x$glib_config_exec_prefix != x ; then ++ glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config ++ fi ++ fi ++ if test x$glib_config_prefix != x ; then ++ glib_config_args="$glib_config_args --prefix=$glib_config_prefix" ++ if test x${GLIB_CONFIG+set} != xset ; then ++ GLIB_CONFIG=$glib_config_prefix/bin/glib-config ++ fi ++ fi ++ ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ glib_config_args="$glib_config_args gmodule" ++ ;; ++ gthread) ++ glib_config_args="$glib_config_args gthread" ++ ;; ++ esac ++ done ++ ++ AC_PATH_PROG(GLIB_CONFIG, glib-config, no) ++ min_glib_version=ifelse([$1], ,0.99.7,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ no_glib="" ++ if test "$GLIB_CONFIG" = "no" ; then ++ no_glib=yes ++ else ++ GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` ++ GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` ++ glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of glib-config to some extent ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ int major, minor, micro; ++ char *tmp_version; ++ ++ system ("touch conf.glibtest"); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If glib-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); ++ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); ++ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); ++ printf("*** required on your system.\n"); ++ printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); ++ printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); ++ printf("*** before re-running configure\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); ++ printf("***\n"); ++ printf("*** If you have already installed a sufficiently new version, this error\n"); ++ printf("*** probably means that the wrong copy of the glib-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); ++ printf("*** correct copy of glib-config. (In this case, you will have to\n"); ++ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); ++ printf("*** so that the correct libraries are found at run-time))\n"); ++ } ++ } ++ return 1; ++} ++],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$GLIB_CONFIG" = "no" ; then ++ echo "*** The glib-config script installed by GLIB could not be found" ++ echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" ++ echo "*** your path, or set the GLIB_CONFIG environment variable to the" ++ echo "*** full path to glib-config." ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" ++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" ++ echo "*** to the installed location Also, make sure you have run ldconfig if that" ++ echo "*** is required on your system" ++ echo "***" ++ echo "*** If you have an old version installed, it is best to remove it, although" ++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ++ echo "***" ++ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" ++ echo "*** came with the system with the command" ++ echo "***" ++ echo "*** rpm --erase --nodeps gtk gtk-devel" ], ++ [ echo "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB was incorrectly installed" ++ echo "*** or that you have moved GLIB since it was installed. In the latter case, you" ++ echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ rm -f conf.glibtest ++]) +--- /dev/null ++++ bison-1.875/m4/inttypes.m4 +@@ -0,0 +1,27 @@ ++# inttypes.m4 serial 1 (gettext-0.11.4) ++dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++dnl From Paul Eggert. ++ ++# Define HAVE_INTTYPES_H if exists and doesn't clash with ++# . ++ ++AC_DEFUN([gt_HEADER_INTTYPES_H], ++[ ++ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, ++ [ ++ AC_TRY_COMPILE( ++ [#include ++#include ], ++ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) ++ ]) ++ if test $gt_cv_header_inttypes_h = yes; then ++ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, ++ [Define if exists and doesn't clash with .]) ++ fi ++]) +--- /dev/null ++++ bison-1.875/m4/isc-posix.m4 +@@ -0,0 +1,26 @@ ++# isc-posix.m4 serial 2 (gettext-0.11.2) ++dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. ++dnl This file is free software, distributed under the terms of the GNU ++dnl General Public License. As a special exception to the GNU General ++dnl Public License, this file may be distributed as part of a program ++dnl that contains a configuration script generated by Autoconf, under ++dnl the same distribution terms as the rest of that program. ++ ++# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. ++ ++# This test replaces the one in autoconf. ++# Currently this macro should have the same name as the autoconf macro ++# because gettext's gettext.m4 (distributed in the automake package) ++# still uses it. Otherwise, the use in gettext.m4 makes autoheader ++# give these diagnostics: ++# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX ++# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX ++ ++undefine([AC_ISC_POSIX]) ++ ++AC_DEFUN([AC_ISC_POSIX], ++ [ ++ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. ++ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ++ ] ++) -- cgit v1.2.3 From 0f6cd7812dfe83d073112dfbf7aa83b62e92b2d6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 12:46:19 +0000 Subject: gnome-panel: add librsvg to depends --- packages/gnome/gnome-panel_2.22.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gnome/gnome-panel_2.22.2.bb b/packages/gnome/gnome-panel_2.22.2.bb index b5f207a632..b96d985387 100644 --- a/packages/gnome/gnome-panel_2.22.2.bb +++ b/packages/gnome/gnome-panel_2.22.2.bb @@ -1,5 +1,5 @@ LICENSE = "GPL" -DEPENDS = "libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" +DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" inherit gnome pkgconfig -- cgit v1.2.3 From a3552eb349f3a83b0ded45301775fbae29973eee Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 12:46:52 +0000 Subject: gnome-python-extras: add 2.19.1 --- packages/gnome/gnome-python-extras_2.19.1.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 packages/gnome/gnome-python-extras_2.19.1.bb diff --git a/packages/gnome/gnome-python-extras_2.19.1.bb b/packages/gnome/gnome-python-extras_2.19.1.bb new file mode 100644 index 0000000000..9d8e786241 --- /dev/null +++ b/packages/gnome/gnome-python-extras_2.19.1.bb @@ -0,0 +1,21 @@ +LICENSE = "GPL/LGPL" +DEPENDS = "python-pygtk libwnck" + +inherit gnome distutils-base + +SRC_URI += "file://acinclude.m4" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/ +} + +do_configure_prepend() { + sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" +do_stage() { + autotools_stage_all +} + +FILES_${PN}-dev += "${datadir}/pygtk" -- cgit v1.2.3 From 834d6f6f90bfaae37931d9ebbc2bde7a0e567521 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 3 Sep 2008 12:50:58 +0000 Subject: webkit-gtk updated from snapshot 35533 to snapshot 35977: * seems to be more stable than previous * requires latest bison to compile * http soup backend seems to be broken, stay at curl backend --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/webkit/webkit-gtk/GNUmakefile.am | 56 ++--- packages/webkit/webkit-gtk/WebKit.pri | 148 ++++++------- packages/webkit/webkit-gtk/WebKit.pro | 21 +- packages/webkit/webkit-gtk/acinclude.m4 | 356 ++++++++++++++++++++++++++++++ packages/webkit/webkit-gtk/configure.ac | 24 ++ packages/webkit/webkit-gtk/symbols.filter | 5 + packages/webkit/webkit-gtk_svn.bb | 5 +- 8 files changed, 489 insertions(+), 128 deletions(-) create mode 100644 packages/webkit/webkit-gtk/acinclude.m4 create mode 100644 packages/webkit/webkit-gtk/symbols.filter diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5c4a23764c..ff9bfb42d6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -178,7 +178,7 @@ SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" -SRCREV_pn-webkit-gtk ?= "35533" +SRCREV_pn-webkit-gtk ?= "35977" SRCREV_pn-webkit-qt ?= "28656" SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" diff --git a/packages/webkit/webkit-gtk/GNUmakefile.am b/packages/webkit/webkit-gtk/GNUmakefile.am index 9b2f06f88d..50149563ac 100644 --- a/packages/webkit/webkit-gtk/GNUmakefile.am +++ b/packages/webkit/webkit-gtk/GNUmakefile.am @@ -5,7 +5,6 @@ # _h_api = API headers that will be installed and included in the distribution # _cppflags = flags that will be passed to the C/CXX Preprocessor # _sources = sources that will be compiled and included in the distribution -# _headers = header files that will be part of the distribution # _built_sources = files that will be autogenerated by the build system and # will be part of the _SOURCES primary # _built_nosources = files that are autogenerated but are not part of the @@ -42,13 +41,12 @@ bin_PROGRAMS := noinst_PROGRAMS := +noinst_HEADERS := + lib_LIBRARIES := IDL_BINDINGS := -# Files that will be distributed -EXTRA_DIST := - # Global flags to CPP global_cppflags := @@ -96,6 +94,7 @@ javascriptcore_cppflags:= javascriptcore_sources := javascriptcore_built_sources := javascriptcore_built_nosources := +javascriptcore_dist := javascriptcore_cppflags += \ -I$(srcdir)/JavaScriptCore \ @@ -146,21 +145,18 @@ libJavaScriptCore_la_CPPFLAGS = \ # WebCore webcore_cppflags := webcore_sources := -webcore_headers := webcore_libadd := webcore_built_sources := webcore_built_nosources := +webcore_dist := webcoregtk_cppflags := webcoregtk_sources := -webcoregtk_headers := nodist_libWebCore_la_SOURCES = \ $(webcore_built_sources) libWebCore_la_SOURCES = \ - $(webcore_headers) \ $(webcore_sources) \ - $(webcoregtk_headers) \ $(webcoregtk_sources) libWebCore_la_CXXFLAGS = \ @@ -171,6 +167,7 @@ libWebCore_la_CXXFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -187,6 +184,7 @@ libWebCore_la_CFLAGS = \ $(GLOBALDEPS_CFLAGS) \ $(UNICODE_CFLAGS) \ $(WEBKITDEPS_CFLAGS) \ + $(XT_CFLAGS) \ $(LIBCURL_CFLAGS) \ $(LIBSOUP_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -208,6 +206,7 @@ libWebCore_la_LIBADD = \ $(webcore_libadd) \ $(GLOBALDEPS_LIBS) \ $(WEBKITDEPS_LIBS) \ + $(XT_LIBS) \ $(LIBCURL_LIBS) \ $(LIBSOUP_LIBS) \ $(FREETYPE_LIBS) \ @@ -221,7 +220,6 @@ libWebCore_la_LIBADD = \ # WebKit webkitgtk_h_api := -webkitgtk_headers := webkitgtk_sources := webkitgtk_cppflags := webkitgtk_built_sources := @@ -237,7 +235,6 @@ libwebkit_1_0_la_HEADERS = \ WebKit/gtk/webkit/webkitenumtypes.h libwebkit_1_0_la_SOURCES = \ - $(webkitgtk_headers) \ $(webkitgtk_sources) libwebkit_1_0_la_CXXFLAGS = \ @@ -253,6 +250,7 @@ libwebkit_1_0_la_CPPFLAGS = \ libwebkit_1_0_la_LDFLAGS = \ $(COVERAGE_LDFLAGS) \ -version-info @LIBWEBKITGTK_VERSION@ \ + -Wl,--version-script,$(srcdir)/symbols.filter \ $(no_undefined) libwebkit_1_0_la_LIBADD = \ @@ -272,7 +270,6 @@ endif if TARGET_X11 global_cppflags += -DXP_UNIX -webcore_libadd += -lXt endif if !ENABLE_DEBUG @@ -320,37 +317,35 @@ webkitgtk_h_api += \ WebKit/gtk/webkit/webkitwebview.h webkitgtk_built_sources += \ - DerivedSources/webkitmarshal.h \ - DerivedSources/webkitmarshal.cpp \ DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitmarshal.cpp \ + DerivedSources/webkitmarshal.h \ WebKit/gtk/webkit/webkitenumtypes.h -webkitgtk_headers += \ - WebKit/gtk/webkit/webkitprivate.h \ +webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h - -webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitprivate.h \ WebKit/gtk/webkit/webkitversion.cpp \ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ WebKit/gtk/webkit/webkitwebframe.cpp \ WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ WebKit/gtk/webkit/webkitwebsettings.cpp \ - WebKit/gtk/webkit/webkitwebview.cpp \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/webkit/webkitwebview.cpp webkitgtk_cppflags += \ -DBUILDING_WEBKIT \ @@ -403,7 +398,7 @@ stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h @true -stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile +stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ @@ -425,7 +420,7 @@ stamp-webkitenumtypes.h: $(webkitgtk_h_api) Makefile && rm -f xgen-gth \ && echo timestamp > $(@F) -DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile +DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile (cd $(srcdir) \ && glib-mkenums \ --fhead "#include \n" \ @@ -449,6 +444,11 @@ DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) Makefile && rm -f xgen-gtc # END WEBKIT GTK+ +# +# Files that will be distributed +EXTRA_DIST = \ + $(javascriptcore_dist) \ + $(webcore_dist) # Files that will be cleaned MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) diff --git a/packages/webkit/webkit-gtk/WebKit.pri b/packages/webkit/webkit-gtk/WebKit.pri index d12423beb2..a869906288 100644 --- a/packages/webkit/webkit-gtk/WebKit.pri +++ b/packages/webkit/webkit-gtk/WebKit.pri @@ -6,102 +6,84 @@ isEmpty(OUTPUT_DIR) { CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug } -!gtk-port:CONFIG += qt-port -qt-port:DEFINES += BUILDING_QT__=1 -qt-port:!building-libs { +DEFINES += BUILDING_QT__=1 +building-libs { + win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32 +} else { QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR LIBS += -lQtWebKit DEPENDPATH += $$PWD/WebKit/qt/Api } -gtk-port:!building-libs { - QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR - LIBS += -lWebKitGtk - DEPENDPATH += $$PWD/WebKit/gtk $$PWD/WebKit/gtk/WebCoreSupport $$PWD/WebKit/gtk/webkit +DEFINES += USE_SYSTEM_MALLOC +CONFIG(release) { + DEFINES += NDEBUG } -gtk-port { - CONFIG += link_pkgconfig - - DEFINES += BUILDING_CAIRO__=1 BUILDING_GTK__=1 - - # We use FreeType directly with Cairo - PKGCONFIG += cairo-ft - - directfb: PKGCONFIG += cairo-directfb gtk+-directfb-2.0 - else: PKGCONFIG += cairo gtk+-2.0 - - # Set a CONFIG flag for the GTK+ target (x11, quartz, win32, directfb) - CONFIG += $$system(pkg-config --variable=target $$PKGCONFIG) - - # We use the curl http backend on all platforms - PKGCONFIG += libcurl - DEFINES += WTF_USE_CURL=1 +BASE_DIR = $$PWD +INCLUDEPATH += $$PWD/WebKit/qt/Api + +# +# For builds inside Qt we interpret the output rule and the input of each extra compiler manually +# and add the resulting sources to the SOURCES variable, because the build inside Qt contains already +# all the generated files. We do not need to generate any extra compiler rules in that case. +# +# In addition this function adds a new target called 'generated_files' that allows manually calling +# all the extra compilers to generate all the necessary files for the build using 'make generated_files' +# +defineTest(addExtraCompiler) { + CONFIG(QTDIR_build) { + outputRule = $$eval($${1}.output) + + input = $$eval($${1}.input) + input = $$eval($$input) + + for(file,input) { + base = $$basename(file) + base ~= s/\..+// + newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base) + SOURCES += $$newfile + } + + export(SOURCES) + } else { + QMAKE_EXTRA_COMPILERS += $$1 + generated_files.depends += compiler_$${1}_make_all + export(QMAKE_EXTRA_COMPILERS) + export(generated_files.depends) + } + return(true) +} - LIBS += -lWebKitGtk -ljpeg -lpng +defineTest(addExtraCompilerWithHeader) { + addExtraCompiler($$1) - QMAKE_CXXFLAGS += $$system(icu-config --cppflags) - QMAKE_LIBS += $$system(icu-config --ldflags) + eval(headerFile = $${2}) + isEmpty(headerFile) { + eval($${1}_header.output = $$eval($${1}.output)) + eval($${1}_header.output ~= s/\.cpp/.h/) + eval($${1}_header.output ~= s/\.c/.h/) + } else { + eval($${1}_header.output = $$headerFile) + } - # This set of warnings is borrowed from the Mac build - QMAKE_CXXFLAGS += -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef + eval($${1}_header.input = $$eval($${1}.input)) + eval($${1}_header.commands = @echo -n '') + eval($${1}_header.depends = compiler_$${1}_make_all) + eval($${1}_header.variable_out = GENERATED_FILES) - # These flags are based on optimization experience from the Mac port: - # Helps code size significantly and speed a little - QMAKE_CXXFLAGS += -fno-exceptions -fno-rtti + export($${1}_header.output) + export($${1}_header.input) + export($${1}_header.commands) + export($${1}_header.depends) + export($${1}_header.variable_out) - DEPENDPATH += $$PWD/JavaScriptCore/API - INCLUDEPATH += $$PWD -} + !CONFIG(QTDIR_build): QMAKE_EXTRA_COMPILERS += $${1}_header -DEFINES += USE_SYSTEM_MALLOC -CONFIG(release) { - DEFINES += NDEBUG -} + export(QMAKE_EXTRA_COMPILERS) + export(generated_files.depends) + export(SOURCES) -gtk-port:CONFIG(debug) { - DEFINES += G_DISABLE_DEPRECATED GDK_PIXBUF_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED GTK_DISABLE_DEPRECATED PANGO_DISABLE_DEPRECATED -# maybe useful for debugging DEFINES += GDK_MULTIHEAD_SAFE GTK_MULTIHEAD_SAFE + return(true) } -BASE_DIR = $$PWD -qt-port:INCLUDEPATH += \ - $$PWD/WebKit/qt/Api -gtk-port:INCLUDEPATH += \ - $$BASE_DIR/WebCore/platform/gtk \ - $$BASE_DIR/WebCore/platform/network/curl \ - $$BASE_DIR/WebCore/platform/graphics/cairo \ - $$BASE_DIR/WebCore/loader/gtk \ - $$BASE_DIR/WebCore/page/gtk \ - $$BASE_DIR/WebKit/gtk \ - $$BASE_DIR/WebKit/gtk/WebCoreSupport \ - $$BASE_DIR/WebKit/gtk/webkit -INCLUDEPATH += \ - $$BASE_DIR/JavaScriptCore/ \ - $$BASE_DIR/JavaScriptCore/kjs \ - $$BASE_DIR/JavaScriptCore/bindings \ - $$BASE_DIR/JavaScriptCore/bindings/c \ - $$BASE_DIR/JavaScriptCore/wtf \ - $$BASE_DIR/JavaScriptCore/ForwardingHeaders \ - $$BASE_DIR/WebCore \ - $$BASE_DIR/WebCore/ForwardingHeaders \ - $$BASE_DIR/WebCore/platform \ - $$BASE_DIR/WebCore/platform/network \ - $$BASE_DIR/WebCore/platform/graphics \ - $$BASE_DIR/WebCore/loader \ - $$BASE_DIR/WebCore/page \ - $$BASE_DIR/WebCore/css \ - $$BASE_DIR/WebCore/dom \ - $$BASE_DIR/WebCore/bridge \ - $$BASE_DIR/WebCore/editing \ - $$BASE_DIR/WebCore/rendering \ - $$BASE_DIR/WebCore/history \ - $$BASE_DIR/WebCore/xml \ - $$BASE_DIR/WebCore/html \ - $$BASE_DIR/WebCore/plugins - - -macx { - INCLUDEPATH += /usr/include/libxml2 - LIBS += -lxml2 -lxslt -} diff --git a/packages/webkit/webkit-gtk/WebKit.pro b/packages/webkit/webkit-gtk/WebKit.pro index bc14feb5f6..035f73aa3f 100644 --- a/packages/webkit/webkit-gtk/WebKit.pro +++ b/packages/webkit/webkit-gtk/WebKit.pro @@ -1,21 +1,12 @@ TEMPLATE = subdirs CONFIG += ordered -!gtk-port:CONFIG += qt-port -qt-port { - lessThan(QT_MINOR_VERSION, 4) { - !win32-*:SUBDIRS += WebKit/qt/Plugins - } -} + SUBDIRS += \ + JavaScriptCore \ WebCore \ - JavaScriptCore/kjs/testkjs.pro - -qt-port { - SUBDIRS += WebKit/qt/QtLauncher + JavaScriptCore/kjs/jsc.pro \ + WebKit/qt/QtLauncher \ + WebKit/qt/tests - !win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -} +!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro -gtk-port:SUBDIRS += \ - WebKitTools/GtkLauncher \ - WebKitTools/DumpRenderTree/gtk/DumpRenderTree.pro diff --git a/packages/webkit/webkit-gtk/acinclude.m4 b/packages/webkit/webkit-gtk/acinclude.m4 new file mode 100644 index 0000000000..e0083b9dd1 --- /dev/null +++ b/packages/webkit/webkit-gtk/acinclude.m4 @@ -0,0 +1,356 @@ +dnl dolt, a replacement for libtool +dnl Copyright © 2007-2008 Josh Triplett +dnl Copying and distribution of this file, with or without modification, +dnl are permitted in any medium without royalty provided the copyright +dnl notice and this notice are preserved. +dnl +dnl To use dolt, invoke the DOLT macro immediately after the libtool macros. +dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it +dnl installed when running autoconf on your project. + +AC_DEFUN([DOLT], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +# dolt, a replacement for libtool +# Josh Triplett +AC_PATH_PROG(DOLT_BASH, bash) +AC_MSG_CHECKING([if dolt supports this host]) +dolt_supported=yes +if test x$DOLT_BASH = x; then + dolt_supported=no +fi +if test x$GCC != xyes; then + dolt_supported=no +fi +case $host in +i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \ +|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*) + pic_options='-fPIC' + ;; +i?86-apple-darwin*) + pic_options='-fno-common' + ;; +*) + dolt_supported=no + ;; +esac +if test x$dolt_supported = xno ; then + AC_MSG_RESULT([no, falling back to libtool]) + LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)' + LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)' +else + AC_MSG_RESULT([yes, replacing libtool]) + +dnl Start writing out doltcompile. + cat <<__DOLTCOMPILE__EOF__ >doltcompile +#!$DOLT_BASH +__DOLTCOMPILE__EOF__ + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +args=("$[]@") +for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do + if test x"${args@<:@$arg@:>@}" = x-o ; then + objarg=$((arg+1)) + break + fi +done +if test x$objarg = x ; then + echo 'Error: no -o on compiler command line' 1>&2 + exit 1 +fi +lo="${args@<:@$objarg@:>@}" +obj="${lo%.lo}" +if test x"$lo" = x"$obj" ; then + echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2 + exit 1 +fi +objbase="${obj##*/}" +__DOLTCOMPILE__EOF__ + +dnl Write out shared compilation code. + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +libobjdir="${obj%$objbase}.libs" +if test ! -d "$libobjdir" ; then + mkdir_out="$(mkdir "$libobjdir" 2>&1)" + mkdir_ret=$? + if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then + echo "$mkdir_out" 1>&2 + exit $mkdir_ret + fi +fi +pic_object="$libobjdir/$objbase.o" +args@<:@$objarg@:>@="$pic_object" +__DOLTCOMPILE__EOF__ + cat <<__DOLTCOMPILE__EOF__ >>doltcompile +"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$? +__DOLTCOMPILE__EOF__ + fi + +dnl Write out static compilation code. +dnl Avoid duplicate compiler output if also building shared objects. + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +non_pic_object="$obj.o" +args@<:@$objarg@:>@="$non_pic_object" +__DOLTCOMPILE__EOF__ + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $? +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +"${args@<:@@@:>@}" || exit $? +__DOLTCOMPILE__EOF__ + fi + fi + +dnl Write out the code to write the .lo file. +dnl The second line of the .lo file must match "^# Generated by .*libtool" + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +{ +echo "# $lo - a libtool object file" +echo "# Generated by doltcompile, not libtool" +__DOLTCOMPILE__EOF__ + + if test x$enable_shared = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "pic_object='.libs/${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo pic_object=none +__DOLTCOMPILE__EOF__ + fi + + if test x$enable_static = xyes; then + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo "non_pic_object='${objbase}.o'" +__DOLTCOMPILE__EOF__ + else + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +echo non_pic_object=none +__DOLTCOMPILE__EOF__ + fi + + cat <<'__DOLTCOMPILE__EOF__' >>doltcompile +} > "$lo" +__DOLTCOMPILE__EOF__ + +dnl Done writing out doltcompile; substitute it for libtool compilation. + chmod +x doltcompile + LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)' + LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)' + +dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for +dnl a target, so write out a libtool wrapper to handle that case. +dnl Note that doltlibtool does not handle inferred tags or option arguments +dnl without '=', because automake does not use them. + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool +#!$DOLT_BASH +__DOLTLIBTOOL__EOF__ + cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool +top_builddir_slash="${0%%doltlibtool}" +: ${top_builddir_slash:=./} +args=() +modeok=false +tagok=false +for arg in "$[]@"; do + case "$arg" in + --mode=compile) modeok=true ;; + --tag=CC|--tag=CXX) tagok=true ;; + *) args+=("$arg") + esac +done +if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" +else + exec ${top_builddir_slash}libtool "$[]@" +fi +__DOLTLIBTOOL__EOF__ + +dnl Done writing out doltlibtool; substitute it for libtool. + chmod +x doltlibtool + LIBTOOL='$(top_builddir)/doltlibtool' +fi +AC_SUBST(LTCOMPILE) +AC_SUBST(LTCXXCOMPILE) +# end dolt +]) + +# =========================================================================== +# http://autoconf-archive.cryp.to/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LAST MODIFICATION +# +# 2008-04-12 +# +# COPYLEFT +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_PROG_AWK + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [illegal OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([illegal OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff --git a/packages/webkit/webkit-gtk/configure.ac b/packages/webkit/webkit-gtk/configure.ac index 768ae9f9f2..21f72661ec 100644 --- a/packages/webkit/webkit-gtk/configure.ac +++ b/packages/webkit/webkit-gtk/configure.ac @@ -95,6 +95,10 @@ fi AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +else + FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'` + AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION], + AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly])) fi AC_PATH_PROG(GPERF, gperf) @@ -284,6 +288,26 @@ PKG_CHECK_MODULES([WEBKITDEPS], AC_SUBST([WEBKITDEPS_CFLAGS]) AC_SUBST([WEBKITDEPS_LIBS]) +# check for Xt if the target is X11 +if test "$with_target" = "x11"; then + PKG_CHECK_MODULES([XT], + [xt], + [xt_has_pkg_config=yes], + [xt_has_pkg_config=no]) + # some old versions of Xt do not provide xt.pc, so try to link against Xt + # and if it's installed fall back to just adding -lXt + if test "$xt_has_pkg_config" = "no"; then + # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as + # we don't care about the XtOpenDisplay symbol but only about the + # existence of libXt + AC_CHECK_LIB([Xt], [XtOpenDisplay], + [XT_CFLAGS=""; XT_LIBS="-lXt"], + [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])]) + fi + AC_SUBST([XT_CFLAGS]) + AC_SUBST([XT_LIBS]) +fi + # check whether to build with debugging enabled AC_MSG_CHECKING([whether to do a debug build]) AC_ARG_ENABLE(debug, diff --git a/packages/webkit/webkit-gtk/symbols.filter b/packages/webkit/webkit-gtk/symbols.filter new file mode 100644 index 0000000000..f5af6bac90 --- /dev/null +++ b/packages/webkit/webkit-gtk/symbols.filter @@ -0,0 +1,5 @@ +{ +local: +_ZSt*; +_ZNSt*; +}; diff --git a/packages/webkit/webkit-gtk_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 06f869ef48..b78844fc53 100644 --- a/packages/webkit/webkit-gtk_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "WebKit browser engine, GTK+ edition" -DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" +DEPENDS = "curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs bison-native flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" @@ -19,6 +19,7 @@ SRC_URI = "\ file://Makefile.shared \ file://autogen.sh \ file://configure.ac \ + file://symbols.filter \ file://GNUmakefile.am \ " @@ -26,10 +27,12 @@ S = "${WORKDIR}/" inherit autotools pkgconfig lib_package +# FIXME: Segfaulting without --with-http-backend=curl EXTRA_OECONF = "\ --enable-debug=no \ --enable-svg \ --enable-icon-database=yes \ + --with-http-backend=curl \ " do_compile_prepend() { -- cgit v1.2.3 From 655673c2ff19362885c0ed51a4a0d1184fa14a90 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 3 Sep 2008 12:54:05 +0000 Subject: midori updated to version 0.0.20 --- packages/gtk-webcore/midori_0.0.19.bb | 5 ----- packages/gtk-webcore/midori_0.0.20.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 packages/gtk-webcore/midori_0.0.19.bb create mode 100644 packages/gtk-webcore/midori_0.0.20.bb diff --git a/packages/gtk-webcore/midori_0.0.19.bb b/packages/gtk-webcore/midori_0.0.19.bb deleted file mode 100644 index ec81d7fd23..0000000000 --- a/packages/gtk-webcore/midori_0.0.19.bb +++ /dev/null @@ -1,5 +0,0 @@ -require midori.inc - -SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2" - - diff --git a/packages/gtk-webcore/midori_0.0.20.bb b/packages/gtk-webcore/midori_0.0.20.bb new file mode 100644 index 0000000000..e10d92bd78 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.20.bb @@ -0,0 +1,5 @@ +require midori.inc + +SRC_URI = "http://goodies.xfce.org/releases/midori/midori-${PV}.tar.bz2" + + -- cgit v1.2.3 From 9d854b894b8741e62ffa9504a6490abbff1b38b7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 14:23:22 +0000 Subject: linux-omap2 git: enable more usb stuff for beagle --- .../linux/linux-omap2-git/beagleboard/defconfig | 106 ++++++++++++--------- packages/linux/linux-omap2_git.bb | 2 +- 2 files changed, 62 insertions(+), 46 deletions(-) diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index b3ea5f9557..867b5b885c 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Mon Aug 11 16:37:34 2008 +# Wed Sep 3 15:38:48 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -1412,7 +1412,10 @@ CONFIG_USB_MUSB_SOC=y CONFIG_USB_MUSB_OTG=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_USB_MUSB_HDRC_HCD=y -CONFIG_MUSB_PIO_ONLY=y +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_INVENTRA_DMA=y +CONFIG_MUSB_USE_SYSTEM_DMA_RX=y +# CONFIG_USB_TI_CPPI_DMA is not set CONFIG_USB_MUSB_LOGLEVEL=0 # @@ -1456,49 +1459,62 @@ CONFIG_USB_MON=y # USB port drivers # CONFIG_USB_SERIAL=m -# CONFIG_USB_EZUSB is not set -# CONFIG_USB_SERIAL_GENERIC is not set -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_AIRPRIME is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_CP2101 is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_MOTOROLA is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_SPCP8X5 is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_SERIAL_OPTION is not set -# CONFIG_USB_SERIAL_OMNINET is not set -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_EZUSB=y +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_AIRCABLE=m +CONFIG_USB_SERIAL_AIRPRIME=m +CONFIG_USB_SERIAL_ARK3116=m +CONFIG_USB_SERIAL_BELKIN=m +CONFIG_USB_SERIAL_CH341=m +CONFIG_USB_SERIAL_WHITEHEAT=m +CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m +CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CYPRESS_M8=m +CONFIG_USB_SERIAL_EMPEG=m +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_FUNSOFT=m +CONFIG_USB_SERIAL_VISOR=m +CONFIG_USB_SERIAL_IPAQ=m +CONFIG_USB_SERIAL_IR=m +CONFIG_USB_SERIAL_EDGEPORT=m +CONFIG_USB_SERIAL_EDGEPORT_TI=m +CONFIG_USB_SERIAL_GARMIN=m +CONFIG_USB_SERIAL_IPW=m +CONFIG_USB_SERIAL_IUU=m +CONFIG_USB_SERIAL_KEYSPAN_PDA=m +CONFIG_USB_SERIAL_KEYSPAN=m +CONFIG_USB_SERIAL_KEYSPAN_MPR=y +CONFIG_USB_SERIAL_KEYSPAN_USA28=y +CONFIG_USB_SERIAL_KEYSPAN_USA28X=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y +CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y +CONFIG_USB_SERIAL_KEYSPAN_USA19=y +CONFIG_USB_SERIAL_KEYSPAN_USA18X=y +CONFIG_USB_SERIAL_KEYSPAN_USA19W=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y +CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y +CONFIG_USB_SERIAL_KEYSPAN_USA49W=y +CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y +CONFIG_USB_SERIAL_KLSI=m +CONFIG_USB_SERIAL_KOBIL_SCT=m +CONFIG_USB_SERIAL_MCT_U232=m +CONFIG_USB_SERIAL_MOS7720=m +CONFIG_USB_SERIAL_MOS7840=m +CONFIG_USB_SERIAL_MOTOROLA=m +CONFIG_USB_SERIAL_NAVMAN=m +CONFIG_USB_SERIAL_PL2303=m +CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_SPCP8X5=m +CONFIG_USB_SERIAL_HP4X=m +CONFIG_USB_SERIAL_SAFE=m +# CONFIG_USB_SERIAL_SAFE_PADDED is not set +CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_TI=m +CONFIG_USB_SERIAL_CYBERJACK=m +CONFIG_USB_SERIAL_XIRCOM=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_SERIAL_OMNINET=m +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index f032f076e8..5a8aeb16a0 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r61" +PR = "r62" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" -- cgit v1.2.3 From ae80bc3aada834677e6e0a1f6713ebe850e7bee1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 Sep 2008 14:44:40 +0000 Subject: sane-srcrevs.inc: bump Xglamo and linux-openmoko --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5c4a23764c..fa7e861095 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -78,7 +78,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e" +SRCREV_pn-linux-openmoko ?= "ca19d156400f817960efe0d14680324b2ea34171" SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -185,7 +185,7 @@ SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" -SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c" +SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7" SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc" # Enlightenment Foundation Libraries -- cgit v1.2.3 From e1d12d8bb5b40a6313cce52974f174fd76cbf32c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 16:53:15 +0000 Subject: bluez update to 3.36, the last version in the 3.x series. * incidentally, the TI bts patch is upstream now, albeit in a different form --- packages/bluez/bluez-cups-backend_3.36.bb | 26 ++++++++++++ packages/bluez/bluez-gstreamer-plugin_3.36.bb | 26 ++++++++++++ packages/bluez/bluez-libs_3.36.bb | 1 + packages/bluez/bluez-utils-alsa_3.36.bb | 24 +++++++++++ packages/bluez/bluez-utils_3.36.bb | 60 +++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 packages/bluez/bluez-cups-backend_3.36.bb create mode 100644 packages/bluez/bluez-gstreamer-plugin_3.36.bb create mode 100644 packages/bluez/bluez-libs_3.36.bb create mode 100644 packages/bluez/bluez-utils-alsa_3.36.bb create mode 100644 packages/bluez/bluez-utils_3.36.bb diff --git a/packages/bluez/bluez-cups-backend_3.36.bb b/packages/bluez/bluez-cups-backend_3.36.bb new file mode 100644 index 0000000000..4bcb962f3c --- /dev/null +++ b/packages/bluez/bluez-cups-backend_3.36.bb @@ -0,0 +1,26 @@ +require bluez-utils3.inc + + +DEPENDS += "cups" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --disable-alsa \ + --enable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/cups/backend/bluetooth" +RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.36.bb b/packages/bluez/bluez-gstreamer-plugin_3.36.bb new file mode 100644 index 0000000000..facad9cedd --- /dev/null +++ b/packages/bluez/bluez-gstreamer-plugin_3.36.bb @@ -0,0 +1,26 @@ +require bluez-utils3.inc + + +DEPENDS += "gstreamer gst-plugins-base " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --enable-gstreamer \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + + +FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-libs_3.36.bb b/packages/bluez/bluez-libs_3.36.bb new file mode 100644 index 0000000000..6ddf62a4fb --- /dev/null +++ b/packages/bluez/bluez-libs_3.36.bb @@ -0,0 +1 @@ +require bluez-libs.inc diff --git a/packages/bluez/bluez-utils-alsa_3.36.bb b/packages/bluez/bluez-utils-alsa_3.36.bb new file mode 100644 index 0000000000..c35eec04e0 --- /dev/null +++ b/packages/bluez/bluez-utils-alsa_3.36.bb @@ -0,0 +1,24 @@ +require bluez-utils3.inc + + +DEPENDS += "alsa-lib" + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --disable-hid2hci \ + --enable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils_3.36.bb b/packages/bluez/bluez-utils_3.36.bb new file mode 100644 index 0000000000..d2d60b3af2 --- /dev/null +++ b/packages/bluez/bluez-utils_3.36.bb @@ -0,0 +1,60 @@ +require bluez-utils3.inc + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ + file://hcid.conf \ + " + +# see bluez-utils3.inc for the explanation of these option +EXTRA_OECONF = " \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-hidd \ + --disable-alsa \ + --disable-cups \ + --enable-glib \ + --disable-sdpd \ + --enable-network \ + --enable-serial \ + --enable-input \ + --enable-audio \ + --enable-echo \ + --enable-configfile \ + --enable-initscripts \ + --enable-test \ + " + +CONFFILES_${PN} = " \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default/bluetooth \ + " + +CONFFILES_${PN}-compat = " \ + ${sysconfdir}/bluetooth/rfcomm.conf \ + " + +PACKAGES =+ "bluez-audio" + +FILES_${PN} = " \ + ${base_sbindir}/hcid \ + ${libdir}/bluetooth/plugins/*.so \ + ${sysconfdir}/init.d/bluetooth \ + ${sysconfdir}/bluetooth/hcid.conf \ + ${sysconfdir}/default \ + ${sysconfdir}/dbus-1 \ + ${base_sbindir}/hciattach \ + " + +FILES_bluez-audio = " \ + ${libdir}/bluetooth/plugins/libaudio.so \ + ${libdir}/gstreamer-0.10/*.so \ + " + +FILES_${PN}-dbg += " \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/gstreamer-0.10/.debug \ + " + +FILES_${PN}-dev += " \ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/gstreamer-0.10/*.la \ + " -- cgit v1.2.3 From 0632eb10e87559ecfa67305b755b065389489243 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 Sep 2008 17:55:53 +0000 Subject: python 2.5.2 ship shlex in python-shell --- contrib/python/generate-manifest-2.5.py | 4 ++-- packages/python/python-2.5-manifest.inc | 4 ++-- packages/python/python_2.5.2.bb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index ee1b6753e3..2560853982 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -289,8 +289,8 @@ if __name__ == "__main__": m.addPackage( 0, "python-resource", "Python Resource Control Interface", "python-core", "lib-dynload/resource.so" ) - m.addPackage( 0, "python-shell", "Python Shell-Like Functionality", "python-core python-re", - "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shutil.*" ) + m.addPackage( 1, "python-shell", "Python Shell-Like Functionality", "python-core python-re", + "cmd.* commands.* dircache.* fnmatch.* glob.* popen2.* shlex.* shutil.*" ) m.addPackage( 0, "python-robotparser", "Python robots.txt parser", "python-core python-netclient", "robotparser.*") diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 9ae307e7a4..68fb934e54 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -264,9 +264,9 @@ RDEPENDS_python-debugger="python-core python-io python-lang python-re python-str FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" -PR_python-shell="ml0" +PR_python-shell="ml1" RDEPENDS_python-shell="python-core python-re" -FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shutil.* " +FILES_python-shell="${libdir}/python2.5/cmd.* ${libdir}/python2.5/commands.* ${libdir}/python2.5/dircache.* ${libdir}/python2.5/fnmatch.* ${libdir}/python2.5/glob.* ${libdir}/python2.5/popen2.* ${libdir}/python2.5/shlex.* ${libdir}/python2.5/shutil.* " DESCRIPTION_python-bsddb="Python Berkeley Database Bindings" PR_python-bsddb="ml1" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index c68f7d5e3b..e285575149 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib" DEPENDS_sharprom = "python-native db readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml9" +PR = "ml10" PYTHON_MAJMIN = "2.5" -- cgit v1.2.3 From 819cd56f786f99f645ce43e9882dcc7546c9ff4d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 18:06:02 +0000 Subject: x11vnc: fix SRC_URI --- packages/vnc/x11vnc_0.9.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.3.bb index 7714a4fffa..2e728ed2a9 100644 --- a/packages/vnc/x11vnc_0.9.3.bb +++ b/packages/vnc/x11vnc_0.9.3.bb @@ -5,7 +5,7 @@ AUTHOR = "Karl Runge" LICENSE = "GPL" DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib" -SRC_URI = "http://www.karlrunge.com/x11vnc/x11vnc-0.9.3.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz" inherit autotools -- cgit v1.2.3 From eccbdc9395f7b525e77087d13d5ae66f2932098f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 Sep 2008 19:22:06 +0000 Subject: fso-sounds: install some sounds from fso artwork repository --- conf/distro/include/sane-srcrevs.inc | 1 + packages/freesmartphone/frameworkd_git.bb | 2 +- packages/freesmartphone/fso-sounds.bb | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7b561fcc39..f97df53af2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -43,6 +43,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe" +SRCREV_pn-fso-sounds ?= "fcadedec08294c5eebd176483695828959a76e0b" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 52bd54a4f1..0532166748 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.2+gitr${SRCREV}" -PR = "r3" +PR = "r0" inherit distutils update-rc.d diff --git a/packages/freesmartphone/fso-sounds.bb b/packages/freesmartphone/fso-sounds.bb index 9c42ada539..5ee60e19d6 100644 --- a/packages/freesmartphone/fso-sounds.bb +++ b/packages/freesmartphone/fso-sounds.bb @@ -1,14 +1,18 @@ DESCRIPTION = "A set of notification sounds" LICENSE = "PD" SECTION = "multimedia" -PV = "0.0.0" +PV = "0.0.1+gitr${SRCREV}" PR = "r0" -SRC_URI = "http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid" +SRC_URI = "\ + http://gallium.prg.dtu.dk/HVSC/C64Music/MUSICIANS/G/Galway_Martin/Arkanoid_PSID.sid \ + ${FREESMARTPHONE_GIT}/artwork.git;protocol=git;branch=master \ +" do_install() { install -d ${D}${datadir}/sounds/ install ${WORKDIR}/*.sid ${D}${datadir}/sounds/ + install ${WORKDIR}/git/sounds/*.mp3 ${D}${datadir}/sounds/ } FILES_${PN} = "${datadir}" -- cgit v1.2.3 From 5b1c6f85dcec1d83b10c3dd061606e421e75ddc0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 19:40:13 +0000 Subject: vino: update to 2.22.2 --- packages/vino/vino_2.22.2.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/vino/vino_2.22.2.bb diff --git a/packages/vino/vino_2.22.2.bb b/packages/vino/vino_2.22.2.bb new file mode 100644 index 0000000000..0a077567ef --- /dev/null +++ b/packages/vino/vino_2.22.2.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Vino is an integrated VNC server for GNOME." +LICENSE = "GPLv2" + +DEPENDS = "libgnomeui libglade gnome-keyring esound dbus-glib libxml2 gnutls gnome-vfs" + +inherit gnome gconf + + -- cgit v1.2.3 From a308b53d3f43f9565bdf9cf0d90f29fe2e43e9a8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 3 Sep 2008 20:41:24 +0000 Subject: cmake bbclass: allow extra argument via EXTRA_OECMAKE --- classes/cmake.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass index a9130f2a05..faa4768d90 100644 --- a/classes/cmake.bbclass +++ b/classes/cmake.bbclass @@ -5,7 +5,8 @@ inherit autotools cmake_do_configure() { cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \ - -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} + -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST} \ + ${EXTRA_OECMAKE} } EXPORT_FUNCTIONS do_configure -- cgit v1.2.3 From c41b91c42559b820c62a35c03eb60c33c3f134d1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 3 Sep 2008 23:06:53 +0000 Subject: sane-srcrevs.inc: bump mickeyterm, mickeydbus, python-pyrtc --- conf/distro/include/sane-srcrevs.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f97df53af2..1c0eea2deb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -89,8 +89,8 @@ SRCREV_pn-matchbox-keyboard ?= "1910" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-matchbox-stroke ?= "1820" -SRCREV_pn-mickeydbus ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" -SRCREV_pn-mickeyterm ?= "7284c178a66c9fa5b09c658560d26d3f976a79f3" +SRCREV_pn-mickeydbus ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" +SRCREV_pn-mickeyterm ?= "d1f32060474767582dd4248d5e5c2adc63931d5a" SRCREV_pn-moko-gtk-engine ?= "3612" SRCREV_pn-mpd-alsa ?= "6952" SRCREV_pn-mplayer ?= "27380" @@ -166,7 +166,7 @@ SRCREV_pn-python-connexion ?= "1283" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" -SRCREV_pn-python-pyrtc = "7284c178a66c9fa5b09c658560d26d3f976a79f3" +SRCREV_pn-python-pyrtc = "d1f32060474767582dd4248d5e5c2adc63931d5a" SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" -- cgit v1.2.3 From 32d41843d7661e710d0dae6fc38a857210f74747 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 4 Sep 2008 00:20:47 +0000 Subject: sane-srcrevs: bump frameworkd --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1c0eea2deb..f136c638f4 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,7 +42,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe" +SRCREV_pn-frameworkd ?= "4619b9d748c5f21d6493b1bacc490934bbd0a62c" SRCREV_pn-fso-sounds ?= "fcadedec08294c5eebd176483695828959a76e0b" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" @@ -55,7 +55,7 @@ SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" SRCREV_pn-illume ?= "35605" SRCREV_pn-illume-theme-asu ?= "170" -SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d" +SRCREV_pn-illume-theme-freesmartphone ?= "fcadedec08294c5eebd176483695828959a76e0b" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" -- cgit v1.2.3 From 0156125303b1ca9ce27f31d7df63f745c5d45ac9 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 4 Sep 2008 00:38:39 +0000 Subject: classpath: Added missing patch file decimalformat.patch . --- packages/classpath/files/decimalformat.patch | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 packages/classpath/files/decimalformat.patch diff --git a/packages/classpath/files/decimalformat.patch b/packages/classpath/files/decimalformat.patch new file mode 100644 index 0000000000..4997523830 --- /dev/null +++ b/packages/classpath/files/decimalformat.patch @@ -0,0 +1,31 @@ +Index: classpath-0.97.2/java/text/DecimalFormat.java +=================================================================== +--- classpath-0.97.2.orig/java/text/DecimalFormat.java ++++ classpath-0.97.2/java/text/DecimalFormat.java +@@ -1296,7 +1296,7 @@ public class DecimalFormat extends Numbe + currencySymbol = this.symbols.getCurrencySymbol(); + + // if \u00A4 is doubled, we use the international currency symbol +- if (i < len && pattern.charAt(i + 1) == '\u00A4') ++ if ((i + 1) < len && pattern.charAt(i + 1) == '\u00A4') + { + currencySymbol = this.symbols.getInternationalCurrencySymbol(); + i++; +@@ -1320,7 +1320,7 @@ public class DecimalFormat extends Numbe + else if (ch == '\'') + { + // QUOTE +- if (i < len && pattern.charAt(i + 1) == '\'') ++ if ((i + 1) < len && pattern.charAt(i + 1) == '\'') + { + // we need to add ' to the buffer + buffer.append(ch); +@@ -1692,7 +1692,7 @@ public class DecimalFormat extends Numbe + else if (ch == '\'') + { + // QUOTE +- if (i < len && pattern.charAt(i + 1) == '\'') ++ if ((i + 1) < len && pattern.charAt(i + 1) == '\'') + { + // we need to add ' to the buffer + buffer.append(ch); -- cgit v1.2.3 From a9ea848e3fb968714727833ba2b412ff49365555 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 4 Sep 2008 00:40:43 +0000 Subject: classpath 0.97.2: Added cp-byte-loophelper.patch. classpath-minimal 0.97.2: Dito. classpath-native 0.97.2: Dito. --- packages/classpath/classpath-minimal_0.97.2.bb | 4 +- packages/classpath/classpath-native_0.97.2.bb | 4 +- packages/classpath/classpath_0.97.2.bb | 4 +- packages/classpath/files/cp-byte-loophelper.patch | 68 +++++++++++++++++++++++ 4 files changed, 77 insertions(+), 3 deletions(-) create mode 100644 packages/classpath/files/cp-byte-loophelper.patch diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb index 5e6d53224e..44cffcec32 100644 --- a/packages/classpath/classpath-minimal_0.97.2.bb +++ b/packages/classpath/classpath-minimal_0.97.2.bb @@ -6,9 +6,11 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ + file://cp-byte-loophelper.patch;patch=1;pnum=0 \ " -PR = "r1" +PR = "r3" PROVIDES = "${PN} classpath" diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index c9a239418b..cec256ecc2 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -1,6 +1,6 @@ require classpath-native.inc -PR = "r1" +PR = "r2" # The code affected by the javanet-local patch # is usually not compiled. However if someone changes @@ -12,5 +12,7 @@ SRC_URI += "\ file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ + file://cp-byte-loophelper.patch;patch=1;pnum=0 \ " diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index 1393e2c453..242bab95f2 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -6,9 +6,11 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ file://ecj_java_dir.patch;patch=1 \ file://autotools.patch;patch=1 \ + file://decimalformat.patch;patch=1 \ + file://cp-byte-loophelper.patch;patch=1;pnum=0 \ " -PR = "r2" +PR = "r4" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/files/cp-byte-loophelper.patch b/packages/classpath/files/cp-byte-loophelper.patch new file mode 100644 index 0000000000..4fac362cba --- /dev/null +++ b/packages/classpath/files/cp-byte-loophelper.patch @@ -0,0 +1,68 @@ +Index: gnu/java/nio/charset/ByteDecodeLoopHelper.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteDecodeLoopHelper.java,v +retrieving revision 1.1 +diff -u -r1.1 ByteDecodeLoopHelper.java +--- gnu/java/nio/charset/ByteDecodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1 ++++ gnu/java/nio/charset/ByteDecodeLoopHelper.java 3 Sep 2008 23:11:29 -0000 +@@ -119,6 +119,8 @@ + int inRemaining = in.remaining(); + int outRemaining = out.remaining(); + CoderResult result; ++ ++ bailOut: + if (inRemaining <= outRemaining) + { + for (int i = 0; i < inRemaining; i++) +@@ -129,7 +131,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + char c = mapToChar(b); + outArray[outPos] = c; +@@ -147,7 +149,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + char c = mapToChar(b); + outArray[outPos] = c; +Index: gnu/java/nio/charset/ByteEncodeLoopHelper.java +=================================================================== +RCS file: /sources/classpath/classpath/gnu/java/nio/charset/ByteEncodeLoopHelper.java,v +retrieving revision 1.1 +diff -u -r1.1 ByteEncodeLoopHelper.java +--- gnu/java/nio/charset/ByteEncodeLoopHelper.java 23 Nov 2007 16:11:17 -0000 1.1 ++++ gnu/java/nio/charset/ByteEncodeLoopHelper.java 3 Sep 2008 23:11:29 -0000 +@@ -120,6 +120,8 @@ + int inRemaining = in.remaining(); + int outRemaining = out.remaining(); + CoderResult result; ++ ++ bailOut: + if (inRemaining <= outRemaining) + { + for (int i = 0; i < inRemaining; i++) +@@ -130,7 +132,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + byte b = mapToByte(inChar); + outArray[outPos] = b; +@@ -148,7 +150,7 @@ + { + inPos--; + result = CoderResult.unmappableForLength(1); +- break; ++ break bailOut; + } + byte b = mapToByte(inChar); + outArray[outPos] = b; -- cgit v1.2.3