[oe-commits] org.oe.dev merge of '11752201b0467d112cbc4a2fd6b4e3bafa1a66a2'
woglinde2 commit
oe at amethyst.openembedded.net
Mon Sep 1 18:08:05 UTC 2008
merge of '11752201b0467d112cbc4a2fd6b4e3bafa1a66a2'
and '461b0f25ec4df76026bbc143ddf9a76a9690fd9e'
Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: d3a7772f0dda4caa934b43a1aec81871ae3eadc8
ViewMTN: http://monotone.openembedded.org/revision/info/d3a7772f0dda4caa934b43a1aec81871ae3eadc8
Files:
1
packages/portaudio/portaudio-v19_20071207.bb
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gpsbabel/gpsbabel_1.3.5.bb
packages/portaudio/portaudio_0.0.19.bb
packages/portaudio/portaudio-v19_svn.bb
packages/phoneme
packages/phoneme/files
packages/gtk-webcore/midori_0.0.19.bb
packages/phoneme/files/phoneme-makefile-fix.patch
packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb
packages/phoneme/phoneme-advanced.inc
packages/python/python-ptrace_0.3.2.bb
conf/distro/include/sane-srcrevs.inc
conf/machine/om-gta01.conf
conf/machine/om-gta02.conf
packages/busybox/busybox.inc
packages/busybox/busybox_1.9.2.bb
packages/classpath/classpath.inc
packages/linux/linux-rp-2.6.26/defconfig-akita
packages/linux/linux-rp-2.6.26/defconfig-bootcdx86
packages/linux/linux-rp-2.6.26/defconfig-c7x0
packages/linux/linux-rp-2.6.26/defconfig-hx2000
packages/linux/linux-rp-2.6.26/defconfig-poodle
packages/linux/linux-rp-2.6.26/defconfig-qemuarm
packages/linux/linux-rp-2.6.26/defconfig-qemux86
packages/linux/linux-rp-2.6.26/defconfig-spitz
packages/linux/linux-rp-2.6.26/defconfig-zylonite
packages/tasks/task-python-everything.bb
conf/checksums.ini
packages/lzma/lzma-native_4.17.bb
Diffs:
#
# mt diff -r11752201b0467d112cbc4a2fd6b4e3bafa1a66a2 -rd3a7772f0dda4caa934b43a1aec81871ae3eadc8
#
#
#
# delete "packages/portaudio/portaudio-v19_20071207.bb"
#
# rename "packages/gpsbabel/gpsbabel_1.3.3.bb"
# to "packages/gpsbabel/gpsbabel_1.3.5.bb"
#
# rename "packages/portaudio/portaudio_0.0.19.bb"
# to "packages/portaudio/portaudio-v19_svn.bb"
#
# add_dir "packages/phoneme"
#
# add_dir "packages/phoneme/files"
#
# add_file "packages/gtk-webcore/midori_0.0.19.bb"
# content [ca09653d60b9011202d481bd484270b7c09b43d2]
#
# add_file "packages/phoneme/files/phoneme-makefile-fix.patch"
# content [17a4c4f069d714e21e70a25fcbc9cd8d788082db]
#
# add_file "packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb"
# content [aa80f45ba22c3a76ef6825a5ac1e27ba443a968a]
#
# add_file "packages/phoneme/phoneme-advanced.inc"
# content [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
#
# add_file "packages/python/python-ptrace_0.3.2.bb"
# content [0f90f9660627795440c3166b852a0eece9b71cfa]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [8263ed045331336ef156ad477a680016513099eb]
# to [e4429231d4f16a36eda8a63ea02bdb4ec703e0ff]
#
# patch "conf/machine/om-gta01.conf"
# from [a9074ead3cca6d3eb6fdc837d712eecfb35d4e91]
# to [11955cc67c94d27c50a49e55a06ef8c96af9ad6e]
#
# patch "conf/machine/om-gta02.conf"
# from [1320182b35aa623d42f9cb99022c0533b54d5996]
# to [857a1ed4810a63a7d75a7c68d2523b971f9a6c8a]
#
# patch "packages/busybox/busybox.inc"
# from [99fe4e1235f3e8d6f57649a3b0c84a1fd120d775]
# to [1bd8d9defd1e1be813cfb434b4b578697b1b33a7]
#
# patch "packages/busybox/busybox_1.9.2.bb"
# from [d57bfa894a3e0caf97bd34c841fbe24ab3b167fd]
# to [e67cffcad4bfadee85161e3e26073ad85cd557d2]
#
# patch "packages/classpath/classpath.inc"
# from [38c3e19b11832c4ee048c930972f95afbc256c0c]
# to [ec953cce26d7aeec31b06aa3dbce43c70686a735]
#
# patch "packages/gpsbabel/gpsbabel_1.3.5.bb"
# from [74c8983bc789932d363fc987244b08d4fab8b521]
# to [3e5a504ca8d2083bad1497af1995f2f25510f74c]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-akita"
# from [064c36530b213dae882be1b6bb2cbab8615906f8]
# to [a0a3429c4b8ccf2f435e890ead2c2c201c5c904f]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-bootcdx86"
# from [83dbfc0474bb18348ca67718d27d2dcc262095a3]
# to [d1900766f3a9e8322678ced49e5a5bb93b2f332a]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-c7x0"
# from [9840eec605b360f4cdcf976973331ce274a89b6f]
# to [5c533bfba4b4fbfde44ddf442337a158ecc8a5fe]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-hx2000"
# from [8d4023e3a924b2d01a60011c6aa81cca7bc83d06]
# to [53a11bd3d87b58b40c49ee4586ab730d462b379c]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-poodle"
# from [823d2a1579f2e5312396ba4c0d40a7405bcebd4f]
# to [4c70a99ea564dc7a44015887b731791964dc9ee5]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemuarm"
# from [19a7a240f8a4fd58732db1ccb11767dac8fc7221]
# to [5b90b4f63559daa07eddb8a15d4226670dd5bf25]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-qemux86"
# from [8f2d48208eb79e7a2e00941efcaee2cad2d34737]
# to [d47c9d63424aa0cd8dcf1f956fd8af65f05f56b7]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-spitz"
# from [121ce2ca2da79de4072c338f63ad9e345f2674bb]
# to [3e79a57deaec2eed97be90695ff0b6abdcdc8a63]
#
# patch "packages/linux/linux-rp-2.6.26/defconfig-zylonite"
# from [71cf26b625ad773ac5468869fe7052854759f70f]
# to [22182e2386826a6baf8d411b182d4bdaad6a91c0]
#
# patch "packages/portaudio/portaudio-v19_svn.bb"
# from [6e0e4519a0c491b4df8965004e222f426ae15d72]
# to [2412bb2e306a60afa27283238b90b401ca15749c]
#
# patch "packages/tasks/task-python-everything.bb"
# from [76ee4d36dc4c36625b1459bd63528acdd32188db]
# to [51a6e92c2c5bb538d4094dea12781c8d68eb9746]
#
============================================================
--- packages/gtk-webcore/midori_0.0.19.bb ca09653d60b9011202d481bd484270b7c09b43d2
+++ packages/gtk-webcore/midori_0.0.19.bb ca09653d60b9011202d481bd484270b7c09b43d2
@@ -0,0 +1,5 @@
+require midori.inc
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.bz2"
+
+
============================================================
--- packages/phoneme/files/phoneme-makefile-fix.patch 17a4c4f069d714e21e70a25fcbc9cd8d788082db
+++ packages/phoneme/files/phoneme-makefile-fix.patch 17a4c4f069d714e21e70a25fcbc9cd8d788082db
@@ -0,0 +1,144 @@
+Index: cdc/build/share/rules_zoneinfo.mk
+===================================================================
+--- cdc/build/share/rules_zoneinfo.mk.orig
++++ cdc/build/share/rules_zoneinfo.mk
+@@ -45,7 +45,7 @@ $(ZONEINFO_CLASSES_DIR):
+ .compile.classlist:
+ $(AT)if [ -s $(ZONEINFO_CLASSES_DIR)/.classes.list ] ; then \
+ echo "Compiling zic classes... "; \
+- $(JAVAC_CMD) \
++ $(JAVAC_CMD) -sourcepath $(CVM_SHAREROOT)/classes \
+ -d $(ZONEINFO_CLASSES_DIR) \
+ @$(ZONEINFO_CLASSES_DIR)/.classes.list ; \
+ fi
+Index: cdc/build/share/jcc.mk
+===================================================================
+--- cdc/build/share/jcc.mk.orig
++++ cdc/build/share/jcc.mk
+@@ -93,7 +93,7 @@ $(CVM_GENOPCODE_DEPEND) :: $(CVM_JCC_SRC
+ $(CVM_JCC_SRCPATH)/JCCMessage.properties
+ @echo "... $@"
+ $(AT)CLASSPATH=$(CVM_JCC_SRCPATH); export CLASSPATH; \
+- $(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \
++ $(CVM_JAVAC) $(JAVAC_OPTIONS) -sourcepath $(CVM_JCC_SRCPATH) -d $(CVM_JCC_CLASSPATH) \
+ $(subst /,$(CVM_FILESEP),$(CVM_JCC_SRCPATH)/GenOpcodes.java)
+ $(AT)rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \
+ cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties
+@@ -253,7 +253,7 @@ $(CVM_JCC_DEPEND) :: $(CVM_JCC_SRCPATH)/
+ $(CVM_JCC_SRCPATH)/JCCMessage.properties
+ @echo "... $@"
+ @CLASSPATH=$(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime; export CLASSPATH; \
+- $(CVM_JAVAC) $(JAVAC_OPTIONS) -d $(CVM_JCC_CLASSPATH) \
++ $(CVM_JAVAC) $(JAVAC_OPTIONS) -classpath $(CVM_JCC_CLASSPATH)$(PS)$(CVM_JCC_SRCPATH)$(PS)$(CVM_DERIVEDROOT)/javavm/runtime -d $(CVM_JCC_CLASSPATH) \
+ $(CVM_JCC_CLASSES)
+ @rm -f $(CVM_JCC_CLASSPATH)/JCCMessage.properties; \
+ cp $(CVM_JCC_SRCPATH)/JCCMessage.properties $(CVM_JCC_CLASSPATH)/JCCMessage.properties
+Index: cdc/build/share/defs.mk
+===================================================================
+--- cdc/build/share/defs.mk.orig
++++ cdc/build/share/defs.mk
+@@ -1187,7 +1187,7 @@ BUNDLE_PRODUCT_NAME = $(subst $(TM),$(e
+ BUNDLE_VERSION = $(subst -,_,$(J2ME_BUILD_VERSION_STRING))
+ BUNDLE_TARGET = $(subst -,_,$(CVM_TARGET))
+
+-BINARY_BUNDLE_NAME = \
++BINARY_BUNDLE_NAME ?= \
+ $(BUNDLE_PRODUCT_NAME)-$(BUNDLE_VERSION)-$(BUNDLE_TARGET)-bin
+ BINARY_BUNDLE_DIRNAME = $(BINARY_BUNDLE_NAME)
+
+@@ -2153,11 +2153,11 @@ endif
+
+ # Note, ALL_INCLUDE_FLAGS flags is setup in rules.mk so
+ # abs2rel only needs to be called on it once.
+-CPPFLAGS += $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS)
+-CFLAGS_SPEED = $(CFLAGS) $(CCFLAGS_SPEED) $(CPPFLAGS)
+-CFLAGS_SPACE = $(CFLAGS) $(CCFLAGS_SPACE) $(CPPFLAGS)
+-CFLAGS_LOOP = $(CFLAGS) $(CCFLAGS_LOOP) $(CPPFLAGS)
+-CFLAGS_FDLIB = $(CFLAGS) $(CCFLAGS_FDLIB) $(CPPFLAGS)
++CVM_CPPFLAGS += $(CVM_DEFINES) $(ALL_INCLUDE_FLAGS)
++CFLAGS_SPEED = $(CFLAGS) $(CCFLAGS_SPEED) $(CVM_CPPFLAGS)
++CFLAGS_SPACE = $(CFLAGS) $(CCFLAGS_SPACE) $(CVM_CPPFLAGS)
++CFLAGS_LOOP = $(CFLAGS) $(CCFLAGS_LOOP) $(CVM_CPPFLAGS)
++CFLAGS_FDLIB = $(CFLAGS) $(CCFLAGS_FDLIB) $(CVM_CPPFLAGS)
+ CFLAGS_JCS =
+
+ LINKFLAGS += -g -Wl,-export-dynamic $(LINK_ARCH_FLAGS)
+@@ -2165,13 +2165,13 @@ LINKLIBS += -lpthread -ldl $(LINK_A
+ LINKLIBS_JCS +=
+
+ SO_CCFLAGS = $(CCFLAGS_SPEED)
+-SO_CFLAGS = $(CFLAGS) $(SO_CCFLAGS) $(CPPFLAGS)
++SO_CFLAGS = $(CFLAGS) $(SO_CCFLAGS) $(CVM_CPPFLAGS)
+ SO_LINKFLAGS = $(LINKFLAGS) -shared
+
+ #
+ # commands for running the tools
+ #
+-ASM_CMD = $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CPPFLAGS) \
++ASM_CMD = $(AT)$(TARGET_AS) $(ASM_FLAGS) -D_ASM $(CVM_CPPFLAGS) \
+ -o $@ $(call abs2rel,$<)
+
+ # compileCCC(flags, objfile, srcfiles)
+Index: cdc/build/share/rules.mk
+===================================================================
+--- cdc/build/share/rules.mk.orig
++++ cdc/build/share/rules.mk
+@@ -521,7 +521,7 @@ endif
+ # As a performance improvement, evaluate some flags in case
+ # they contain shell commands.
+ # FIXME: Disabled because this causes GCI build failures
+-#$(J2ME_CLASSLIB):: CPPFLAGS := $(CPPFLAGS)
++#$(J2ME_CLASSLIB):: CVM_CPPFLAGS := $(CVM_CPPFLAGS)
+
+ $(J2ME_CLASSLIB):: initbuild
+ $(J2ME_CLASSLIB):: btclasses $(CVM_BUILDTIME_CLASSESZIP)
+@@ -708,14 +708,14 @@ $(CVM_OBJDIR)/executejava.o: $(CVM_DERIV
+ # command to use to generate dependency makefiles if requested
+ ifeq ($(GENERATEMAKEFILES), true)
+ GENERATEMAKEFILES_CMD = \
+- @$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CPPFLAGS) $< \
++ @$(TARGET_CC) $(CCDEPEND) $(CC_ARCH_FLAGS) $(CVM_CPPFLAGS) $< \
+ 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+
+ # command to use to generate stack map analysis files if requested
+ ifeq ($(CVM_CSTACKANALYSIS), true)
+ CSTACKANALYSIS_CMD = \
+- $(AT)$(TARGET_CC) -S $(CCFLAGS) $(CPPFLAGS) -o $(@:.o=.asm) $<
++ $(AT)$(TARGET_CC) -S $(CCFLAGS) $(CVM_CPPFLAGS) -o $(@:.o=.asm) $<
+ endif
+
+ #
+@@ -751,7 +753,7 @@ $(CVM_OBJDIR)/%.o: %.S
+ @echo "as $<"
+ $(ASM_CMD)
+ ifeq ($(GENERATEMAKEFILES), true)
+- @$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \
++ @$(TARGET_CC) $(ASM_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \
+ 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+ ifeq ($(CVM_CSTACKANALYSIS), true)
+@@ -772,7 +774,7 @@ $(CVM_FDLIB_FILES): $(CVM_OBJDIR)/%.o: $
+ @echo "cc $<"
+ $(CC_CMD_FDLIB)
+ ifeq ($(GENERATEMAKEFILES), true)
+- @$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CPPFLAGS) $< \
++ @$(TARGET_CC) $(CC_ARCH_FLAGS) $(CCDEPEND) $(CVM_CPPFLAGS) $< \
+ 2> /dev/null | sed 's!$*\.o!$(dir $@)&!g' > $(@:.o=.d)
+ endif
+
+Index: cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c
+===================================================================
+--- cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c.orig
++++ cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c
+@@ -41,8 +41,8 @@
+ #include <dlfcn.h>
+ #include <stddef.h>
+ /* avoid conflicting ucontext definitions */
+-#define ucontext asm_ucontext
+-#include <asm/ucontext.h>
++/*#define ucontext asm_ucontext*/
++#include <ucontext.h>
+ #include <unistd.h>
+
+ #define MAXSIGNUM 32
============================================================
--- packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb aa80f45ba22c3a76ef6825a5ac1e27ba443a968a
+++ packages/phoneme/phoneme-advanced-foundation_0.0.b73.bb aa80f45ba22c3a76ef6825a5ac1e27ba443a968a
@@ -0,0 +1,26 @@
+require phoneme-advanced.inc
+
+BUILDREV = "b73"
+SRCREV = "11560"
+
+SRC_URI += "file://phoneme-makefile-fix.patch;patch=1;pnum=0"
+
+FILES_${PN} += "\
+ ${COMMON_DIR}/bin/cvm \
+ ${COMMON_DIR}/lib/btclasses.zip \
+ ${COMMON_DIR}/lib/content-types.properties \
+ ${COMMON_DIR}/lib/foundation.jar \
+ ${COMMON_DIR}/lib/security/java.security \
+ ${COMMON_DIR}/lib/security/java.policy \
+ ${COMMON_DIR}/lib/zi/Asia/Novosibirsk \
+ ${COMMON_DIR}/lib/zi/Asia/Calcutta \
+ ${COMMON_DIR}/lib/zi/ZoneInfoMappings \
+ ${COMMON_DIR}/lib/zi/GMT \
+ ${COMMON_DIR}/lib/zi/America/Los_Angeles \
+ ${COMMON_DIR}/democlasses.jar \
+ ${COMMON_DIR}/testclasses.zip \
+ ${COMMON_DIR}/legal/license.txt \
+ ${COMMON_DIR}/legal/thirdpartylicensereadme.txt \
+ ${COMMON_DIR}/legal/copyright.txt \
+"
+
============================================================
--- packages/phoneme/phoneme-advanced.inc 007bcceb2ee829e446bc8efb4e871e5750fabb1b
+++ packages/phoneme/phoneme-advanced.inc 007bcceb2ee829e446bc8efb4e871e5750fabb1b
@@ -0,0 +1,160 @@
+DESCRIPTION = "A free CDC JavaVM and class library from Sun Microsystems."
+LICENSE = "GPLv2"
+HOMEPAGE = "https://phoneme.dev.java.net"
+AUTHOR = "Sun Microsystems, Inc."
+
+DEPENDS = "classpath-native virtual/javac-native linux-libc-headers"
+
+inherit java update-alternatives
+
+# The PhoneME Advanced build system is documented here: http://java.sun.com/javame/reference/docs/cdc_build_system.pdf
+# NOTE: We need to provide an empty password. pswd='' seems not to be the correct way.
+SRC_URI = "\
+ svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=cdc;proto=https;localdir=cdc;user=guest;pswd='' \
+ svn://phoneme.dev.java.net/svn/phoneme/builds/phoneme_advanced-mr2-dev-${BUILDREV};module=tools;proto=https;localdir=tools;user=guest;pswd='' \
+ svn://phoneme.dev.java.net/svn/phoneme;module=legal;localdir=legal;proto=https;user=guest;pswd='' \
+ "
+
+PROVIDES = "virtual/java-cdc java-cdc-runtime"
+PRIORITY = "optional"
+SECTION = "interpreters"
+
+# PhoneME builds currently cannot be parallel
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}"
+
+BUILDREV = ${@bb.fatal('BUILDREV is not defined in this phoneme-advanced recipe!')}
+SRCREV = ${@bb.fatal('SRCREV is not defined in this phoneme-advanced recipe!')}
+
+COMMON_DIR = "${libdir_jvm}/${PN}"
+
+do_compile() {
+ set_arch
+ oe_runmake -C cdc/build/linux-$ARCH-generic bin
+}
+
+do_install() {
+ install -d ${D}/${libdir_jvm}
+
+ unzip cdc/install/${PN}.zip -d ${D}/${libdir_jvm}
+
+ # Additional link named cvm
+ install -d ${D}/${bindir}
+ ln -sf ${libdir_jvm}/${PN}/bin/cvm ${D}${bindir}/cvm
+}
+
+do_configure() {
+ set_arch
+ test ! -d cdc/build/linux-$ARCH-generic && mkdir -p cdc/build/linux-$ARCH-generic
+ cd cdc/build/linux-$ARCH-generic
+
+ echo "Configuring PhoneME Advanced build"
+ # At the moment we do not support anything else than the foundation
+ #profiles.
+ pmo_start J2ME_CLASSLIB foundation
+
+ # Dispatch to arch-specific functions.
+ oe_phoneme_config$ARCH
+
+ oe_phoneme_configbase
+
+ pmo "# Misc locations and file names."
+ pmo BINARY_BUNDLE_NAME ${PN}
+ pmo BINARY_BUNDLE_APPEND_REVISION false
+ pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal
+
+ pmo "# Java toolchain binaries"
+ pmo JDK_HOME $JAVA_HOME
+ pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/
+ pmo CVM_JAVA java
+ pmo CVM_JAVAC javac
+ pmo CVM_JAVADOC true
+ pmo CVM_JAVAH gjavah
+ pmo CVM_JAR gjar
+ pmo CVM_INCLUDE_DIR ${STAGING_INCDIR}/classpath
+
+ pmo JAVAC_OPTIONS -nowarn
+
+ pmo "# Host C/C++ toolchain binaries"
+ pmo HOST_CC "${BUILD_CC}"
+ pmo HOST_CC_PATH "${BUILD_CC}"
+ pmo HOST_CCC "${BUILD_CXX}"
+ pmo HOST_PATH "${BUILD_CXX}"
+ pmo HOST_LD "${BUILD_LD}"
+ pmo HOST_RANLIB "${BUILD_RANLIB}"
+
+ pmo "# C/C++ toolchain binaries"
+ pmo TARGET_CC "${CC}"
+ pmo TARGET_CC_PATH "${CC}"
+ pmo CCFLAGS "${CFLAGS}"
+ pmo TARGET_CCC "${CXX}"
+ pmo TARGET_PATH "${CXX}"
+ pmo CCCFLAGS "${CXXFLAGS}"
+ pmo TARGET_AR "${AR}"
+ pmo TARGET_LD "${CC}"
+ pmo TARGET_RANLIB "${RANLIB}"
+
+ pmo USE_GCC2 false
+
+ pmo "include ../share/top.mk"
+}
+
+pmo_start() {
+ echo "$1 = $2" > GNUmakefile
+ echo "$1 = $2"
+}
+
+pmo() {
+ if [ "$2" ]
+ then
+ echo "$1 = $2" >> GNUmakefile
+ echo "$1 = $2"
+ else
+ echo "$1" >> GNUmakefile
+ echo "$1"
+ fi
+}
+
+set_arch() {
+ case ${TARGET_ARCH} in
+ arm*) ARCH=arm ;;
+ i*86*) ARCH=x86 ;;
+ mips*) ARCH=mips ;;
+ powerpc*) ARCH=powerpc ;;
+ sparc*) ARCH=sparc ;;
+ x86_64*) ARCH=x86 ;;
+ *) die "Sorry, your target architecture is not supported!" ;;
+ esac
+}
+
+# Default non-arch specific configuration
+oe_phoneme_configbase() {
+ pmo CVM_DEBUG false
+ pmo CVM_JIT true
+}
+
+# Default arch specific configurations
+oe_phoneme_configarm() {
+ tf=true
+ if [ Xoabi = X${ARM_ABI} ]
+ then
+ tf=false
+ fi
+
+ pmo USE_AAPCS $tf
+}
+
+oe_phoneme_configx86() {
+ # Taken from linux-x86-generic/GNUmakefile
+ pmo CVM_JIT_REGISTER_LOCALS false
+}
+
+ALTERNATIVE_NAME = "java-cdc"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${libdir}/jvm/${PN}/bin/cvm"
+ALTERNATIVE_PRIORITY = "10"
+
+FILES_${PN} = "${bindir}"
+FILES_${PN}-dbg += "${COMMON_DIR}/bin/.debug/cvm"
+
============================================================
--- packages/python/python-ptrace_0.3.2.bb 0f90f9660627795440c3166b852a0eece9b71cfa
+++ packages/python/python-ptrace_0.3.2.bb 0f90f9660627795440c3166b852a0eece9b71cfa
@@ -0,0 +1,10 @@
+DESCRIPTION = "python-ptrace is a debugger using ptrace."
+HOMEPAGE = "http://fusil.hachoir.org/trac/wiki/python-ptrace"
+SECTION = "devel/python"
+LICENSE = "G%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r461b0f25ec4df76026bbc143ddf9a76a9690fd9e -rd3a7772f0dda4caa934b43a1aec81871ae3eadc8
#
#
#
# patch "conf/checksums.ini"
# from [220049577807c299e5636ee748e66a9f43cd5e48]
# to [a666fe7c398e19b3ec806de77c7d74799ebe271a]
#
# patch "packages/lzma/lzma-native_4.17.bb"
# from [5311eac6c46a2960d3490db56ea225d1f8b06ade]
# to [e156289d106897d745394d560b98ffb79ad68f0b]
#
============================================================
--- conf/checksums.ini 220049577807c299e5636ee748e66a9f43cd5e48
+++ conf/checksums.ini a666fe7c398e19b3ec806de77c7d74799ebe271a
@@ -9502,7 +9502,7 @@ sha256=daa670b686f959ab15e457425e57c50f0
md5=c703192481d94dfa3f4e24eed22c8182
sha256=daa670b686f959ab15e457425e57c50f0b973ee4d24d6a4171c33f467961ad1d
-[http://www.7-zip.org/dl/lzma417.tar.bz2]
+[http://downloads.sourceforge.net/sevenzip/lzma417.tar.bz2]
md5=b1ab85e4dc1eb1323d77fef47a2cb71c
sha256=84124d4501798ecb284fceb28931db023850535e1b1146c884add7b3b0331cbc
============================================================
--- packages/lzma/lzma-native_4.17.bb 5311eac6c46a2960d3490db56ea225d1f8b06ade
+++ packages/lzma/lzma-native_4.17.bb e156289d106897d745394d560b98ffb79ad68f0b
@@ -2,9 +2,10 @@ DEPENDS = "zlib-native"
HOMEPAGE = "http://www.7-zip.org/"
LICENSE = "LGPL"
DEPENDS = "zlib-native"
-PR = "r2"
+PR = "r3"
-SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \
+PVNODOT = "${@bb.data.getVar('PV',d,1).split('.')[0]}${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "${SOURCEFORGE_MIRROR}/sevenzip/lzma${PVNODOT}.tar.bz2 \
file://lzma-406-zlib-stream.patch;patch=1;pnum=2"
S = "${WORKDIR}/SRC"
More information about the Openembedded-commits
mailing list