[oe-commits] org.oe.dev merge of '0032a5aa8024f5f2c529e386ce8e631cbe32131e'
woglinde2 commit
oe at amethyst.openembedded.net
Fri Jul 25 15:57:50 UTC 2008
merge of '0032a5aa8024f5f2c529e386ce8e631cbe32131e'
and '0948ccadfd54691007037bfcc956a41728ab914d'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 304f8d3e9b1a5215fcf57cab67dae1c98eefdb8f
ViewMTN: http://monotone.openembedded.org/revision/info/304f8d3e9b1a5215fcf57cab67dae1c98eefdb8f
Files:
1
packages/alsa/alsa-versym.inc
packages/speex/speex_1.0.4.bb
packages/speex/speex_1.1.12.bb
packages/speex/speex_1.1.7.bb
packages/speex/speex_1.2-beta3.bb
packages/tslib/tslib/bd-neon/tslib.sh
packages/dnsmasq/dnsmasq_2.38.bb
packages/dnsmasq/dnsmasq_2.45.bb
packages/pulseaudio/pulseaudio-0.9.11
packages/gpe-su/gpe-su_0.20.bb
packages/libgpewidget/libgpewidget_0.117.bb
packages/pulseaudio/pulseaudio-0.9.11/2113.diff
packages/pulseaudio/pulseaudio-0.9.11/2114.diff
packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch
packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch
packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch
packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch
packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch
packages/pulseaudio/pulseaudio_0.9.11.bb
packages/speex/speex_1.2.bb
classes/icecc.bbclass
conf/distro/include/preferred-om-2008-versions.inc
conf/machine/netvista.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/initrdscripts/initramfs-kexec_1.0.bb
packages/linux/linux-2.6.23/netvista/defconfig
packages/tasks/task-gpe-base.bb
packages/tslib/tslib/bd-neon/ts.conf
packages/tslib/tslib_1.0.bb
Diffs:
#
# mt diff -r0032a5aa8024f5f2c529e386ce8e631cbe32131e -r304f8d3e9b1a5215fcf57cab67dae1c98eefdb8f
#
#
#
# patch "packages/alsa/alsa-versym.inc"
# from [957d390b9f2272ea29b2cb24f7e33f8ca8843d15]
# to [ee3bac83a82fa536deab3a9b0d3b47dfacfab388]
#
============================================================
--- packages/alsa/alsa-versym.inc 957d390b9f2272ea29b2cb24f7e33f8ca8843d15
+++ packages/alsa/alsa-versym.inc ee3bac83a82fa536deab3a9b0d3b47dfacfab388
@@ -4,18 +4,3 @@ def get_alsa_versym_setting(bb, d):
if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
return "--with-versioned=no"
return ""
-
-
-def get_alsa_versym_setting(bb, d):
- # Versioned symbols don't work propery with uClibc
- if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
- return "--with-versioned=no"
- return ""
-
-
-def get_alsa_versym_setting(bb, d):
- # Versioned symbols don't work propery with uClibc
- if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0:
- return "--with-versioned=no"
- return ""
-
#
# mt diff -r0948ccadfd54691007037bfcc956a41728ab914d -r304f8d3e9b1a5215fcf57cab67dae1c98eefdb8f
#
#
#
# delete "packages/speex/speex_1.0.4.bb"
#
# delete "packages/speex/speex_1.1.12.bb"
#
# delete "packages/speex/speex_1.1.7.bb"
#
# delete "packages/speex/speex_1.2-beta3.bb"
#
# delete "packages/tslib/tslib/bd-neon/tslib.sh"
#
# rename "packages/dnsmasq/dnsmasq_2.38.bb"
# to "packages/dnsmasq/dnsmasq_2.45.bb"
#
# add_dir "packages/pulseaudio/pulseaudio-0.9.11"
#
# add_file "packages/gpe-su/gpe-su_0.20.bb"
# content [ee9d5997abef9b50de5f430cd2e882c211906c10]
#
# add_file "packages/libgpewidget/libgpewidget_0.117.bb"
# content [b0c070d4f2cfa704c9379750ab366355e92563a2]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/2113.diff"
# content [0046507a819e54bd7d7863b060daad48bfb88960]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/2114.diff"
# content [8e4a6ffafeeb9ae461826916e50b44596f3a4c7d]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch"
# content [b99293dea237d4c20896a58f07a407aa254d865e]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch"
# content [d592e1582c3efd71bd9ff351ad21eb43951307ef]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch"
# content [3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch"
# content [3e84133dc42bed50437a4d5910f0ace625c11e93]
#
# add_file "packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch"
# content [b5f462c3864f66bdb12757d2e5dd7731d47e1f38]
#
# add_file "packages/pulseaudio/pulseaudio_0.9.11.bb"
# content [ae69d47cf61b4ccc4819ec99c0d7bee736221489]
#
# add_file "packages/speex/speex_1.2.bb"
# content [62d80f520ab6363d5a91f147d1a750a91550a252]
#
# patch "classes/icecc.bbclass"
# from [9c947e1b89f7e9f05b8448240eee79d396cce6b0]
# to [a138cd782d31fb7b6a7dab8c89a1cd1bdbc901ae]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [398b1c782a663466e0069988b2abf9e09f37a1ad]
# to [1b5cac00d46388ab063fd9310c8e3b9aac2ac9c4]
#
# patch "conf/machine/netvista.conf"
# from [1e8916b0ef719e2519ead2446fbf85bb7d5a455a]
# to [f9365efa8c856367a0d936ad6ce959be4df0b48f]
#
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
# from [d15cc6aacfe8b486cda2afc1db23d838625b6e22]
# to [089be2aa36c43d51f94e09db1e42a7291c6b8c1d]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [d7bc43957414c34d3f5aac03b45f32b0b23d6d86]
# to [7db81e96548c8bd3dbcb37e96e83695ccaf7a9bc]
#
# patch "packages/initrdscripts/initramfs-kexec_1.0.bb"
# from [887f543ee47d7063adbb65d1337be522ec8c3fd7]
# to [19eebe40da32b895da48037b3aadec5cdda88979]
#
# patch "packages/linux/linux-2.6.23/netvista/defconfig"
# from [194cad167a3bd92c06baf952080953e93a7c0691]
# to [ecd7e14dbf92b73c96dbeca99f62b244e5f993d1]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [ab132c0f7f2cb6b6cfb49188855c0c5345502b81]
# to [acf55f8f5d7e22a3767bfe2c1a8be178c8644d5c]
#
# patch "packages/tslib/tslib/bd-neon/ts.conf"
# from [4b9e32da7b1b5a703348cc9d4fc2800494e9fb98]
# to [a3fae8541d77a6d7f5aed7eb5b73fbf41c483c91]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [d5ac4e962d47cee8d9cdd1b1c0e62a83088f730f]
# to [11f9ac2e626e92402422989031894d52cd8285e2]
#
============================================================
--- packages/gpe-su/gpe-su_0.20.bb ee9d5997abef9b50de5f430cd2e882c211906c10
+++ packages/gpe-su/gpe-su_0.20.bb ee9d5997abef9b50de5f430cd2e882c211906c10
@@ -0,0 +1,3 @@
+require gpe-su.inc
+
+PR = "r0"
============================================================
--- packages/libgpewidget/libgpewidget_0.117.bb b0c070d4f2cfa704c9379750ab366355e92563a2
+++ packages/libgpewidget/libgpewidget_0.117.bb b0c070d4f2cfa704c9379750ab366355e92563a2
@@ -0,0 +1,22 @@
+LICENSE = "LGPL"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ cairo libxrender gtk-doc"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpe pkgconfig autotools
+
+SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0"
+
+PACKAGES =+ "libgpewidget-bin"
+FILES_libgpewidget-bin = "${bindir}/*"
+
+EXTRA_OECONF = "--enable-cairo"
+
+LDFLAGS += " -L${STAGING_LIBDIR}"
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/2113.diff 0046507a819e54bd7d7863b060daad48bfb88960
+++ packages/pulseaudio/pulseaudio-0.9.11/2113.diff 0046507a819e54bd7d7863b060daad48bfb88960
@@ -0,0 +1,19 @@
+from upstream svn r2113
+
+Index: configure.ac
+===================================================================
+--- configure.ac (wersja 2112)
++++ configure.ac (wersja 2113)
+@@ -172,6 +172,12 @@
+ AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+
++old_LIBS=$LIBS
++LIBS="$LIBS $LIBLTDL"
++AC_CHECK_FUNCS([lt_dlmutex_register])
++LIBS=$old_LIBS
++AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+ AC_MSG_ERROR([[
+
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/2114.diff 8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
+++ packages/pulseaudio/pulseaudio-0.9.11/2114.diff 8e4a6ffafeeb9ae461826916e50b44596f3a4c7d
@@ -0,0 +1,15 @@
+from upstream svn r2114
+
+Index: configure.ac
+===================================================================
+--- configure.ac (wersja 2113)
++++ configure.ac (wersja 2114)
+@@ -176,7 +176,7 @@
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+-AC_CHECK_TYPES([lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
++AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
+
+ if test "x$enable_ltdl_install" = "xno" && test "x$ac_cv_lib_ltdl_lt_dlinit" = "xno" ; then
+ AC_MSG_ERROR([[
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch b99293dea237d4c20896a58f07a407aa254d865e
+++ packages/pulseaudio/pulseaudio-0.9.11/buildfix.patch b99293dea237d4c20896a58f07a407aa254d865e
@@ -0,0 +1,13 @@
+Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
+===================================================================
+--- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
++++ pulseaudio-0.9.11/src/pulsecore/atomic.h
+@@ -40,6 +40,8 @@
+ #error "Please include config.h before including this file!"
+ #endif
+
++#include "macro.h"
++
+ #ifdef HAVE_ATOMIC_BUILTINS
+
+ /* __sync based implementation */
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
+++ packages/pulseaudio/pulseaudio-0.9.11/libiconv.patch d592e1582c3efd71bd9ff351ad21eb43951307ef
@@ -0,0 +1,22 @@
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-07-20 13:16:51.548858829 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-07-20 13:43:39.842031837 +0200
+@@ -551,7 +551,7 @@
+
+ libpulse_la_CFLAGS = $(AM_CFLAGS)
+ libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO) -Wl,-version-script=$(srcdir)/map-file
+-libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
++libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV)
+
+ if HAVE_X11
+ libpulse_la_CFLAGS += $(X_CFLAGS)
+@@ -771,7 +771,7 @@
+
+ libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
+ libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
+-libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
++libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LTLIBICONV) libspeex-resampler-fixed.la libspeex-resampler-float.la libffmpeg-resampler.la
+
+ ###################################
+ # Plug-in support libraries #
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch 3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1
+++ packages/pulseaudio/pulseaudio-0.9.11/libpulsedsp-references-libpulsecore.patch 3496051ef5b89fcb9f9aa434e8092d99a3d2e4b1
@@ -0,0 +1,24 @@
+upstream: http://pulseaudio.org/ticket/287
+
+Index: pulseaudio-0.9.10/src/Makefile.am
+===================================================================
+--- pulseaudio-0.9.10.orig/src/Makefile.am 2008-03-30 03:43:05.000000000 +0200
++++ pulseaudio-0.9.10/src/Makefile.am 2008-05-03 11:55:46.000000000 +0200
+@@ -605,7 +605,7 @@
+
+ libpulsedsp_la_SOURCES = utils/padsp.c
+ libpulsedsp_la_CFLAGS = $(AM_CFLAGS)
+-libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la
++libpulsedsp_la_LIBADD = $(AM_LIBADD) libpulse.la libpulsecore.la
+ libpulsedsp_la_LDFLAGS = -avoid-version
+
+ ###################################
+@@ -888,7 +888,7 @@
+
+ libpstream_util_la_SOURCES = pulsecore/pstream-util.c pulsecore/pstream-util.h
+ libpstream_util_la_LDFLAGS = -avoid-version
+-libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la
++libpstream_util_la_LIBADD = $(AM_LIBADD) libpacket.la libpstream.la libtagstruct.la libpulsecore.la
+
+ libpdispatch_la_SOURCES = pulsecore/pdispatch.c pulsecore/pdispatch.h
+ libpdispatch_la_LDFLAGS = -avoid-version
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch 3e84133dc42bed50437a4d5910f0ace625c11e93
+++ packages/pulseaudio/pulseaudio-0.9.11/libtool2.patch 3e84133dc42bed50437a4d5910f0ace625c11e93
@@ -0,0 +1,48 @@
+Tell where is libltdl from libtool - was needed to get it built with libtool 2.2.4
+
+---
+ configure.ac | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+--- pulseaudio-0.9.10.orig/configure.ac
++++ pulseaudio-0.9.10/configure.ac
+@@ -242,20 +242,32 @@ if test $ret -eq 0 ; then
+ else
+ AC_MSG_RESULT([no])
+ fi
+
+ #### libtool stuff ####
+-
+-AC_LTDL_ENABLE_INSTALL
+-AC_LIBLTDL_INSTALLABLE
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
++LT_PREREQ([2.2])
++LT_INIT([dlopen win32-dll])
+ AC_PROG_LIBTOOL
+-AC_SUBST(LTDLINCL)
+-AC_SUBST(LIBLTDL)
++#AC_SUBST(LTDLINCL)
++#AC_SUBST(LIBLTDL)
+ AC_CONFIG_SUBDIRS(libltdl)
+
++AC_ARG_WITH(libltdl-libs,
++ [ --with-libltdl-libs=DIR path to libltdl libs], libltdl_libs_prefix=$withval)
++if test x$libltdl_libs_prefix != x; then
++ LIBLTDL="-L${libltdl_libs_prefix}/libltdl.so -lltdl"
++fi
++AC_SUBST(LIBLTDL)
++
++AC_ARG_WITH(libltdl-includes,
++ [ --with-libltdl-includes=DIR path to libltdl includes], libltdl_prefix=$withval)
++if test x$libltdl_prefix != x; then
++ LTDLINCL="-I${libltdl_prefix} ${libltdl_libs_prefix}/libltdl.so"
++fi
++AC_SUBST(LTDLINCL)
++
++
+ old_LIBS=$LIBS
+ LIBS="$LIBS $LIBLTDL"
+ AC_CHECK_FUNCS([lt_dlmutex_register])
+ LIBS=$old_LIBS
+ AC_CHECK_TYPES([struct lt_user_dlloader, lt_dladvise], , , [#include <ltdl.h>])
============================================================
--- packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch b5f462c3864f66bdb12757d2e5dd7731d47e1f38
+++ packages/pulseaudio/pulseaudio-0.9.11/pa-drop-caps-returns-void.patch b5f462c3864f66bdb12757d2e5dd7731d47e1f38
@@ -0,0 +1,17 @@
+upstream: http://pulseaudio.org/changeset/2213
+
+Index: pulseaudio-0.9.10/src/daemon/caps.c
+===================================================================
+--- pulseaudio-0.9.10.orig/src/daemon/caps.c 2008-05-03 12:10:26.000000000 +0200
++++ pulseaudio-0.9.10/src/daemon/caps.c 2008-05-03 12:10:30.000000000 +0200
+@@ -131,9 +131,8 @@
+ return 0;
+ }
+
+-int pa_drop_caps(void) {
++void pa_drop_caps(void) {
+ pa_drop_root();
+- return 0;
+ }
+
+ #endif
============================================================
--- packages/pulseaudio/pulseaudio_0.9.11.bb ae69d47cf61b4ccc4819ec99c0d7bee736221489
+++ packages/pulseaudio/pulseaudio_0.9.11.bb ae69d47cf61b4ccc4819ec99c0d7bee736221489
@@ -0,0 +1,31 @@
+require pulseaudio.inc
+
+DEPENDS += "dbus gdbm speex"
+PR = "r0"
+
+# work in progress
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "\
+ file://disable-using-glibc-tls.patch;patch=1 \
+ file://buildfix.patch;patch=1 \
+# file://libpulsedsp-references-libpulsecore.patch;patch=1 \
+# file://pa-drop-caps-returns-void.patch;patch=1 \
+# file://libtool2.patch;patch=1 \
+ file://2113.diff;patch=1;pnum=0 \
+ file://2114.diff;patch=1;pnum=0 \
+# file://libiconv.patch;patch=1 \
+"
+
+do_compile_prepend() {
+ cd ${S}
+ mkdir -p ${S}/libltdl
+ cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
+
+
+# problems w/ pulseaudio 0.9.10 atm:
+# 1.) needs libltdl >= 1.5.24 (yes, any older version will NOT work at runtime)
+# 2.) doesn't build w/ glibc TLS support (hence patched out)
+# 3.) fails with hierarchical pthread stuff w/ gst-pulse (hence patched out)
+
============================================================
--- packages/speex/speex_1.2.bb 62d80f520ab6363d5a91f147d1a750a91550a252
+++ packages/speex/speex_1.2.bb 62d80f520ab6363d5a91f147d1a750a91550a252
@@ -0,0 +1,49 @@
+DESCRIPTION = "Speex is an Open Source/Free Software patent-free audio compression format designed for speech."
+SECTION = "libs/multimedia"
+LICENSE = "BSD"
+HOMEPAGE = "http://www.speex.org"
+DEPENDS = "libogg"
+BETA = "1.2rc1"
+PV = "1.1+${BETA}"
+PR = "r0"
+
+SRC_URI = "http://downloads.us.xiph.org/releases/speex/speex-${BETA}.tar.gz"
+S = "${WORKDIR}/speex-${BETA}"
+
+PARALLEL_MAKE = ""
+
+inherit autotools pkgconfig
+
+LEAD_SONAME = "libspeex.so"
+
+# Some interesting options are:
+#
+# --enable-arm4-asm
+# --enable-arm5e-asm
+# --enable-blackfin-asm
+# --enable-fixed-point
+# --disable-float-api --disable-vbr (must disable-vbr if disable-float-api)
+#
+
+EXTRA_OECONF_append_openmn = " --enable-arm5e-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_amsdelta = " --enable-arm4-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_bfin = " --enable-blackfin-asm --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_arm = " --enable-fixed-point --disable-float-api --disable-vbr "
+EXTRA_OECONF_append_dht-walnut = " --enable-fixed-point --disable-float-api --disable-vbr "
+
+
+
+do_configure_append() {
+ sed -i s/"^OGG_CFLAGS.*$"/"OGG_CFLAGS = "/g Makefile */Makefile */*/Makefile
+ sed -i s/"^OGG_LIBS.*$"/"OGG_LIBS = -logg"/g Makefile */Makefile */*/Makefile
+ find . -name "Makefile" -exec sed -i s,-I/usr/include,, {} \;
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+PACKAGES =+ "${PN}-utils ${PN}-dsp"
+FILES_${PN}-utils = "${bindir}/speex*"
+FILES_${PN}-dsp = "${libdir}/libspeexdsp.so.*"
+FILES_${PN} = "${libdir}/libspeex.so.*"
============================================================
--- classes/icecc.bbclass 9c947e1b89f7e9f05b8448240eee79d396cce6b0
+++ classes/icecc.bbclass a138cd782d31fb7b6a7dab8c89a1cd1bdbc901ae
@@ -36,11 +36,11 @@ def icc_determine_gcc_version(gcc):
import os
return os.popen("%s --version" % gcc ).readline().split()[2]
+
def create_cross_env(bb,d):
"""
Create a tar.bz2 of the current toolchain
"""
-
# Constin native-native compilation no environment needed if
# host prefix is empty (let us duplicate the query for ease)
prefix = bb.data.expand('${HOST_PREFIX}', d)
@@ -55,14 +55,14 @@ def create_cross_env(bb,d):
target_prefix = bb.data.expand('${TARGET_PREFIX}', d)
float = bb.data.getVar('TARGET_FPU', d) or "hard"
name = socket.gethostname()
-
# Stupid check to determine if we have built a libc and a cross
# compiler.
try:
- os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libc.so'))
+ os.stat(os.path.join(ice_dir, target_sys, 'lib', 'libstdc++.so'))
os.stat(os.path.join(ice_dir, target_sys, 'bin', 'g++'))
except: # no cross compiler built yet
+ bb.error('no cross compiler built yet?')
return ""
VERSION = icc_determine_gcc_version( os.path.join(ice_dir,target_sys,"bin","g++") )
@@ -95,7 +95,6 @@ def create_native_env(bb,d):
def create_nati%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list