[oe-commits] org.oe.dev merge of 'ebd727bf8ca3469350ae2b7ab8bca02b33cff34a'
oe commit
oe at amethyst.openembedded.net
Thu May 1 20:36:58 UTC 2008
merge of 'ebd727bf8ca3469350ae2b7ab8bca02b33cff34a'
and 'f43ebd3fe80818a901c13cc53bbade0c16a21477'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a1d436a1b0cce90dce4363a3bfd62bd8c6f53913
ViewMTN: http://monotone.openembedded.org/revision/info/a1d436a1b0cce90dce4363a3bfd62bd8c6f53913
Files:
1
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/boost/files/atomic_count_gcc_atomicity.patch
packages/binutils/binutils-avr32.inc
packages/boost/boost_1.33.1.bb
packages/gnash/gnash-minimal_0.8.2.bb
Diffs:
#
# mt diff -rebd727bf8ca3469350ae2b7ab8bca02b33cff34a -ra1d436a1b0cce90dce4363a3bfd62bd8c6f53913
#
#
#
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
# from [be915c43601a85e473bfe81da31c8f2179696358]
# to [20e4cbd16fbc6711586e320ecc9be434d34cae66]
#
============================================================
--- packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb be915c43601a85e473bfe81da31c8f2179696358
+++ packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb 20e4cbd16fbc6711586e320ecc9be434d34cae66
@@ -26,10 +26,12 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
--with-sqlite-libs=${STAGING_LIBDIR} \
--without-athena --enable-dbus \
--with-libiw=${STAGING_EXECPREFIXDIR}"
-
CFLAGS =+ "-I${S}/include"
LDFLAGS += "-lz"
+# Ugly hack to find libstdc++ for libgps
+EXTRA_OEMAKE_append = 'CCLD="${CXX}"'
+
FILES_${PN} = "${bindir}/prismstumbler"
FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
#
# mt diff -rf43ebd3fe80818a901c13cc53bbade0c16a21477 -ra1d436a1b0cce90dce4363a3bfd62bd8c6f53913
#
#
#
# add_file "packages/boost/files/atomic_count_gcc_atomicity.patch"
# content [b9084da134967c9093506c230f9af87b2bf74373]
#
# patch "packages/binutils/binutils-avr32.inc"
# from [a7d324afa09eb724099f42b11b3b68772ef94d3e]
# to [7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583]
#
# patch "packages/boost/boost_1.33.1.bb"
# from [9e61fbe13da215613e0df5e8e49a650c399e667d]
# to [f88f30ce00fdd7e116d616bca37b226e0075d922]
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
# from [f7c7319536d3a41d44075b2778c5090f9cfe3d7a]
# to [cab14e40ea2e0651767fbbc321620fc897c7e491]
#
============================================================
--- packages/boost/files/atomic_count_gcc_atomicity.patch b9084da134967c9093506c230f9af87b2bf74373
+++ packages/boost/files/atomic_count_gcc_atomicity.patch b9084da134967c9093506c230f9af87b2bf74373
@@ -0,0 +1,13 @@
+Index: boost_1_33_1/boost/detail/atomic_count_gcc.hpp
+===================================================================
+--- boost_1_33_1.orig/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:45.000000000 +0200
++++ boost_1_33_1/boost/detail/atomic_count_gcc.hpp 2008-05-01 20:43:55.000000000 +0200
+@@ -17,7 +17,7 @@
+ // http://www.boost.org/LICENSE_1_0.txt)
+ //
+
+-#include <bits/atomicity.h>
++#include <ext/atomicity.h>
+
+ namespace boost
+ {
============================================================
--- packages/binutils/binutils-avr32.inc a7d324afa09eb724099f42b11b3b68772ef94d3e
+++ packages/binutils/binutils-avr32.inc 7d4de5cdff8cbe23a79ceaf4ae9d202ba3b70583
@@ -5,18 +5,17 @@ do_avr32_reconf () {
do_avr32_reconf () {
if test ${TARGET_ARCH} == avr32; then
- (cd ${S} && autoconf2.13) || die "Error running autoconf"
+ (cd ${S} && autoconf) || die "Error running autoconf"
for dir in bfd opcodes binutils ld; do
(cd "${S}/$dir" &&
- aclocal-1.9 &&
+ aclocal &&
autoconf &&
- automake-1.9 &&
+ automake &&
autoheader) || die "Error reconfiguring $dir"
done
fi
}
-
do_avr32_configure_bfd () {
if test ${TARGET_ARCH} == avr32; then
(cd ${B} && make configure-bfd) || die "Error running 'make configure-bfd'"
@@ -24,8 +23,6 @@ do_avr32_configure_bfd () {
fi
}
-
-
addtask avr32_reconf after do_patch before do_configure
addtask avr32_configure_bfd after do_configure before do_compile
============================================================
--- packages/boost/boost_1.33.1.bb 9e61fbe13da215613e0df5e8e49a650c399e667d
+++ packages/boost/boost_1.33.1.bb f88f30ce00fdd7e116d616bca37b226e0075d922
@@ -9,7 +9,7 @@ LICENSE = "Boost Software License"
DEPENDS = "boost-jam-native zlib"
PRIORITY = "optional"
LICENSE = "Boost Software License"
-PR = "r0"
+PR = "r1"
BOOST_VER = "${@"_".join(bb.data.getVar("PV",d,1).split("."))}"
BOOST_MAJ = "${@"_".join(bb.data.getVar("PV",d,1).split(".")[0:2])}"
@@ -17,6 +17,7 @@ SRC_URI += "file://linux-uclibc.patch;pa
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"
+SRC_URI += "file://atomic_count_gcc_atomicity.patch;patch=1"
S = "${WORKDIR}/${BOOST_P}"
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb f7c7319536d3a41d44075b2778c5090f9cfe3d7a
+++ packages/gnash/gnash-minimal_0.8.2.bb cab14e40ea2e0651767fbbc321620fc897c7e491
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "libxml2 libmad zlib boost jpeg pango curl freetype"
+DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype"
S = ${WORKDIR}/gnash-${PV}
More information about the Openembedded-commits
mailing list