[oe-commits] org.oe.dev merge of '175ebb8804e22098d4acb2270345622a09cb816f'
pb commit
oe at amethyst.openembedded.net
Sat Jul 26 22:34:55 UTC 2008
merge of '175ebb8804e22098d4acb2270345622a09cb816f'
and '7509e3e8303bef27a2a18d113f7a08f6888fce33'
Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 646f9470602552bbf9623ac6334b9e3fcb751d94
ViewMTN: http://monotone.openembedded.org/revision/info/646f9470602552bbf9623ac6334b9e3fcb751d94
Files:
1
packages/xorg-lib/libx11-native_1.0.1.bb
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-bootstrap-native_3.4.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/ecj-initial_3.4.bb
packages/openmoko-projects/illume
packages/ecj/ecj-bootstrap-native_3.3.2.bb
packages/ecj/ecj-initial_3.3.2.bb
packages/openmoko-projects/illume/configure-keyboard.patch
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-native.inc
packages/efl1/ecore_cvs.bb
packages/openmoko-projects/illume_svn.bb
Diffs:
#
# mt diff -r175ebb8804e22098d4acb2270345622a09cb816f -r646f9470602552bbf9623ac6334b9e3fcb751d94
#
#
#
# patch "packages/xorg-lib/libx11-native_1.0.1.bb"
# from [7c117d26c8901c44e5cebd665e12dfc191784a6d]
# to [7f8ffc178891c54f10966ce194ca30c7439f2019]
#
============================================================
--- packages/xorg-lib/libx11-native_1.0.1.bb 7c117d26c8901c44e5cebd665e12dfc191784a6d
+++ packages/xorg-lib/libx11-native_1.0.1.bb 7f8ffc178891c54f10966ce194ca30c7439f2019
@@ -11,7 +11,7 @@ XORG_PN = "libX11"
XORG_PN = "libX11"
-SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.1.1.tar.bz2"
+SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-1.0.1.tar.bz2"
S = "${WORKDIR}/libX11-${PV}"
inherit native autotools pkgconfig
#
# mt diff -r7509e3e8303bef27a2a18d113f7a08f6888fce33 -r646f9470602552bbf9623ac6334b9e3fcb751d94
#
#
#
# rename "packages/ecj/ecj-bootstrap-native_3.3.bb"
# to "packages/ecj/ecj-bootstrap-native_3.4.bb"
#
# rename "packages/ecj/ecj-initial_3.3.bb"
# to "packages/ecj/ecj-initial_3.4.bb"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.2.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-initial_3.3.2.bb"
# content [b62ca6b6be5ba0eb2884b571d54eec89895f48a5]
#
# add_file "packages/ecj/ecj-initial_3.3.bb"
# content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
#
# add_file "packages/openmoko-projects/illume/configure-keyboard.patch"
# content [7d8bf7ac9d5970f6624d67804676e55a5f781bd0]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a]
# to [37caae48109ecf51cac36b99d1c159bf899e43a0]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2fd13fc744e766175938eb267aa49d99d9f5c39e]
# to [1f2ab31eceb6206825c9568b313ab48c224c8863]
#
# patch "packages/classpath/classpath-initial_0.93.bb"
# from [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
# to [e8d4723f96ff6828015eafcabc845d6122cf304f]
#
# patch "packages/classpath/classpath-native.inc"
# from [ce05671105e08fb6217f1907cf4202d41ebfd512]
# to [f1053899930127b54417bca6f25818bdf90a200e]
#
# patch "packages/ecj/ecj-initial_3.4.bb"
# from [b410a403c3f29b5239ebde0751e23e02f0d3409a]
# to [e4737a57975f1f5295f3ba5362f3903d1e4b715b]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [db9ceefb6209514dcc2b22c3b7d8e0816820f762]
# to [2585aee85a18623ca3ef7c268f21be835fffc097]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [39270f48f788723273ee3a1246361321db6608d4]
# to [7ee2770bdff03d604f1482288b0b7c00f05481ce]
#
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.2.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
+++ packages/ecj/ecj-bootstrap-native_3.3.bb defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3
@@ -0,0 +1,38 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+#
+# Since the VM running the compiler has no effect on the produced bytecode this recipe
+# uses the jar created by ecj-initial and creates a start script that runs it with a different
+# VM.
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "EPL"
+
+DEPENDS = "ecj-initial virtual/java-native"
+
+PROVIDES = "virtual/javac-native"
+
+SRC_URI = "file://ecj.in"
+
+S = "${WORKDIR}"
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+inherit native
+
+do_compile() {
+ # Create the start script
+ echo "#!/bin/sh" > ecj-bootstrap
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-bootstrap
+ echo "RUNTIME=java" >> ecj-bootstrap
+ cat ecj.in >> ecj-bootstrap
+}
+
+do_stage() {
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-bootstrap ${STAGING_BINDIR}/javac
+}
============================================================
--- packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
+++ packages/ecj/ecj-initial_3.3.2.bb b62ca6b6be5ba0eb2884b571d54eec89895f48a5
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3.2-200802211800/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
@@ -0,0 +1,84 @@
+# ECJ as a bootstrap compiler is a drop-in replacement for Sun's javac. It offers no more
+# and no less features.
+
+# This variant runs on the initial (not Java5-compatible runtime).
+
+DESCRIPTION = "JDT Core Batch Compiler - Bootstrap variant"
+HOMEPAGE = "http://www.eclipse.org/"
+LICENSE = "EPL"
+
+DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
+
+SRC_URI = "\
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ file://ecj.in \
+ "
+
+S = "${WORKDIR}"
+
+inherit native
+
+JAR = "ecj-bootstrap-${PV}.jar"
+
+do_unpackpost() {
+ if [ ! -d source ]; then
+ mkdir source
+ fi
+
+ if [ ! -d build ]; then
+ mkdir build
+ fi
+
+ # Remove crap.
+ rm about.html build.xml
+ rm -rf META-INF
+
+ # Move source into separate subdir.
+ mv org source/
+
+ # Remove stuff unneeded for the bootstrap compiler.
+ rm -rf source/org/eclipse/jdt/internal/compiler/apt
+ rm -rf source/org/eclipse/jdt/internal/compiler/tool
+ rm -rf source/org/eclipse/jdt/internal/antadapter
+ rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+
+ # Make a copy of the remaining source to get the embedded
+ # resources.
+ cp -r source/org build/
+
+ # Remove source code and other stuff.
+ find build -name '*.java' -exec rm -f {} \;
+ find build -name '*.html' -exec rm -f {} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+do_compile() {
+ find source -name '*.java' > sourcefiles
+ split -l 25 sourcefiles ecj-sources.
+
+ # Compiling in place is done because the sources contain
+ # property files which need to be available at runtime.
+ for list in `find . -name 'ecj-sources.*'`; do
+ echo "building files in $list ...";
+ echo jikes-initial -d build -source 1.4 -sourcepath source `cat $list`;
+ jikes-initial \
+ -d build -source 1.4 -sourcepath source `cat $list`;
+ done
+
+ fastjar -c -C build . -f ${JAR}
+
+ # Create the start script
+ echo "#!/bin/sh" > ecj-initial
+ echo "ECJ_JAR=${STAGING_DATADIR}/java/${JAR}" >> ecj-initial
+ echo "RUNTIME=java-initial" >> ecj-initial
+ cat ecj.in >> ecj-initial
+}
+
+do_stage() {
+ install -d ${STAGING_DATADIR}/java
+ install -m 755 ${S}/${JAR} ${STAGING_DATADIR}/java
+
+ install -d ${STAGING_BINDIR}
+ install -m 755 ${S}/ecj-initial ${STAGING_BINDIR}
+}
============================================================
--- packages/openmoko-projects/illume/configure-keyboard.patch 7d8bf7ac9d5970f6624d67804676e55a5f781bd0
+++ packages/openmoko-projects/illume/configure-keyboard.patch 7d8bf7ac9d5970f6624d67804676e55a5f781bd0
@@ -0,0 +1,39 @@
+Index: configure.in
+===================================================================
+--- configure.in (Revision 170)
++++ configure.in (Arbeitskopie)
+@@ -95,6 +95,21 @@
+ AC_SUBST(e_libs)
+ AC_SUBST(e_modules)
+
++want_illume_virtual_keyboard=no
++AC_ARG_ENABLE(illume-keyboard,
++ AC_HELP_STRING(
++ [--enable-illume-keyboard],
++ [Enable the illume virtual keyboard.]
++ ),
++ [want_illume_virtual_keyboard=$enableval]
++ )
++AC_MSG_CHECKING(whether the illume virtual keyboard is to be built in)
++AC_MSG_RESULT($want_illume_virtual_keyboard)
++
++if test "x$want_illume_virtual_keyboard" = "xyes"; then
++ AC_DEFINE(BUILD_ILLUME_VIRTUAL_KEYBOARD, 1, [Build the virtual keyboard in])
++fi
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c (Revision 170)
++++ src/e_mod_win.c (Arbeitskopie)
+@@ -102,7 +102,7 @@
+ e_module_dir_get(m),
+ e_module_dir_get(m));
+ // FIXME: run kbd app or use internal
+-#if 0
++#ifdef BUILD_ILLUME_VIRTUAL_KEYBOARD
+ //enable for now to test internal kbd
+ vkbd_int = e_kbd_int_new(e_module_dir_get(m),
+ e_module_dir_get(m),
============================================================
--- conf/distro/include/moko-autorev.inc 7b7cd7bd8e5afa2e2ac65b301bc728c150eeec6a
+++ conf/distro/include/moko-autorev.inc 37caae48109ecf51cac36b99d1c159bf899e43a0
@@ -3,8 +3,8 @@ SRCREV_pn-diversity-nav ?= "${AUTOREV}"
SRCREV_pn-dfu-util-native ?= "${AUTOREV}"
SRCREV_pn-diversity-daemon ?= "${AUTOREV}"
SRCREV_pn-diversity-nav ?= "${AUTOREV}"
-#SRCREV_pn-illume ?= "${AUTOREV}"
-#SRCREV_pn-illume-theme ?= "${AUTOREV}"
+SRCREV_pn-illume ?= "${AUTOREV}"
+SRCREV_pn-illume-theme-asu ?= "${AUTOREV}"
SRCREV_pn-libgsmd ?= "${AUTOREV}"
SRCREV_pn-libjana ?= "${AUTOREV}"
SRCREV_pn-libmokogsmd2 ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcdates.inc 2fd13fc744e766175938eb267aa49d99d9f5c39e
+++ conf/distro/include/sane-srcdates.inc 1f2ab31eceb6206825c9568b313ab48c224c8863
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE ?= "20080716"
+EFL_SRCDATE ?= "20080727"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/classpath/classpath-initial_0.93.bb dcbd137250c9fd6e2ca0ca88afc7404e9ede289c
+++ packages/classpath/classpath-initial_0.93.bb e8d4723f96ff6828015eafcabc845d6122cf304f
@@ -5,7 +5,7 @@ DESCRIPTION="Java1.4-compatible GNU Clas
DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native."
-PR = "r0"
+PR = "r2"
DEPENDS = "zip-native fastjar-native jikes-native"
@@ -25,4 +25,3 @@ EXTRA_OECONF = "\
--with-native-libdir=${STAGING_LIBDIR}/classpath-initial \
--includedir=${STAGING_INCDIR}/classpath-initial \
"
-
============================================================
--- packages/classpath/classpath-native.inc ce05671105e08fb6217f1907cf4202d41ebfd512
+++ packages/classpath/classpath-native.inc f1053899930127b54417bca6f25818bdf90a200e
@@ -10,9 +10,13 @@ inherit autotools native
inherit autotools native
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial"
+
+# Note: the --with-ecj options seems redundant but is
+# for compatibility with older classpath versions.
EXTRA_OECONF = "\
+ --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
--with-glibj \
- --with-ecj=${STAGING_BINDIR_NATIVE}/ecj-initial \
--with-fastjar=fastjar \
--enable-local-sockets \
--disable-alsa \
============================================================
--- packages/ecj/ecj-initial_3.3.bb b410a403c3f29b5239ebde0751e23e02f0d3409a
+++ packages/ecj/ecj-initial_3.4.bb e4737a57975f1f5295f3ba5362f3903d1e4b715b
@@ -10,7 +10,7 @@ SRC_URI = "\
DEPENDS = "fastjar-native jikes-initial virtual/java-initial"
SRC_URI = "\
- http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.3-200706251500/ecjsrc.zip \
+ http://mirrors.ibiblio.org/pub/mirrors/eclipse/eclipse/downloads/drops/R-3.4-200806172000/ecjsrc.zip \
file://ecj.in \
"
============================================================
--- packages/efl1/ecore_cvs.bb db9ceefb6209514dcc2b22c3b7d8e0816820f762
+++ packages/efl1/ecore_cvs.bb 2585aee85a18623ca3ef7c268f21be835fffc097
@@ -1,32 +1,33 @@ require ecore.inc
require ecore.inc
-PR = "r0"
+PR = "r1"
EXTRA_OECONF = "\
- --x-includes=${STAGING_INCDIR}/X11 \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-simple-x11 \
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
\
- --enable-ecore-txt \
- --enable-ecore-config \
- --disable-ecore-x-xcb \
- --enable-ecore-x \
- --enable-ecore-job \
- --disable-ecore-directfb \
- --disable-ecore-sdl \
- --enable-ecore-fb \
- --enable-ecore-evas \
- --enable-ecore-evas-x11-16 \
- --disable-ecore-evas-x11-gl \
- --enable-ecore-evas-xrender \
- --disable-ecore-evas-dfb \
- --disable-ecore-evas-sdl \
- --disable-openssl \
- --enable-abstract-sockets \
- --enable-ecore-con \
- --enable-ecore-ipc \
- --enable-ecore-file \
- --enable-inotify \
- --disable-poll \
- --enable-curl \
- --disable-ecore-desktop \
+ --enable-ecore-txt \
+ --enable-ecore-config \
+ --disable-ecore-x-xcb \
+ --enable-ecore-x \
+ --enable-ecore-job \
+ --disable-ecore-directfb \
+ --disable-ecore-sdl \
+ --enable-ecore-fb \
+ --enable-ecore-evas \
+ --enable-ecore-evas-x11-16 \
+ --enable-ecore-evas-16-x11 \
+ --disable-ecore-evas-x11-gl \
+ --enable-ecore-evas-xrender \
+ --disable-ecore-evas-dfb \
+ --disable-ecore-evas-sdl \
+ --disable-openssl \
+ --enable-abstract-sockets \
+ --enable-ecore-con \
+ --enable-ecore-ipc \
+ --enable-ecore-file \
+ --enable-inotify \
+ --disable-poll \
+ --enable-curl \
+ --disable-ecore-desktop \
"
============================================================
--- packages/openmoko-projects/illume_svn.bb 39270f48f788723273ee3a1246361321db6608d4
+++ packages/openmoko-projects/illume_svn.bb 7ee2770bdff03d604f1482288b0b7c00f05481ce
@@ -4,9 +4,12 @@ PV = "0.0+svnr${SRCREV}"
LICENSE = "MI%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list