[oe-commits] org.oe.dev merge of '23d1f770a092f023ba951e138b787c9bacc3152d'
mickeyl commit
oe at amethyst.openembedded.net
Wed Sep 3 14:56:55 UTC 2008
merge of '23d1f770a092f023ba951e138b787c9bacc3152d'
and 'fe28a990b29bbfd099e38e4fe044896bd0a0d68e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 598d5025ea4162573353b5ee4d15c3e12107d171
ViewMTN: http://monotone.openembedded.org/revision/info/598d5025ea4162573353b5ee4d15c3e12107d171
Files:
1
packages/bison/bison-2.0
packages/bison/files
packages/gtk-webcore/midori_0.0.19.bb
packages/gtk-webcore/midori_0.0.20.bb
packages/chromium
packages/mozilla/fennec
packages/mozilla/fennec/arm
packages/bison/bison-native_2.3.bb
packages/bison/bison_2.3.bb
packages/chromium/chromium_svn.bb
packages/gnash/files/fix-trunc.diff
packages/gnome/gnome-python-extras_2.19.1.bb
packages/mozilla/fennec/arm/mozconfig
packages/mozilla/fennec/mozconfig
packages/mozilla/fennec_hg.bb
packages/webkit/webkit-gtk/acinclude.m4
packages/webkit/webkit-gtk/symbols.filter
classes/mozilla.bbclass
conf/distro/include/sane-srcrevs.inc
contrib/angstrom/build-feeds.sh
packages/bluez/bluez-utils_3.33.bb
packages/classpath/classpath-0.97.2/autotools.patch
packages/classpath/classpath-minimal-0.97.2/autotools.patch
packages/classpath/classpath-minimal_0.97.2.bb
packages/classpath/classpath-native-0.97.2/autotools.patch
packages/classpath/classpath-native_0.97.2.bb
packages/classpath/classpath_0.97.2.bb
packages/classpath/files/autotools.patch
packages/ffmpeg/ffmpeg.inc
packages/ffmpeg/ffmpeg_git.bb
packages/gnash/gnash-minimal.inc
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
packages/gnash/gnash.inc
packages/gnome/gnome-panel_2.22.2.bb
packages/gstreamer/gst-ffmpeg_0.10.4.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/openmax/libomxil-bellagio_0.9.0.bb
packages/webkit/webkit-gtk/GNUmakefile.am
packages/webkit/webkit-gtk/WebKit.pri
packages/webkit/webkit-gtk/WebKit.pro
packages/webkit/webkit-gtk/configure.ac
packages/webkit/webkit-gtk_svn.bb
Diffs:
#
# mt diff -r23d1f770a092f023ba951e138b787c9bacc3152d -r598d5025ea4162573353b5ee4d15c3e12107d171
#
#
#
# rename "packages/bison/bison-2.0"
# to "packages/bison/files"
#
# rename "packages/gtk-webcore/midori_0.0.19.bb"
# to "packages/gtk-webcore/midori_0.0.20.bb"
#
# add_dir "packages/chromium"
#
# add_dir "packages/mozilla/fennec"
#
# add_dir "packages/mozilla/fennec/arm"
#
# add_file "packages/bison/bison-native_2.3.bb"
# content [392c5d21a5980b18781fd017444bf6b37ef05590]
#
# add_file "packages/bison/bison_2.3.bb"
# content [a8f93a46d83137ddf0a4d5245cb770ea94ba07b9]
#
# add_file "packages/chromium/chromium_svn.bb"
# content [d86439f0f6917122bf3604fe352d1d2cd30053d4]
#
# add_file "packages/gnash/files/fix-trunc.diff"
# content [71edebd003d1722ca32087d3e320d7b721885aa4]
#
# add_file "packages/gnome/gnome-python-extras_2.19.1.bb"
# content [1ce2d6077edba536f4fa1f1f80bca89318c630f3]
#
# add_file "packages/mozilla/fennec/arm/mozconfig"
# content [ce93f03bbc85bfaa456184d93b65530656fad2a8]
#
# add_file "packages/mozilla/fennec/mozconfig"
# content [76f36a2432f5bfa3285faae325d4301882671395]
#
# add_file "packages/mozilla/fennec_hg.bb"
# content [27aceedecf999f62a086979755d1b8ca224695ff]
#
# add_file "packages/webkit/webkit-gtk/acinclude.m4"
# content [19e659ea52fd8784a6eb829ed49d4d735b3ef272]
#
# add_file "packages/webkit/webkit-gtk/symbols.filter"
# content [7dae6267dac9f4eeda54133b35a5052e830c2583]
#
# patch "classes/mozilla.bbclass"
# from [6ab6eb167d906fa0e43bd10ab5c10985f1a1162a]
# to [73c3b2beab4c52147dbec5e11d9b27b9b87e2404]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [d8fd9ec4fbc2c3fcf046caba6231c29a0fe47edc]
# to [e8e8c89f786f6acabf5bf59613ebdf7c5eb43909]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [0f3bfccade1d88546a111bb2ad92adce52bd15a9]
# to [6819252065711f69417ccc97aed73aeb7e1f1f7d]
#
# patch "packages/bluez/bluez-utils_3.33.bb"
# from [f7997bd7577a9ee783a0e8b598eccaf46eb16a46]
# to [3e8a6788821cfeb552266fb9c4a8456e50a91cfd]
#
# patch "packages/classpath/classpath-0.97.2/autotools.patch"
# from [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
# to [662f977a6cb3e548d0a9a62342762c0081ed9907]
#
# patch "packages/classpath/classpath-minimal-0.97.2/autotools.patch"
# from [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
# to [662f977a6cb3e548d0a9a62342762c0081ed9907]
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
# from [cc6670b99fd590bf0ad74fa09447b184313fc008]
# to [fe0236b7b3c70cfc9ae4ae7c9162e46c136eb1ef]
#
# patch "packages/classpath/classpath-native-0.97.2/autotools.patch"
# from [15a07b0bb24cef4fd53371e4bf6d37b9fe655d44]
# to [662f977a6cb3e548d0a9a62342762c0081ed9907]
#
# patch "packages/classpath/classpath-native_0.97.2.bb"
# from [a757f77768377156889b4b9e0147b2d651b9d4fd]
# to [537d513b9558846909bfcff51984e4dacdc7b586]
#
# patch "packages/classpath/classpath_0.97.2.bb"
# from [d8ccab26ac79ea713973f6b5f066aba811994ccb]
# to [002223e29d941c20e5c67e5abd59a0367f5f759a]
#
# patch "packages/classpath/files/autotools.patch"
# from [992d914461d1639cf26021da1a05d3889e8f25b6]
# to [fbbd792dae2b11d9f52dc64bc2beeda2325f4f8a]
#
# patch "packages/ffmpeg/ffmpeg.inc"
# from [84044f7d06812f97708d5aaf10e1e260f0a1dda0]
# to [c411980755a42734a8f0245bc649fa778ede7413]
#
# patch "packages/ffmpeg/ffmpeg_git.bb"
# from [9659f8f578529c33c9fad135e6c4b91de95ce257]
# to [36b117d41274e0585e533d5119cdef8c911b28eb]
#
# patch "packages/gnash/gnash-minimal.inc"
# from [18f1cab966a482d9996417291c578d5d82ce2bcb]
# to [eb90fecce11dc84a53c51d06768ca881e6c1bfd1]
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
# from [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
# to [3ae70d9eb17f024333e5820ee9a582905e662a1b]
#
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
# from [36448f84bc62c99b5090bf2b25d855cc753f82a3]
# to [0e6133b75a86e611b36f455f2aefd20f0340c995]
#
# patch "packages/gnash/gnash-minimal_cvs.bb"
# from [db4c2629fdbc1291308a0a48419a39a584264d1d]
# to [66cd92f9d310f939a8073eaa9cd0baff98b76d13]
#
# patch "packages/gnash/gnash.inc"
# from [f1ba5349c7103bbc21867a987ba4fd70a54822ea]
# to [883974f7e6244647ae45d9ed5274a49bbd7f2641]
#
# patch "packages/gnome/gnome-panel_2.22.2.bb"
# from [650f78a4da1a4d5d63c46a1487b2a87755e809eb]
# to [259b81b0ce7c42c76ca98c1f1978ec4c098c545c]
#
# patch "packages/gstreamer/gst-ffmpeg_0.10.4.bb"
# from [cfb4a0a4c02a3be5199bb35c440b276210c37a21]
# to [7b91d2529b55580db218d0bb8b2ea0c9a8fe8eb9]
#
# patch "packages/gtk-webcore/midori_0.0.20.bb"
# from [ca09653d60b9011202d481bd484270b7c09b43d2]
# to [90005f18999278dcedbe653bac459f12b53060dd]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [c7f5a60692f8f86b613a87dbcf44fb08339c2e0e]
# to [46eaa5a47d7e966a8a74c6cf96f01d7351e65840]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [fe0807df08f9b386baae24813ff6aa3f5636acc8]
# to [8a23277737b8fd38f69f828c889e565c7b05bfa1]
#
# patch "packages/openmax/libomxil-bellagio_0.9.0.bb"
# from [3fa766b2661c34b5ef2f3ad60eff1fb05eeee2ec]
# to [a48c6c3a04c8a01651bfc5dc018904a00fc5a1b0]
#
# patch "packages/webkit/webkit-gtk/GNUmakefile.am"
# from [19d62160616b80e6684d9f8e2adfcb61e13c2c54]
# to [80d426c3b50591769afce94c3404c0aafe0e0e96]
#
# patch "packages/webkit/webkit-gtk/WebKit.pri"
# from [fd870b3307fb95ac907a4095ab79658dd7879277]
# to [cd1a12d8db88d7aa21c6cc890cc4dfe476c4b182]
#
# patch "packages/webkit/webkit-gtk/WebKit.pro"
# from [1e5c7f9961944af590055c84c58d1acabab3632b]
# to [b693be06f24dca1ab11ea701cf06f70aad2b7574]
#
# patch "packages/webkit/webkit-gtk/configure.ac"
# from [8689b13d5c83b815d45d8e8981dd8429880906a0]
# to [9e060c3ceaef098d4b16c511f299c3a1589b7db8]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [b60a055223bb87126729c5ef9b5837d928b3a8a7]
# to [415079cc37fd29c282e2723bc97a0f69e2e41971]
#
============================================================
--- packages/bison/bison-native_2.3.bb 392c5d21a5980b18781fd017444bf6b37ef05590
+++ packages/bison/bison-native_2.3.bb 392c5d21a5980b18781fd017444bf6b37ef05590
@@ -0,0 +1,20 @@
+require bison_${PV}.bb
+SECTION = "devel"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
+S = "${WORKDIR}/bison-${PV}"
+
+inherit native autotools
+
+do_stage() {
+ rm -f ${STAGING_BINDIR}/yacc
+ rm -f ${STAGING_BINDIR}/bison
+ install -m 0755 src/bison ${STAGING_BINDIR}/
+ cat >${STAGING_BINDIR}/yacc <<EOF
+#!/bin/sh
+exec ${STAGING_BINDIR}/bison -y "\$@"
+EOF
+ chmod a+rx ${STAGING_BINDIR}/yacc
+ install -d ${STAGING_DATADIR}/bison/m4sugar
+ install -m 0755 data/c.m4 data/glr.c data/lalr1.cc data/yacc.c ${STAGING_DATADIR}/bison/
+ install -m 0755 data/m4sugar/m4sugar.m4 ${STAGING_DATADIR}/bison/m4sugar/
+}
============================================================
--- packages/bison/bison_2.3.bb a8f93a46d83137ddf0a4d5245cb770ea94ba07b9
+++ packages/bison/bison_2.3.bb a8f93a46d83137ddf0a4d5245cb770ea94ba07b9
@@ -0,0 +1,10 @@
+DESCRIPTION = "GNU Project parser generator (yacc replacement)."
+HOMEPAGE = "http://www.gnu.org/software/bison/"
+LICENSE = "GPL"
+SECTION = "devel"
+PRIORITY = "optional"
+
+SRC_URI = "${GNU_MIRROR}/bison/bison-${PV}.tar.gz \
+ file://m4.patch;patch=1"
+
+inherit autotools
============================================================
--- packages/chromium/chromium_svn.bb d86439f0f6917122bf3604fe352d1d2cd30053d4
+++ packages/chromium/chromium_svn.bb d86439f0f6917122bf3604fe352d1d2cd30053d4
@@ -0,0 +1,16 @@
+DESCRIPTION = "Google Chrome browser"
+LICENSE = "BSD"
+
+DEPENDS = "perl-native python-native flex-native gperf-native"
+
+PV = "0.0+svnr${SRCREV}"
+
+SRCREV = "1665"
+SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http"
+
+S = "${WORKDIR}/src/chrome"
+
+do_compile() {
+ cd ${S}
+ ../third_party/scons/scons.py Hammer
+}
============================================================
--- packages/gnash/files/fix-trunc.diff 71edebd003d1722ca32087d3e320d7b721885aa4
+++ packages/gnash/files/fix-trunc.diff 71edebd003d1722ca32087d3e320d7b721885aa4
@@ -0,0 +1,13 @@
+--- /tmp/utility.h 2008-09-02 16:35:44.000000000 +0200
++++ gnash/libbase/utility.h 2008-09-02 16:36:10.000000000 +0200
+@@ -327,6 +327,10 @@
+ #endif
+ }
+
++#ifndef HAVE_TRUNC
++inline double trunc(double x) { return (x < 0 ? -(std::floor(-x)) : std::floor(x)); }
++#endif
++
+ #endif // UTILITY_H
+
+
============================================================
--- packages/gnome/gnome-python-extras_2.19.1.bb 1ce2d6077edba536f4fa1f1f80bca89318c630f3
+++ packages/gnome/gnome-python-extras_2.19.1.bb 1ce2d6077edba536f4fa1f1f80bca89318c630f3
@@ -0,0 +1,21 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "python-pygtk libwnck"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${datadir}/pygtk"
============================================================
--- packages/mozilla/fennec/arm/mozconfig ce93f03bbc85bfaa456184d93b65530656fad2a8
+++ packages/mozilla/fennec/arm/mozconfig ce93f03bbc85bfaa456184d93b65530656fad2a8
@@ -0,0 +1,10 @@
+mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf2.13
+
+ac_add_options --disable-javaxpcom
+
+ac_add_app_options xulrunner --with-arm-kuser
+ac_add_app_options xulrunner --enable-application=xulrunner
+
+ac_add_app_options mobile --enable-application=mobile
============================================================
--- packages/mozilla/fennec/mozconfig 76f36a2432f5bfa3285faae325d4301882671395
+++ packages/mozilla/fennec/mozconfig 76f36a2432f5bfa3285faae325d4301882671395
@@ -0,0 +1,25 @@
+# Options for client.mk.
+mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../mobilebase
+
+# Global options
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+#ac_add_options --enable-logging
+#ac_cv_visibility_pragma=no
+
+#ac_add_options --enable-timeline
+
+# XULRunner options
+ac_add_app_options xulrunner --enable-application=xulrunner
+ac_add_app_options xulrunner --disable-javaxpcom
+
+# mobile options
+ac_add_app_options mobile --enable-application=mobile
+ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
+
+# configure will be automatically generated using the 'autoconf-2.13'
+# command. If autoconf-2.13 isn't the right name for your system, as
+# is the case on OS X using MacPorts, use the real command name as
+# demonstrated below.
+mk_add_options AUTOCONF=autoconf2.13
============================================================
--- packages/mozilla/fennec_hg.bb 27aceedecf999f62a086979755d1b8ca224695ff
+++ packages/mozilla/fennec_hg.bb 27aceedecf999f62a086979755d1b8ca224695ff
@@ -0,0 +1,42 @@
+DEPENDS += "cairo"
+
+PV = "0.0"
+
+SRC_URI = "hg://hg.mozilla.org/;module=mozilla-central;rev=d14db8996980 \
+ hg://hg.mozilla.org/;module=mobile-browser;rev=60dd20721284 \
+ file://jsautocfg.h \
+"
+
+S = "${WORKDIR}/mozilla-central"
+
+inherit mozilla
+require firefox.inc
+
+export HOST_LIBIDL_CONFIG = "${STAGING_BINDIR_NATIVE}/libIDL-config-2"
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
+do_configure_prepend() {
+ if [ -e ${WORKDIR}/mobile-browser ] ; then
+ mv ${WORKDIR}/mobile-browser ${S}/mobile
+ fi
+ oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure
+}
+
+do_compile_prepend() {
+ cp ${WORKDIR}/jsautocfg.h ${S}/js/src/
+ sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk
+}
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/fennec-${PV}
+ cd dist/sdk/include
+ rm -rf obsolete
+ headers=`find . -name "*.h"`
+ for f in $headers
+ do
+ install -D -m 0644 $f ${STAGING_INCDIR}/fennec-${PV}/
+ done
+ # removes 2 lines that call absent headers
+ sed -e '178,179d' ${STAGING_INCDIR}/fennec-${PV}/nsIServiceManager.h
+}
+
============================================================
--- packages/webkit/webkit-gtk/acinclude.m4 19e659ea52fd8784a6eb829ed49d4d735b3ef272
+++ packages/webkit/webkit-gtk/acinclude.m4 19e659ea52fd8784a6eb829ed49d4d735b3ef272
@@ -0,0 +1,356 @@
+dnl dolt, a replacement for libtool
+dnl Copyright © 2007-2008 Josh Triplett <josh at freedesktop.org>
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+dnl
+dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
+dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
+dnl installed when running autoconf on your project.
+
+AC_DEFUN([DOLT], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+# dolt, a replacement for libtool
+# Josh Triplett <josh at freedesktop.org>
+AC_PATH_PROG(DOLT_BASH, bash)
+AC_MSG_CHECKING([if dolt supports this host])
+dolt_supported=yes
+if test x$DOLT_BASH = x; then
+ dolt_supported=no
+fi
+if test x$GCC != xyes; then
+ dolt_supported=no
+fi
+case $host in
+i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
+|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
+ pic_options='-fPIC'
+ ;;
+i?86-apple-darwin*)
+ pic_options='-fno-common'
+ ;;
+*)
+ dolt_supported=no
+ ;;
+esac
+if test x$dolt_supported = xno ; then
+ AC_MSG_RESULT([no, falling back to libtool])
+ LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+ LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+else
+ AC_MSG_RESULT([yes, replacing libtool])
+
+dnl Start writing out doltcompile.
+ cat <<__DOLTCOMPILE__EOF__ >doltcompile
+#!$DOLT_BASH
+__DOLTCOMPILE__EOF__
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+args=("$[]@")
+for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
+ if test x"${args@<:@$arg@:>@}" = x-o ; then
+ objarg=$((arg+1))
+ break
+ fi
+done
+if test x$objarg = x ; then
+ echo 'Error: no -o on compiler command line' 1>&2
+ exit 1
+fi
+lo="${args@<:@$objarg@:>@}"
+obj="${lo%.lo}"
+if test x"$lo" = x"$obj" ; then
+ echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
+ exit 1
+fi
+objbase="${obj##*/}"
+__DOLTCOMPILE__EOF__
+
+dnl Write out shared compilation code.
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+libobjdir="${obj%$objbase}.libs"
+if test ! -d "$libobjdir" ; then
+ mkdir_out="$(mkdir "$libobjdir" 2>&1)"
+ mkdir_ret=$?
+ if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
+ echo "$mkdir_out" 1>&2
+ exit $mkdir_ret
+ fi
+fi
+pic_object="$libobjdir/$objbase.o"
+args@<:@$objarg@:>@="$pic_object"
+__DOLTCOMPILE__EOF__
+ cat <<__DOLTCOMPILE__EOF__ >>doltcompile
+"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$?
+__DOLTCOMPILE__EOF__
+ fi
+
+dnl Write out static compilation code.
+dnl Avoid duplicate compiler output if also building shared objects.
+ if test x$enable_static = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+non_pic_object="$obj.o"
+args@<:@$objarg@:>@="$non_pic_object"
+__DOLTCOMPILE__EOF__
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
+__DOLTCOMPILE__EOF__
+ else
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" || exit $?
+__DOLTCOMPILE__EOF__
+ fi
+ fi
+
+dnl Write out the code to write the .lo file.
+dnl The second line of the .lo file must match "^# Generated by .*libtool"
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+{
+echo "# $lo - a libtool object file"
+echo "# Generated by doltcompile, not libtool"
+__DOLTCOMPILE__EOF__
+
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo "pic_object='.libs/${objbase}.o'"
+__DOLTCOMPILE__EOF__
+ else
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo pic_object=none
+__DOLTCOMPILE__EOF__
+ fi
+
+ if test x$enable_static = xyes; then
+ cat <%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfe28a990b29bbfd099e38e4fe044896bd0a0d68e -r598d5025ea4162573353b5ee4d15c3e12107d171
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8e72e45c55d954149f5ee11c07f7a0b41ff7dce0]
# to [e8e8c89f786f6acabf5bf59613ebdf7c5eb43909]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 8e72e45c55d954149f5ee11c07f7a0b41ff7dce0
+++ conf/distro/include/sane-srcrevs.inc e8e8c89f786f6acabf5bf59613ebdf7c5eb43909
@@ -78,7 +78,7 @@ SRCREV_pn-linux-ixp4xx ?= "1066"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1066"
-SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
+SRCREV_pn-linux-openmoko ?= "ca19d156400f817960efe0d14680324b2ea34171"
SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -185,7 +185,7 @@ SRCREV_pn-xoo ?= "1971"
SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
-SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c"
+SRCREV_pn-xserver-kdrive-glamo ?= "4067470ea4d569bae7b4161ca998645a0c9b96e7"
SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc"
# Enlightenment Foundation Libraries
More information about the Openembedded-commits
mailing list