bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flite: Parallel build fixes.

Browse Source 
It does not parallelize well due to the screwed build-rules. Seems nontrivial to fix and probably not worth it. But it should not fail to build anymore.


git-svn-id: svn://svn.openwrt.org/openwrt/packages@23316 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2010-10-08 11:52:40 +00:00
parent 8324f970a0
commit b4c3caff92
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/flite/Makefile
View File

@ -14,6 +14,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/ PKG_SOURCE_URL:=http://www.speech.cs.cmu.edu/flite/packed/flite-1.3/
PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5 PKG_MD5SUM:=ae0aca1cb7b4801f4372f3a75a9e52b5
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

54
sound/flite/patches/100-shared_libs
View File

@ -1,7 +1,13 @@
diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/config/common_make_rules ---
--- flite-1.3-release/config/common_make_rules 2004-12-20 00:20:43.000000000 +0200 Makefile | 2 -
+++ flite-1.3-release-mod/config/common_make_rules 2006-11-12 12:17:25.000000000 +0200 config/common_make_rules | 34 ++++++++++++--------
@@ -59,27 +59,35 @@ lib/Makefile | 78 +++++++++++++++++++++++++++++++++++++++++++++++
main/Makefile | 4 +-
4 files changed, 102 insertions(+), 16 deletions(-)
--- flite-1.3-release.orig/config/common_make_rules
+++ flite-1.3-release/config/common_make_rules
@@ -59,27 +59,35 @@ BUILDDIR=$(TOP)/build/$(TARGET_PLATFORM)
endif endif
OBJDIR=$(BUILDDIR)/obj/$(DIRNAME) OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
BINDIR=$(BUILDDIR)/bin BINDIR=$(BUILDDIR)/bin
@ -42,30 +48,33 @@ diff -uNr flite-1.3-release/config/common_make_rules flite-1.3-release-mod/confi
# Only do some directories when you are not cross compiling # Only do some directories when you are not cross compiling
ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM)) ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS) OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
@@ -117,14 +125,14 @@ @@ -117,15 +125,15 @@ $(OBJDIR)/.build_so: $(FULLSOOBJS)
@ touch $(OBJDIR)/.build_so @ touch $(OBJDIR)/.build_so
# Used in the lib/ directory and in building new voices # Used in the lib/ directory and in building new voices
-$(OBJDIR)/%.so: %.shared.a -$(OBJDIR)/%.so: %.shared.a
+%.so: %.shared.a +%.so: %.shared.a
@ echo making $@ @ echo making $@
@ rm -rf shared_os && mkdir shared_os - @ rm -rf shared_os && mkdir shared_os
- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} - @ (cd shared_os && ar x ../$<)
@ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os) - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} - @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@ - @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS))) - @ rm -rf shared_os
+ @ rm -rf shared_os-$@ && mkdir shared_os-$@
+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+ @ (cd shared_os-$@ && ar x ../$<)
+ @ (cd shared_os-$@ && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os -L../ $($(@:%.so=%_LDLIBS)))
+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION} + @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@ + @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
@ rm -rf shared_os + @ rm -rf shared_os-$@
$(OBJDIR)/.make_build_dirs: $(OBJDIR)/.make_build_dirs:
diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile @ echo making in $(DIRNAME) ...
--- flite-1.3-release/lib/Makefile 1970-01-01 02:00:00.000000000 +0200 --- /dev/null
+++ flite-1.3-release-mod/lib/Makefile 2006-11-12 12:17:40.000000000 +0200 +++ flite-1.3-release/lib/Makefile
@@ -0,0 +1,73 @@ @@ -0,0 +1,78 @@
+########################################################################### +###########################################################################
+## ## +## ##
+## Language Technologies Institute ## +## Language Technologies Institute ##
@ -128,10 +137,15 @@ diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
+shared_libs: $(SHAREDLIBS) +shared_libs: $(SHAREDLIBS)
+libflite_LDLIBS = -lm $(AUDIOLIBS) +libflite_LDLIBS = -lm $(AUDIOLIBS)
+libflite_cmulex_LDLIBS = -lflite +libflite_cmulex_LDLIBS = -lflite
+libflite_cmulex.so: libflite.so
+libflite_usenglish_LDLIBS = -lflite +libflite_usenglish_LDLIBS = -lflite
+libflite_usenglish.so: libflite.so
+libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish +libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_kal.so: libflite_cmulex.so libflite_usenglish.so
+libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish +libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
+libflite_cmu_us_kal16.so: libflite_cmulex.so libflite_usenglish.so
+libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish +libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+libflite_cmu_time_awb.so: libflite.so libflite_cmulex.so libflite_usenglish.so
+else +else
+shared_libs: nothing +shared_libs: nothing
+endif +endif
@ -139,10 +153,9 @@ diff -uNr flite-1.3-release/lib/Makefile flite-1.3-release-mod/lib/Makefile
+install: +install:
+ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -) + @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
+ +
diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile --- flite-1.3-release.orig/main/Makefile
--- flite-1.3-release/main/Makefile 2005-08-08 00:38:42.000000000 +0200 +++ flite-1.3-release/main/Makefile
+++ flite-1.3-release-mod/main/Makefile 2006-11-12 11:44:46.000000000 +0200 @@ -50,11 +50,11 @@ ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR)
@@ -50,11 +50,11 @@
flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX) flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%) flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
@ -156,9 +169,8 @@ diff -uNr flite-1.3-release/main/Makefile flite-1.3-release-mod/main/Makefile
include $(TOP)/config/common_make_rules include $(TOP)/config/common_make_rules
diff -uNr flite-1.3-release/Makefile flite-1.3-release-mod/Makefile --- flite-1.3-release.orig/Makefile
--- flite-1.3-release/Makefile 2005-11-01 15:40:45.000000000 +0200 +++ flite-1.3-release/Makefile
+++ flite-1.3-release-mod/Makefile 2006-11-12 11:44:46.000000000 +0200
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
########################################################################### ###########################################################################
TOP=. TOP=.