[oe-commits] org.oe.dev merge of '505353d4980790de19d2f2385c848a5402fa919a'
thesing commit
oe at amethyst.openembedded.net
Mon Sep 1 17:56:03 UTC 2008
merge of '505353d4980790de19d2f2385c848a5402fa919a'
and 'de7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca'
Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: fdc62f053fbe3d0db3b1e0a470185541cf8c0dc1
ViewMTN: http://monotone.openembedded.org/revision/info/fdc62f053fbe3d0db3b1e0a470185541cf8c0dc1
Files:
1
packages/fvwm
packages/fvwm/files
packages/fvwm/files/acinclude.m4.patch
packages/fvwm/files/oe-configure.ac.patch
packages/fvwm/files/upstream-configure.ac.patch
packages/fvwm/fvwm_2.5.26.bb
packages/gnome/gconf_2.6.1.bb
packages/linux/linux-omap2-git/beagleboard/flash.patch
packages/linux/linux-omap2-git/beagleboard/flash2.patch
packages/openmax
packages/openmax/gst-openmax
packages/dvbtools/wscan_20080720.bb
packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch
packages/mozilla/firefox-3.0.1/configure-wchart.patch
packages/mozilla/firefox-3.0.1/wchart.diff
packages/openmax/gst-openmax/check.diff
packages/openmax/gst-openmax_0.10.0.4.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/ffmpeg/ffmpeg_git.bb
packages/gstreamer/gst-common.inc
packages/gstreamer/gstreamer_0.10.17.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.1.bb
packages/qmake/qmake2-sdk_2.10a.bb
Diffs:
#
# mt diff -r505353d4980790de19d2f2385c848a5402fa919a -rfdc62f053fbe3d0db3b1e0a470185541cf8c0dc1
#
#
#
# add_dir "packages/fvwm"
#
# add_dir "packages/fvwm/files"
#
# add_file "packages/fvwm/files/acinclude.m4.patch"
# content [561b9b06c336299032206d93e32b80521024c017]
#
# add_file "packages/fvwm/files/oe-configure.ac.patch"
# content [4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75]
#
# add_file "packages/fvwm/files/upstream-configure.ac.patch"
# content [a568633c0100b87cff00930b1f23aa83bda56e84]
#
# add_file "packages/fvwm/fvwm_2.5.26.bb"
# content [93a5c0c7fcfc00221d47c5c222ec083b77226ece]
#
# patch "packages/gnome/gconf_2.6.1.bb"
# from [8576f10b7a8c6bc87cc71f24e3065ec4b52d572b]
# to [0089690cddb11048bb5f20d090561701b1542220]
#
============================================================
--- packages/fvwm/files/acinclude.m4.patch 561b9b06c336299032206d93e32b80521024c017
+++ packages/fvwm/files/acinclude.m4.patch 561b9b06c336299032206d93e32b80521024c017
@@ -0,0 +1,32 @@
+upstream: OE-only
+origin: Yuri Bushmelev <jay4mail at gmail.com>
+comment: disable xft-config calls while cross-compiling
+--- fvwm-2.5.26/acinclude.m4.orig 2008-06-10 01:53:46.000000000 +0400
++++ fvwm-2.5.26/acinclude.m4 2008-06-10 01:53:51.000000000 +0400
+@@ -1225,14 +1225,14 @@
+ XFT_CONFIG=$xft_config_prefix/bin/xft-config
+ fi
+ fi
+-AC_PATH_PROG(XFT_CONFIG, xft-config, no)
++dnl AC_PATH_PROG(XFT_CONFIG, xft-config, no)
+
+ min_xft_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for Xft - version >= $min_xft_version)
+ no_xft=""
+ pkg_config_xft_exists=""
+
+-if test "$XFT_CONFIG" = "no" ; then
++dnl if test "$XFT_CONFIG" = "no" ; then
+ if test "x$PKG_CONFIG" != "xno" ; then
+ if $PKG_CONFIG --exists 'xft' ; then
+ if $PKG_CONFIG --exists 'xft >= $1' ; then
+@@ -1249,7 +1249,8 @@
+ else
+ no_xft=yes
+ fi
+-else
++dnl else
++if false; then
+ XFT_CFLAGS=`$XFT_CONFIG $xft_config_args --cflags`
+ XFT_LIBS=`$XFT_CONFIG $xft_config_args --libs`
+ xft_config_major_version=`$XFT_CONFIG $xft_config_args --version | \
============================================================
--- packages/fvwm/files/oe-configure.ac.patch 4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75
+++ packages/fvwm/files/oe-configure.ac.patch 4e865a38ec6a1a3c6e368c12c0ce2f135e54ae75
@@ -0,0 +1,56 @@
+upstream: OE-only
+origin: Yuri Bushmelev <jay4mail at gmail.com>
+comment: disable mkstemp() safety check, X11/keysym.h check and old libstroke check
+--- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400
++++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400
+@@ -1405,7 +1407,8 @@
+
+ # check for mkstemp, see the discution on this subject on the fvwm workers
+ # list (2001-02-16 and 2001-02-24)
+-AM_SAFETY_CHECK_MKSTEMP
++#AM_SAFETY_CHECK_MKSTEMP
++AC_DEFINE(HAVE_SAFETY_MKSTEMP)
+
+ # If we do not have atexit(), then check for on_exit()
+ if test x$ac_cv_func_atexit = xno; then
+@@ -1465,23 +1468,23 @@
+ problem_gnomehints=": Explicitly disabled"
+ fi
+
+-# Define some compatibility macros needed for config.h.
+-mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
+- [defined XK_Page_Up && defined XK_Page_Down],
+- [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS],
+- [Old AIX systems (3.2.5) don't define some common keysyms.])
+-AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
+-[#ifdef COMPAT_OLD_KEYSYMDEF
+-# define XK_Page_Up XK_Prior
+-# define XK_Page_Down XK_Next
+-#endif])
+-
+-if test x"$with_stroke" = xyes; then
+- mg_DEFINE_IF_NOT([#include <stroke.h>],
+- [defined STROKE_MAX_SEQUENCE],
+- [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS],
+- [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.])
+-fi
++## Define some compatibility macros needed for config.h.
++#mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
++# [defined XK_Page_Up && defined XK_Page_Down],
++# [COMPAT_OLD_KEYSYMDEF], [$X_CFLAGS],
++# [Old AIX systems (3.2.5) don't define some common keysyms.])
++#AH_VERBATIM([_COMPAT_OLD_KEYSYMDEF],
++#[#ifdef COMPAT_OLD_KEYSYMDEF
++## define XK_Page_Up XK_Prior
++## define XK_Page_Down XK_Next
++##endif])
++
++#if test x"$with_stroke" = xyes; then
++# mg_DEFINE_IF_NOT([#include <stroke.h>],
++# [defined STROKE_MAX_SEQUENCE],
++# [COMPAT_OLD_LIBSTROKE], [$stroke_CFLAGS],
++# [Old libstroke <= 0.4 does not use STROKE_ prefix for constants.])
++#fi
+ AH_VERBATIM([_COMPAT_OLD_LIBSTROKE],
+ [#ifdef COMPAT_OLD_LIBSTROKE
+ /* currently we only use one constant */
============================================================
--- packages/fvwm/files/upstream-configure.ac.patch a568633c0100b87cff00930b1f23aa83bda56e84
+++ packages/fvwm/files/upstream-configure.ac.patch a568633c0100b87cff00930b1f23aa83bda56e84
@@ -0,0 +1,26 @@
+upstream: http://fvwm.lair.be/viewtopic.php?f=49&t=2107
+status: pending
+origin: Yuri Bushmelev <jay4mail at gmail.com>
+comment: fixes libs detection in configure when cross-compiling
+--- fvwm-2.5.26/configure.ac.orig 2008-06-11 15:44:28.000000000 +0400
++++ fvwm-2.5.26/configure.ac 2008-06-11 15:44:46.000000000 +0400
+@@ -792,7 +792,8 @@
+ problem_xpm=": Internal xpm detection logic error"
+ fi
+ fi],
+- [with_xpm=no; problem_xpm=": Xpm test error, see config.log"])
++ [with_xpm=no; problem_xpm=": Xpm test error, see config.log"],
++ [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ AC_MSG_RESULT($with_xpm)
+ CPPFLAGS="$my_CPPFLAGS"
+ LIBS="$my_LIBS"
+@@ -840,7 +841,8 @@
+ problem_png=": Internal png detection logic error"
+ fi
+ fi],
+- [with_png="no"; problem_png=": png test error, see config.log"])
++ [with_png="no"; problem_png=": png test error, see config.log"],
++ [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ AC_MSG_RESULT($with_png)
+ CPPFLAGS="$my_CPPFLAGS"
+ LIBS="$my_LIBS"
============================================================
--- packages/fvwm/fvwm_2.5.26.bb 93a5c0c7fcfc00221d47c5c222ec083b77226ece
+++ packages/fvwm/fvwm_2.5.26.bb 93a5c0c7fcfc00221d47c5c222ec083b77226ece
@@ -0,0 +1,46 @@
+SECTION = "x11/wm"
+DESCRIPTION = "FVWM Window Manager"
+LICENSE = "GPL"
+DEPENDS = "virtual/libx11 libxext libxfixes libxpm xrandr xft libxml2 zlib libice libxau libxcb libxcursor libxdmcp libxrender libpng librsvg fontconfig libstroke"
+
+SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 \
+ file://oe-configure.ac.patch;patch=1 \
+ file://upstream-configure.ac.patch;patch=1 \
+ file://acinclude.m4.patch;patch=1 \
+ "
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-xinerama --disable-bidi --disable-perllib \
+ --disable-gtk --without-gnome --without-imlib \
+ --disable-freetypetest --disable-fontconfigtest --disable-xfttest \
+ --disable-imlibtest --disable-sm \
+ "
+
+PACKAGES =+ "${PN}-perl"
+
+FILES_${PN}-dbg += " \
+ ${libexecdir}/${PN}/${PV}/.debug \
+ ${bindir}/${PN}-bug \
+"
+
+FILES_${PN}-dev += "${bindir}/${PN}-config"
+
+FILES_${PN}-perl = " \
+ ${bindir}/${PN}-convert-2.4 \
+ ${bindir}/${PN}-convert-2.6 \
+ ${bindir}/${PN}-menu* \
+ ${bindir}/${PN}-perllib \
+ ${libexecdir}/${PN}/${PV}/FvwmPerl \
+ ${libexecdir}/${PN}/${PV}/FvwmCommand.pm \
+ ${libexecdir}/${PN}/${PV}/FvwmConsoleC.pl \
+ ${libexecdir}/${PN}/${PV}/FvwmDebug \
+ ${libexecdir}/${PN}/${PV}/FvwmGtkDebug \
+ ${libexecdir}/${PN}/${PV}/FvwmTabs \
+ ${libexecdir}/${PN}/${PV}/FvwmWindowMenu \
+ ${datadir}/${PN}/FvwmScript-ComExample \
+ ${datadir}/${PN}/FvwmScript-Setup95 \
+ ${datadir}/${PN}/fvwm-script-setup95.pl \
+ ${datadir}/${PN}/fvwm-script-ComExample.pl \
+"
+
============================================================
--- packages/gnome/gconf_2.6.1.bb 8576f10b7a8c6bc87cc71f24e3065ec4b52d572b
+++ packages/gnome/gconf_2.6.1.bb 0089690cddb11048bb5f20d090561701b1542220
@@ -3,7 +3,7 @@ ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE
LICENSE = "LGPL"
DEPENDS = "orbit2 glib-2.0 libxml2"
ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/GConf-${PV}"
@@ -20,7 +20,10 @@ do_stage() {
}
do_stage() {
- autotools_stage_all
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
}
do_install() {
@@ -28,4 +31,4 @@ FILES_${PN} += " ${libdir}/GConf/*"
}
FILES_${PN} += " ${libdir}/GConf/*"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
-FILES_gconf-dbg += "${libdir}/*/*/.debug"
#
# mt diff -rde7fa612bd9d4ae1e7ffb3f036835b8023dfa1ca -rfdc62f053fbe3d0db3b1e0a470185541cf8c0dc1
#
#
#
# delete "packages/linux/linux-omap2-git/beagleboard/flash.patch"
#
# delete "packages/linux/linux-omap2-git/beagleboard/flash2.patch"
#
# add_dir "packages/openmax"
#
# add_dir "packages/openmax/gst-openmax"
#
# add_file "packages/dvbtools/wscan_20080720.bb"
# content [52a3be74a31e93046af2d5a4e6f97de827f031da]
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch"
# content [6c628c3b14fcd2311708e6c5c0476b7424bde03e]
#
# add_file "packages/mozilla/firefox-3.0.1/configure-wchart.patch"
# content [4968b9fd9bf2696db9e1fe1e9ccb7a65ea7cfae4]
#
# add_file "packages/mozilla/firefox-3.0.1/wchart.diff"
# content [660eb01fb61ec968f792b9e589f6ac36c1d74bfc]
#
# add_file "packages/openmax/gst-openmax/check.diff"
# content [529efd5da40132846a3b9f486a964ed181172fa3]
#
# add_file "packages/openmax/gst-openmax_0.10.0.4.bb"
# content [aff077d569ce12cb4c35561b4eb7b540f8dc007d]
#
# add_file "packages/openmax/libomxil-bellagio_0.9.0.bb"
# content [fda311d4a0f0f4e5e8e500079e7e19d321341b47]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [b95d010568a0ab37a6ab0ef5c267c9d3580ace9d]
# to [2444e0335de6facacd9f9a2e3622fd5d31f23e4d]
#
# patch "packages/gstreamer/gst-common.inc"
# from [860249c91df6da7ad81a6dffba9d5529cc114c67]
# to [312b6f501cb0d90950525431c523780c57f0b623]
#
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
# from [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
# to [ceff85a9459f581a2755200ffe0ecbc98dfc2c79]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [5dcf73d1dc04bac818a527f9cc2fe572619f8d29]
# to [c23b7af31c00fe87a9bcf702cd52ff278c144bea]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [1c611a9841069aa3ea975876ec119421f07d7b4f]
# to [ff0b8fc25b7fd96f207d47814cc87e62ea2f543b]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.25.bb"
# from [db5fbde3ea8fba339863fac327c7734070be0da6]
# to [2bff3cf48922ef5f800c00275b9984a8b4b7830d]
#
# patch "packages/mozilla/firefox.inc"
# from [9cdff3e71af462808623a28725cba0f39226935a]
# to [fcf882c98cb2ecfebe08686ffb477faf55261957]
#
# patch "packages/mozilla/firefox_3.0.1.bb"
# from [22b0e6a3607ce7e064f1ba4f8113b4b42c0f2514]
# to [64ddbb96bcbf8c24fb73e9aaeb83eac4ff7ae95b]
#
# patch "packages/qmake/qmake2-sdk_2.10a.bb"
# from [931674d68171befe4ba574c8c1333e334ac6efab]
# to [3d39aa347739eddb79fdf2674e4df325345a7853]
#
============================================================
--- packages/dvbtools/wscan_20080720.bb 52a3be74a31e93046af2d5a4e6f97de827f031da
+++ packages/dvbtools/wscan_20080720.bb 52a3be74a31e93046af2d5a4e6f97de827f031da
@@ -0,0 +1,15 @@
+DESCRIPTION = "Wscan is a dvb channel scanner that doesn't require an initial frequency table"
+LICENSE = "GPLv2"
+
+SRC_URI = "http://wirbel.htpc-forum.de/w_scan/w_scan-${PV}.tar.bz2"
+S = "${WORKDIR}/w_scan-${PV}"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 w_scan ${D}/${bindir}/
+
+ install -d ${D}/${datadir}/w_scan
+ install -m 0644 *.ids *.classes ${D}/${datadir}/w_scan/
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch 6c628c3b14fcd2311708e6c5c0476b7424bde03e
+++ packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch 6c628c3b14fcd2311708e6c5c0476b7424bde03e
@@ -0,0 +1,88 @@
+commit c8942f1f0a7e2160ebf2e51ba89e50ee5895a1e7
+Author: Patrick McHardy <kaber at trash.net>
+Date: Wed May 21 14:08:38 2008 -0700
+
+ netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__
+
+ Greg Steuck <greg at nest.cx> points out that some of the netfilter
+ headers can't be used in userspace without including linux/types.h
+ first. The headers include their own linux/types.h include statements,
+ these are stripped by make headers-install because they are inside
+ #ifdef __KERNEL__ however. Move them out to fix this.
+
+ Reported and Tested by Greg Steuck.
+
+ Signed-off-by: Patrick McHardy <kaber at trash.net>
+ Signed-off-by: David S. Miller <davem at davemloft.net>
+
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index e4c6659..0c5eb7e 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,6 @@
+
+ #ifdef __KERNEL__
+ #include <linux/init.h>
+-#include <linux/types.h>
+ #include <linux/skbuff.h>
+ #include <linux/net.h>
+ #include <linux/netdevice.h>
+@@ -14,6 +13,7 @@
+ #include <linux/list.h>
+ #include <net/net_namespace.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+
+ /* Responses from hook functions. */
+diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
+index dd9c97f..590ac3d 100644
+--- a/include/linux/netfilter_arp/arp_tables.h
++++ b/include/linux/netfilter_arp/arp_tables.h
+@@ -11,11 +11,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in.h>
+ #include <linux/if_arp.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_arp.h>
+
+diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
+index bfc889f..092bd50 100644
+--- a/include/linux/netfilter_ipv4/ip_tables.h
++++ b/include/linux/netfilter_ipv4/ip_tables.h
+@@ -17,11 +17,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in.h>
+ #include <linux/ip.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_ipv4.h>
+
+diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
+index f2507dc..1089e33 100644
+--- a/include/linux/netfilter_ipv6/ip6_tables.h
++++ b/include/linux/netfilter_ipv6/ip6_tables.h
+@@ -17,11 +17,11 @@
+
+ #ifdef __KERNEL__
+ #include <linux/if.h>
+-#include <linux/types.h>
+ #include <linux/in6.h>
+ #include <linux/ipv6.h>
+ #include <linux/skbuff.h>
+ #endif
++#include <linux/types.h>
+ #include <linux/compiler.h>
+ #include <linux/netfilter_ipv6.h>
+
============================================================
--- packages/mozilla/firefox-3.0.1/configure-wchart.patch 4968b9fd9bf2696db9e1fe1e9ccb7a65ea7cfae4
+++ packages/mozilla/firefox-3.0.1/configure-wchart.patch 4968b9fd9bf2696db9e1fe1e9ccb7a65ea7cfae4
@@ -0,0 +1,11 @@
+--- a/configure.in 2008-04-15 12:56:35.000000000 +0300
++++ b/configure.in.old 2008-03-20 21:17:09.000000000 +0200
+@@ -2743,7 +2743,7 @@
+
+ AC_CACHE_CHECK(for compiler -fshort-wchar option,
+ ac_cv_have_usable_wchar_option_v2,
+- [AC_TRY_LINK([#include <stddef.h>
++ [AC_TRY_COMPILE([#include <stddef.h>
+ $configure_static_assert_macros],
+ [CONFIGURE_STATIC_ASSERT(sizeof(wchar_t) == 2);
+ CONFIGURE_STATIC_ASSERT((wchar_t)-1 > (wchar_t) 0)],
============================================================
--- packages/mozilla/firefox-3.0.1/wchart.diff 660eb01fb61ec968f792b9e589f6ac36c1d74bfc
+++ packages/mozilla/firefox-3.0.1/wchart.diff 660eb01fb61ec968f792b9e589f6ac36c1d74bfc
@@ -0,0 +1,5850 @@
+--- iceweasel-3.0.1.orig/configure
++++ iceweasel-3.0.1/configure
+@@ -1110,7 +1110,7 @@
+ MSMANIFEST_TOOL=
+
+ MISSING_X=
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -1897,57 +1897,6 @@
+ fi
+ fi
+
+-for ac_declaration in \
+- ''\
+- '#include <stdlib.h>' \
+- 'extern "C" void std::exit (int) throw (); using std::exit;' \
+- 'extern "C" void std::exit (int); using std::exit;' \
+- 'extern "C" void exit (int) throw ();' \
+- 'extern "C" void exit (int);' \
+- 'void exit (int);'
+-do
+- cat > conftest.$ac_ext <<EOF
+-#line 1911 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+- :
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+- rm -rf conftest*
+- continue
+-fi
+-rm -f conftest*
+- cat > conftest.$ac_ext <<EOF
+-#line 1929 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+- rm -rf conftest*
+- break
+-else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test -n "$ac_declaration"; then
+- echo '#ifdef __cplusplus' >>confdefs.h
+- echo $ac_declaration >>confdefs.h
+- echo '#endif' >>confdefs.h
+-fi
+-
+-
+
+ case "$build:$target" in
+ powerpc-apple-darwin8*:i?86-apple-darwin*)
+@@ -1961,7 +1910,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1965: checking for $ac_word" >&5
++echo "configure:1914: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1996,7 +1945,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2000: checking for $ac_word" >&5
++echo "configure:1949: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2031,7 +1980,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2035: checking for $ac_word" >&5
++echo "configure:1984: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2072,7 +2021,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2076: checking for $ac_word" >&5
++echo "configure:2025: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2107,7 +2056,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2111: checking for $ac_word" >&5
++echo "configure:2060: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2142,7 +2091,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2146: checking for $ac_word" >&5
++echo "configure:2095: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2180,7 +2129,7 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2184: checking for $ac_word" >&5
++echo "configure:2133: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2210,7 +2159,7 @@
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2214: checking for $ac_word" >&5
++echo "configure:2163: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2261,7 +2210,7 @@
+ # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2265: checking for $ac_word" >&5
++echo "configure:2214: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2293,7 +2242,7 @@
+ fi
+
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2297: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2246: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2304,12 +2253,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 2308 "configure"
++#line 2257 "configure"
+ #include "confdefs.h"
+
+ main(){return(0);}
+ EOF
+-if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -2335,12 +2284,12 @@
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2339: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2288: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
+
+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:2344: checking whether we are using GNU C" >&5
++echo "configure:2293: checking whether we are using GNU C" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2349,7 +2298,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+@@ -2368,7 +2317,7 @@
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:2372: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2321: checking whether ${CC-cc} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2404,7 +2353,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2408: checking for $ac_word" >&5
++echo "configure:2357: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2436,7 +2385,7 @@
+
+
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:2440: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:2389: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -2447,12 +2396,12 @@
+
+ cat > conftest.$ac_ext << EOF
+
+-#line 2451 "configure"
++#line 2400 "configure"
+ #include "confdefs.h"
+
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2405: \"$ac_lin%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list