[oe-commits] org.oe.dev merge of '6516a85d1d78f28686ffc271f1b433d8bc839bd1'
koen commit
oe at amethyst.openembedded.net
Mon Sep 1 17:55:48 UTC 2008
merge of '6516a85d1d78f28686ffc271f1b433d8bc839bd1'
and 'df082d3d98bc922e6be0b10b2470f6fa81c5dd64'
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 76e2f9f39ea8c9a8f1273a9f71f395b9a702d526
ViewMTN: http://monotone.openembedded.org/revision/info/76e2f9f39ea8c9a8f1273a9f71f395b9a702d526
Files:
1
packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch
packages/linux-libc-headers/linux-libc-headers_2.6.25.bb
packages/linux/linux-omap2-git/beagleboard/flash.patch
packages/linux/linux-omap2-git/beagleboard/flash2.patch
packages/openmax
packages/openmax/gst-openmax
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
classes/oestats-client.bbclass
conf/machine/include/neuros.inc
packages/ffmpeg/ffmpeg_git.bb
packages/gstreamer/gst-common.inc
packages/gstreamer/gstreamer_0.10.17.bb
packages/linux/linux-omap2_git.bb
packages/mozilla/files/arm/jsautocfg.h
packages/mozilla/firefox.inc
packages/mozilla/firefox_3.0.1.bb
packages/qmake/qmake2-sdk_2.10a.bb
packages/rrdtool/rrdtool_1.0.49.bb
packages/u-boot/u-boot_git.bb
site/common
Diffs:
#
# mt diff -r6516a85d1d78f28686ffc271f1b433d8bc839bd1 -r76e2f9f39ea8c9a8f1273a9f71f395b9a702d526
#
#
#
# add_file "packages/linux-libc-headers/linux-libc-headers-2.6.25/netfilter-include-types_h-in-userspace.patch"
# content [6c628c3b14fcd2311708e6c5c0476b7424bde03e]
#
# patch "packages/linux-libc-headers/linux-libc-headers_2.6.25.bb"
# from [db5fbde3ea8fba339863fac327c7734070be0da6]
# to [2bff3cf48922ef5f800c00275b9984a8b4b7830d]
#
============================================================
--- 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/linux-libc-headers/linux-libc-headers_2.6.25.bb db5fbde3ea8fba339863fac327c7734070be0da6
+++ packages/linux-libc-headers/linux-libc-headers_2.6.25.bb 2bff3cf48922ef5f800c00275b9984a8b4b7830d
@@ -2,11 +2,12 @@ DEPENDS += "unifdef-native"
INHIBIT_DEFAULT_DEPS = "1"
DEPENDS += "unifdef-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://reinstate-a.out.h.patch;patch=1 \
file://fix-kernel-conditionalize-a.out.h.patch;patch=1 \
+ file://netfilter-include-types_h-in-userspace.patch;patch=1 \
file://procinfo.h"
S = "${WORKDIR}/linux-${PV}"
#
# mt diff -rdf082d3d98bc922e6be0b10b2470f6fa81c5dd64 -r76e2f9f39ea8c9a8f1273a9f71f395b9a702d526
#
#
#
# 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/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 "classes/oestats-client.bbclass"
# from [589563f5373f1a4448a5ea5dd3915a3010a96e46]
# to [19e8a8126dc390bff3a6d661c26c0059f1826bee]
#
# patch "conf/machine/include/neuros.inc"
# from [463c135b094d059208a51b5db696586d9746cfdf]
# to [768822071b8c4f2371db5a99caea2cc67c9688b0]
#
# 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.bb"
# from [1c611a9841069aa3ea975876ec119421f07d7b4f]
# to [fefff33cc8166b4fc84f2c788fef8919f013528e]
#
# patch "packages/mozilla/files/arm/jsautocfg.h"
# from [0b4d3eb4b5ac8e0a78bbc28e13e60ba1866d5545]
# to [78154429792d9ed445d61bd54c720bfdec5e355e]
#
# patch "packages/mozilla/firefox.inc"
# from [9cdff3e71af462808623a28725cba0f39226935a]
# to [fcf882c98cb2ecfebe08686ffb477faf55261957]
#
# patch "packages/mozilla/firefox_3.0.1.bb"
# from [3cc3084dbdb8556bcde37d7a6be2f522197a3431]
# to [64ddbb96bcbf8c24fb73e9aaeb83eac4ff7ae95b]
#
# patch "packages/qmake/qmake2-sdk_2.10a.bb"
# from [931674d68171befe4ba574c8c1333e334ac6efab]
# to [3d39aa347739eddb79fdf2674e4df325345a7853]
#
# patch "packages/rrdtool/rrdtool_1.0.49.bb"
# from [a364d6c23ab74530732b748ae5ffa3e7df3c3e57]
# to [b213b9e3759ac6784e9cfef5ef940a4a3bb3ada4]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [d6f57b875760d8fdc4c425c893e466af16f398cf]
# to [0e9012f6590523e507479e4b09fcdadbbecefc75]
#
# patch "site/common"
# from [857abced4aa9fe4d65b58b9a23c6d110159eb31a]
# to [e8c0ed0b7341bdaa54cca3f47e8830cd294f24e0]
#
============================================================
--- 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_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ ac_cv_prog_cxx_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+@@ -2478,12 +2427,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 ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:2482: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:2487: checking whether we are using GNU C++" >&5
++echo "configure:2436: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2492,7 +2441,7 @@
+ yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gxx=yes
+ else
+ ac_cv_prog_gxx=no
+@@ -2511,7 +2460,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:2515: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:2464: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2542,61 +2491,10 @@
+ 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 2556 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2564: \"$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 2574 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2581: \"$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
+-
+-
+ # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2600: checking for $ac_word" >&5
++echo "configure:2498: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $a%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list