[oe-commits] org.oe.dev merge of 'd186ad540510a4f04ab08186965e402582c0b260'
thebohemian commit
oe at amethyst.openembedded.net
Thu Jul 10 15:01:31 UTC 2008
merge of 'd186ad540510a4f04ab08186965e402582c0b260'
and 'dabb7f768bbfa25e854f118a7221f3ec007f65ca'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: fb658027ee3ea092a27993cf5f5f80edb3ebc365
ViewMTN: http://monotone.openembedded.org/revision/info/fb658027ee3ea092a27993cf5f5f80edb3ebc365
Files:
1
packages/dasher/dasher-gpe_0.0cvs20040828.bb
packages/dasher/dasher-gpe_0.0-svn.bb
packages/gnash/files
packages/boost/boost.inc
packages/boost/files/gcc43.patch
packages/gnash/files/libtool-2.2.patch
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnuradio/gnuradio-3.1.2/gcc43.patch
packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff
packages/oprofile/oprofile/armv7a.diff
packages/swfdec/swfdec-mozilla_0.7.2.bb
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcrevs.inc
packages/angstrom/angstrom-feed-configs.bb
packages/boost/boost_1.33.0.bb
packages/boost/boost_1.33.1.bb
packages/efl1/emotion_cvs.bb
packages/glibc/glibc_2.6.1.bb
packages/gnash/gnash-minimal.inc
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.3.bb
packages/gnuradio/gnuradio_3.1.2.bb
packages/images/beagleboard-demo-image.bb
packages/initscripts/initscripts-1.0/arm/alignment.sh
packages/initscripts/initscripts_1.0.bb
packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libtool/libtool-native_2.2.4.bb
packages/linux/linux-2.6.25/at32stk1000/defconfig
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.25.bb
packages/oprofile/oprofile_0.9.3.bb
packages/oprofile/oprofile_cvs.bb
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot_git.bb
packages/cacao/cacao-native_0.99.1.bb
packages/cacao/cacao-native.inc
Diffs:
#
# mt diff -rd186ad540510a4f04ab08186965e402582c0b260 -rfb658027ee3ea092a27993cf5f5f80edb3ebc365
#
#
#
# rename "packages/dasher/dasher-gpe_0.0cvs20040828.bb"
# to "packages/dasher/dasher-gpe_0.0-svn.bb"
#
# add_dir "packages/gnash/files"
#
# add_file "packages/boost/boost.inc"
# content [23982c4430ff14b530e49895317457f361a57a34]
#
# add_file "packages/boost/files/gcc43.patch"
# content [1ff077b5453de587702ebb9950d119941216cdcb]
#
# add_file "packages/gnash/files/libtool-2.2.patch"
# content [91ea72837f6796d4c9f29ac0844d5b9657092fe3]
#
# add_file "packages/gnash/gnash-minimal_0.8.3.bb"
# content [6396b4820385850e505d3bf5e1590f4dac5ff6b6]
#
# add_file "packages/gnuradio/gnuradio-3.1.2/gcc43.patch"
# content [8e9d44bfb9cf8fcc08f154f4e65fd2826f855790]
#
# add_file "packages/linux/linux-omap2-git/beagleboard/oprofile-0.9.3.armv7.diff"
# content [8acb9f0bb442811dc768c395eeeeeb8dba9d110c]
#
# add_file "packages/oprofile/oprofile/armv7a.diff"
# content [287a599dc9191dd8fc275fafefb8d7b78910a678]
#
# add_file "packages/swfdec/swfdec-mozilla_0.7.2.bb"
# content [476a536d65a42dc84c8bb188f0b086df54ef315a]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
# to [3713139bc7b46ff4bc175e324f936414dd660e59]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6cfbf1c69e6043217ec87734e2314b527091aeec]
# to [50cf71bcebe08dea933ab20470606445ce693ae6]
#
# patch "packages/angstrom/angstrom-feed-configs.bb"
# from [eb9e83c8d5cdc3ec7d18e673a8c81e176e167f7d]
# to [2e7b80865ac098e14581cf6649712138efdd00e9]
#
# patch "packages/boost/boost_1.33.0.bb"
# from [e112502158b7f977f56f3408d0d4e06562698c72]
# to [afd60e5dc550128a67c34189be24ca5f16a6f2e9]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [f88f30ce00fdd7e116d616bca37b226e0075d922]
# to [83b349c6068a918976cf67fdfb733e2822e8d271]
#
# patch "packages/dasher/dasher-gpe_0.0-svn.bb"
# from [366badfcc1226677a27845b3a49248849818c11a]
# to [eba267777a15cac97479397963ef65680bfd3c1f]
#
# patch "packages/efl1/emotion_cvs.bb"
# from [07bb0f3a78b355b1d80ffc58470ee989fb34b92f]
# to [c3bd20586e6e23cf311985010d499d2fdbe8c247]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [72600385ebf1d9237fed74e0bae761983d19afb1]
# to [8b5e0d298c84d71b8a15be26527883a393e5483d]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [4f073317393d7ee6d728899ab795f4b07e013bf5]
# to [c3c53aff5fd4d52763504362f1899558f529a0db]
#
# patch "packages/gnash/gnash.inc"
# from [9c8c4d5fbf73bb78dc1770d8b3fbc18052b41d0d]
# to [f1ba5349c7103bbc21867a987ba4fd70a54822ea]
#
# patch "packages/gnash/gnash_0.8.3.bb"
# from [facb94648e617689b38f3bcebae0585eb83d3a2e]
# to [fe5259e673c242e3496cab9405c4b00220282bde]
#
# patch "packages/gnuradio/gnuradio_3.1.2.bb"
# from [baa5186795b05cdd302a106d122bc648b1f1cdae]
# to [a493d7dd99415d1f1e1dfaf6e2ac38c3410caa91]
#
# patch "packages/images/beagleboard-demo-image.bb"
# from [d362e5023c1dff3c8823218798672c694be98281]
# to [507ade7d8a590c01ceaa55b6f7dd588a8661de6d]
#
# patch "packages/initscripts/initscripts-1.0/arm/alignment.sh"
# from [6544097304498250b8bf76912fe06533cb7298f0]
# to [d336093321228a687516f0c73273c6b339258ab8]
#
# patch "packages/initscripts/initscripts_1.0.bb"
# from [f77c65c300bf290e8cd8506433653eba162768e6]
# to [5cc84fd6840a59197c8e43612fe543fcb5a7f446]
#
# patch "packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb"
# from [dd10fa5af16341c9504880876d39902c3aba02ee]
# to [1799b75c52d54e2de8fc78a9840e6e6b6aee3d49]
#
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
# from [c403e04d11ced9d66b77bf4e3d4802cca1f2af17]
# to [e27798807882c21d2bef0aacd6bd9266938b92f7]
#
# patch "packages/libtool/libtool-native_2.2.4.bb"
# from [18551b64f6257d3562fb76522c3398d20a46f579]
# to [71ac9dff8e0806ae6e07eb786725cbbf5e619106]
#
# patch "packages/linux/linux-2.6.25/at32stk1000/defconfig"
# from [e58ea006b9dbec7fc3aa726fa6fdd628cc05ea42]
# to [add4857fb15f5c279ee2641aa93ab52db6674902]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [81f96fedfc5d53381d9929c79967e5f90955d4a1]
# to [b5d96a75522b12be8dd3e72cf081527c4d789b5c]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [10ec409e4f0031504b4d5533955918e57fbe0f74]
# to [78de2062a368bd176b37a4ce2ee3b2030df83a7e]
#
# patch "packages/linux/linux_2.6.25.bb"
# from [5b672ab343221a419c814c98738534a4ccbae3cd]
# to [b363ee0b49f6ee2e1b5399434fb3b3ad388519fa]
#
# patch "packages/oprofile/oprofile_0.9.3.bb"
# from [51f8332de97969e3b83385400eabe2a803afd65d]
# to [47e36e539aec107088958b576f16f5d733b9c9bc]
#
# patch "packages/oprofile/oprofile_cvs.bb"
# from [8762b088fad85c1082825ff1935df909accc4f05]
# to [edb973302312f12a0ef6a634e389951120ae626b]
#
# patch "packages/u-boot/u-boot-git/beagleboard/base.patch"
# from [df07530c211e06732f6a1cc29550d437d7995ccd]
# to [1135185807d979f189a4aa922827442a60400f0c]
#
# patch "packages/u-boot/u-boot_git.bb"
# from [c152f9ec104c1fa4a53c08f9ad88de5ac58be2be]
# to [32b1019dfdf87033174dc1ae1adb1d36f6a8b300]
#
============================================================
--- packages/boost/boost.inc 23982c4430ff14b530e49895317457f361a57a34
+++ packages/boost/boost.inc 23982c4430ff14b530e49895317457f361a57a34
@@ -0,0 +1,157 @@
+# The Boost web site provides free peer-reviewed portable
+# C++ source libraries. The emphasis is on libraries which
+# work well with the C++ Standard Library. The libraries are
+# intended to be widely useful, and are in regular use by
+# thousands of programmers across a broad spectrum of applications.
+DESCRIPTION = "Free peer-reviewed portable C++ source libraries"
+HOMEPAGE = "http://www.boost.org/"
+SECTION = "libs"
+DEPENDS = "boost-jam-native zlib"
+PRIORITY = "optional"
+LICENSE = "Boost Software License"
+PR = "r1"
+
+BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
+BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
+BOOST_P = "boost_${BOOST_VER}"
+
+S = "${WORKDIR}/${BOOST_P}"
+
+# Make a package for each library, plus -dev and -python
+PACKAGES = "${PN}-dbg"
+BOOSTLIBS = ""
+
+PACKAGES += "boost-date-time"
+FILES_boost-date-time = "${libdir}/libboost_date_time.so.${PV}"
+
+BOOSTLIBS += "boost-filesystem"
+FILES_boost-filesystem = "${libdir}/libboost_filesystem.so.${PV}"
+
+BOOSTLIBS += "boost-prg-exec-monitor"
+FILES_boost-prg-exec-monitor = "${libdir}/libboost_prg_exec_monitor.so.${PV}"
+
+BOOSTLIBS += "boost-program-options"
+FILES_boost-program-options = "${libdir}/libboost_program_options.so.${PV}"
+
+BOOSTLIBS += "boost-regex"
+FILES_boost-regex = "${libdir}/libboost_regex.so.${PV}"
+
+BOOSTLIBS += "boost-signals"
+FILES_boost-signals = "${libdir}/libboost_signals.so.${PV}"
+
+BOOSTLIBS += "boost-test-exec-monitor"
+FILES_boost-test-exec-monitor = "${libdir}/libboost_test_exec_monitor.so.${PV}"
+
+BOOSTLIBS += "boost-thread-mt"
+FILES_boost-thread-mt = "${libdir}/libboost_thread-mt.so.${PV}"
+
+BOOSTLIBS += "boost-unit-test-framework"
+FILES_boost-unit-test-framework = "${libdir}/libboost_unit_test_framework.so.${PV}"
+
+BOOSTLIBS += "boost-iostreams"
+FILES_boost-iostreams = "${libdir}/libboost_iostreams.so.${PV}"
+
+BOOSTLIBS += "boost-serialization"
+FILES_boost-serialization = "${libdir}/libboost_serialization.so.${PV}"
+
+BOOSTLIBS += "boost-wserialization"
+FILES_boost-wserialization = "${libdir}/libboost_wserialization.so.${PV}"
+
+# Python - remove this and set:
+#PYTHON_ROOT = "/dev/null"
+# to remove the python build
+DEPENDS += "python"
+PYTHON_ROOT = "${STAGING_DIR_HOST}"
+PYTHON_VERSION = "2.4"
+
+BOOSTLIBS += "boost-python"
+FILES_boost-python = "${libdir}/libboost_python.so.${PV}"
+
+PACKAGES += "${BOOSTLIBS}"
+
+# -dev last to pick up the remaining stuff
+PACKAGES += "${PN}-dev"
+FILES_${PN}-dev = "${includedir} ${libdir}/libboost_*.so ${libdir}/libboost_*.a"
+
+# "boost" is a metapackage which pulls in all boost librabries
+PACKAGES += "${PN}"
+RRECOMMENDS_${PN} += "${BOOSTLIBS}"
+
+# Oh yippee, a new build system, it's sooo cooool I could eat my own
+# foot. inlining=on lets the compiler choose, I think. At least this
+# stuff is documented...
+# NOTE: if you leave <debug-symbols>on then in a debug build the build sys
+# objcopy will be invoked, and that won't work. Building debug apparently
+# requires hacking gcc-tools.jam
+#
+# Sometimes I wake up screaming. Famous figures are gathered in the nightmare,
+# Steve Bourne, Larry Wall, the whole of the ANSI C committee. They're just
+# standing there, waiting, but the truely terrifying thing is what they carry
+# in their hands. At first sight each seems to bear the same thing, but it is
+# not so for the forms in their grasp are ever so slightly different one from
+# the other. Each is twisted in some grotesque way from the other to make each
+# an unspeakable perversion impossible to perceive without the onset of madness.
+# True insanity awaits anyone who perceives all of these horrors together.
+#
+# Quotation marks, there might be an easier way to do this, but I can't find
+# it. The problem is that the user.hpp configuration file must receive a
+# pre-processor macro defined as the appropriate string - complete with "'s
+# around it. (<> is a possibility here but the danger to that is that the
+# failure case interprets the < and > as shell redirections, creating
+# random files in the source tree.)
+#
+#bjam: '-DBOOST_PLATFORM_CONFIG=\"config\"'
+#do_compile: '-sGCC=... '"'-DBOOST_PLATFORM_CONFIG=\"config\"'"
+SQD = '"'
+EQD = '\"'
+#boost.bb: "... '-sGCC=... '${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}config${EQD}'${SQD} ..."
+BJAM_CONF = "${SQD}'-DBOOST_PLATFORM_CONFIG=${EQD}boost/config/platform/${TARGET_OS}.hpp${EQD}'${SQD}"
+
+# bzip2 and zip are disabled because... they're broken - the compilation simply
+# isn't working with bjam. I guess they will fix it, but who needs it? This
+# only affects the (new in 33) iostream library.
+BJAM_TOOLS = "-sTOOLS=gcc \
+ '-sGCC=${CC} '${BJAM_CONF} \
+ '-sGXX=${CXX} '${BJAM_CONF} \
+ '-sGCC_INCLUDE_DIRECTORY=${STAGING_INCDIR}' \
+ '-sGCC_STDLIB_DIRECTORY=${STAGING_LIBDIR}' \
+ '-sNO_BZIP2=1' \
+ '-sNO_ZLIB=1' \
+ '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \
+ '-sPYTHON_VERSION=${PYTHON_VERSION}' \
+ '--layout=system' \
+ "
+
+BJAM_OPTS = '${BJAM_TOOLS} \
+ --builddir=${S}/${TARGET_SYS} \
+ --with-python-root=${PYTHON_ROOT} \
+ ${BJAM_EXTRA}'
+
+
+do_configure_prepend() {
+ cp -f boost/config/platform/linux.hpp boost/config/platform/linux-gnueabi.hpp
+}
+
+do_compile() {
+ set -ex
+ bjam ${BJAM_OPTS} --prefix=${prefix} \
+ --exec-prefix=${exec_prefix} \
+ --libdir=${libdir} \
+ --includedir=${includedir}
+}
+
+do_stage() {
+ set -ex
+ bjam ${BJAM_OPTS} \
+ --libdir=${STAGING_LIBDIR} \
+ --includedir=${STAGING_INCDIR} \
+ install
+}
+
+do_install() {
+ set -ex
+ bjam ${BJAM_OPTS} \
+ --libdir=${D}${libdir} \
+ --includedir=${D}${includedir} \
+ install
+}
============================================================
--- packages/boost/files/gcc43.patch 1ff077b5453de587702ebb9950d119941216cdcb
+++ packages/boost/files/gcc43.patch 1ff077b5453de587702ebb9950d119941216cdcb
@@ -0,0 +1,256 @@
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp boost_1_34_1/boost/archive/polymorphic_iarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_iarchive.hpp 2005-12-11 00:12:51.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_iarchive.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision history.
+
+ #include <cstddef> // std::size_t
++#include <climits>
+ #include <boost/config.hpp>
+
+ #if defined(BOOST_NO_STDC_NAMESPACE)
+diff -aNru boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp boost_1_34_1/boost/archive/polymorphic_oarchive.hpp
+--- boost_1_34_1-ORIGINAL/boost/archive/polymorphic_oarchive.hpp 2006-02-11 23:43:06.000000000 -0600
++++ boost_1_34_1/boost/archive/polymorphic_oarchive.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -17,6 +17,7 @@
+ // See http://www.boost.org for updates, documentation, and revision history.
+
+ #include <cstddef> // size_t
++#include <climits>
+ #include <string>
+
+ #include <boost/config.hpp>
+diff -aNru boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp boost_1_34_1/boost/date_time/date_facet.hpp
+--- boost_1_34_1-ORIGINAL/boost/date_time/date_facet.hpp 2005-09-05 16:10:50.000000000 -0500
++++ boost_1_34_1/boost/date_time/date_facet.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -429,7 +429,7 @@
+ typedef std::basic_string<CharT> string_type;
+ typedef CharT char_type;
+ typedef boost::date_time::period_parser<date_type, CharT> period_parser_type;
+- typedef special_values_parser<date_type,CharT> special_values_parser_type;
++ typedef boost::date_time::special_values_parser<date_type,CharT> special_values_parser_type;
+ typedef std::vector<std::basic_string<CharT> > input_collection_type;
+ typedef format_date_parser<date_type, CharT> format_date_parser_type;
+ // date_generators stuff goes here
+diff -aNru boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp boost_1_34_1/boost/mpl/zip_view.hpp
+--- boost_1_34_1-ORIGINAL/boost/mpl/zip_view.hpp 2004-09-02 10:40:42.000000000 -0500
++++ boost_1_34_1/boost/mpl/zip_view.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -37,7 +37,7 @@
+ typedef zip_iterator<
+ typename transform1<
+ IteratorSeq
+- , next<_1>
++ , boost::mpl::next<_1>
+ >::type
+ > next;
+ };
+@@ -48,8 +48,8 @@
+ struct zip_view
+ {
+ private:
+- typedef typename transform1< Sequences, begin<_1> >::type first_ones_;
+- typedef typename transform1< Sequences, end<_1> >::type last_ones_;
++ typedef typename transform1< Sequences, boost::mpl::begin<_1> >::type first_ones_;
++ typedef typename transform1< Sequences, boost::mpl::end<_1> >::type last_ones_;
+
+ public:
+ typedef nested_begin_end_tag tag;
+diff -aNru boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp boost_1_34_1/boost/python/detail/def_helper.hpp
+--- boost_1_34_1-ORIGINAL/boost/python/detail/def_helper.hpp 2004-09-15 20:00:28.000000000 -0500
++++ boost_1_34_1/boost/python/detail/def_helper.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -155,7 +155,7 @@
+ , T3 const&
+ , T4 const&
+ , default_call_policies
+- , keywords<0>
++ , boost::python::detail::keywords<0>
+ , char const*
+ , void(not_specified::*)() // A function pointer type which is never an
+ // appropriate default implementation
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_creator.hpp 2006-07-16 11:06:38.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex_creator.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -24,6 +24,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+
+ namespace re_detail{
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp boost_1_34_1/boost/regex/v4/basic_regex.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex.hpp 2007-06-05 12:28:18.000000000 -0500
++++ boost_1_34_1/boost/regex/v4/basic_regex.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ #ifdef BOOST_MSVC
+ #pragma warning(push)
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/basic_regex_parser.hpp 2006-12-20 11:19:05.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/basic_regex_parser.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -23,6 +23,8 @@
+ # include BOOST_ABI_PREFIX
+ #endif
+
++#include <climits>
++
+ namespace boost{
+ namespace re_detail{
+
+diff -aNru boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp
+--- boost_1_34_1-ORIGINAL/boost/regex/v4/cpp_regex_traits.hpp 2007-01-15 05:09:44.000000000 -0600
++++ boost_1_34_1/boost/regex/v4/cpp_regex_traits.hpp 2008-03-03 03:08:59.000000000 -0600
+@@ -41,6 +41,7 @@
+
+ #inclu%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rdabb7f768bbfa25e854f118a7221f3ec007f65ca -rfb658027ee3ea092a27993cf5f5f80edb3ebc365
#
#
#
# add_file "packages/cacao/cacao-native_0.99.1.bb"
# content [99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22]
#
# patch "packages/cacao/cacao-native.inc"
# from [cc20995498c174c9ac504a54e5d844cfddfb8f3f]
# to [32a14daad8bfa543857bf859355a62c3f31fb623]
#
============================================================
--- packages/cacao/cacao-native_0.99.1.bb 99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
+++ packages/cacao/cacao-native_0.99.1.bb 99b2a0554ed0083d21e60e8b10e7d9bf9f96ea22
@@ -0,0 +1,7 @@
+require cacao-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+ "
+
============================================================
--- packages/cacao/cacao-native.inc cc20995498c174c9ac504a54e5d844cfddfb8f3f
+++ packages/cacao/cacao-native.inc 32a14daad8bfa543857bf859355a62c3f31fb623
@@ -13,12 +13,18 @@ EXTRA_OECONF = "\
inherit native autotools
EXTRA_OECONF = "\
- --enable-debug \
- --with-classpath-libdir=${libdir} \
- --with-classpath-includedir=${includedir}/classpath \
- --with-classpath-classes=${datadir}/classpath/glibj.zip \
- --with-vm-zip=${datadir}/cacao/vm.zip \
- "
+ --enable-debug \
+ --with-vm-zip=${datadir}/cacao/vm.zip \
+ \
+ --with-classpath-libdir=${libdir_jni}:${libdir} \
+ --with-classpath-includedir=${includedir}/classpath \
+ --with-classpath-classes=${datadir}/classpath/glibj.zip \
+ \
+ --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
+ --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
+ --with-jni_md_h=${incdir}/classpath \
+ --with-jni_h=${incdir}/classpath \
+ "
# force usage of ecj-initial (but Java5-compatible class library)
export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
More information about the Openembedded-commits
mailing list