diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/phoneme/files | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/phoneme/files')
-rw-r--r-- | packages/phoneme/files/b87-makefile-fix.patch | 144 |
1 files changed, 0 insertions, 144 deletions
diff --git a/packages/phoneme/files/b87-makefile-fix.patch b/packages/phoneme/files/b87-makefile-fix.patch deleted file mode 100644 index 5181087f6f..0000000000 --- a/packages/phoneme/files/b87-makefile-fix.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: cdc/build/share/rules_zoneinfo.mk -=================================================================== ---- cdc.orig/build/share/rules_zoneinfo.mk 2008-09-17 17:38:44.424243663 +0200 -+++ cdc/build/share/rules_zoneinfo.mk 2008-09-17 17:46:13.900243700 +0200 -@@ -45,7 +45,7 @@ - .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.orig/build/share/jcc.mk 2008-09-17 17:38:44.664243074 +0200 -+++ cdc/build/share/jcc.mk 2008-09-17 17:46:13.900243700 +0200 -@@ -93,7 +93,7 @@ - $(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 -@@ -252,7 +252,7 @@ - $(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.orig/build/share/defs.mk 2008-09-17 17:38:44.324242543 +0200 -+++ cdc/build/share/defs.mk 2008-09-17 17:46:13.923263871 +0200 -@@ -1205,7 +1205,7 @@ - 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) - -@@ -2193,11 +2193,11 @@ - - # 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) -@@ -2205,13 +2205,13 @@ - 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.orig/build/share/rules.mk 2008-09-17 17:38:44.636242663 +0200 -+++ cdc/build/share/rules.mk 2008-09-17 17:46:13.947252841 +0200 -@@ -520,7 +520,7 @@ - # 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) -@@ -709,14 +709,14 @@ - # 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 - - # -@@ -752,7 +752,7 @@ - @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) -@@ -773,7 +773,7 @@ - @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.orig/src/linux-arm/javavm/runtime/segvhandler_arch.c 2008-09-17 17:41:08.367553837 +0200 -+++ cdc/src/linux-arm/javavm/runtime/segvhandler_arch.c 2008-09-17 17:46:13.963253086 +0200 -@@ -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 |