flite-link.patch

   1 --- flite-1.4-release/config/common_make_rules.orig     2012-10-06 19:43:00.376818894 +0200
   2 +++ flite-1.4-release/config/common_make_rules  2012-10-06 19:47:19.680146823 +0200
   3 @@ -68,8 +68,22 @@
   4
   5  FLITELIBS = $(BUILDDIR)/lib/libflite.a
   6  FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
   7 -LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
   8 +LDFLAGS += -lm $(OTHERLIBS)
   9
  10 +libflite_LDLIBS = $(AUDIOLIBS) -lm
  11 +libflite_cmulex_LDLIBS = -lflite
  12 +libflite_usenglish_LDLIBS = -lflite
  13 +libflite_cmu_grapheme_lang_LDLIBS = -lflite
  14 +libflite_cmu_grapheme_lex_LDLIBS = -lflite
  15 +libflite_cmu_indic_lang_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  16 +libflite_cmu_indic_lex_LDLIBS = -lflite_cmu_indic_lang -lflite_cmulex -lflite_usenglish -lflite
  17 +libflite_cmu_us_awb_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  18 +libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  19 +libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  20 +libflite_cmu_us_rms_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  21 +libflite_cmu_us_slt_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
  22 +libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish -lflite
  23 +
  24  FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
  25  ifdef SHFLAGS
  26  SOOBJS = $(OBJS:.o=.os)
  27 @@ -123,7 +133,7 @@
  28         @ rm -rf shared_os && mkdir shared_os
  29         @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
  30         @ (cd shared_os && ar x ../$<)
  31 -       @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
  32 +       (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link=../$(dir $@) -L../$(dir $@) -o ../$@.${PROJECT_VERSION} *.os $($(patsubst %.so,%_LDLIBS,$(notdir $@))))
  33         @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
  34         @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
  35         @ rm -rf shared_os
  36 --- flite-1.2-release/doc/Makefile..mk  2002-12-30 15:57:30 +0300
  37 +++ flite-1.2-release/doc/Makefile      2006-04-10 01:12:41 +0400
  38 @@ -40,7 +40,7 @@
  39  ALL_DIRS=
  40  FILES = Makefile flite.texi intro.txt alice stuff.ed
  41
  42 -ALL =
  43 +ALL = flite.html
  44
  45  include $(TOP)/config/common_make_rules
  46
  47 --- flite-1.4-release/main/Makefile.orig        2012-10-06 19:43:00.376818894 +0200
  48 +++ flite-1.4-release/main/Makefile     2012-10-06 19:49:58.660143508 +0200
  49 @@ -51,9 +51,9 @@
  50  VOICES=$(VOXES)
  51  VOICELIBS=$(VOICES:%=flite_%)
  52
  53 -flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
  54 +flite_LIBS = flite $(LEXES:%=flite_%) $(LANGS:%=flite_%) $(VOICELIBS)
  55
  56 -flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
  57 +flite_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link=$(LIBDIR) $(flite_LIBS:%=-l%)
  58  flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
  59
  60  include $(TOP)/config/common_make_rules
  61 @@ -66,7 +66,7 @@
  62                      $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
  63
  64  flite_time_LIBS = flite_cmu_time_awb flite_usenglish flite_cmulex
  65 -flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
  66 +flite_time_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link=$(LIBDIR) $(flite_time_LIBS:%=-l%)
  67  flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
  68
  69  LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
  70 --- flite-2.1-release/Makefile.orig     2017-12-25 16:13:21.000000000 +0100
  71 +++ flite-2.1-release/Makefile  2019-04-20 09:16:48.529713034 +0200
  72 @@ -46,7 +46,7 @@
  73  BUILD_DIRS = include src lang doc
  74  ALL_DIRS=config $(BUILD_DIRS) testsuite \
  75           wince windows android \
  76 -         sapi tools main
  77 +         sapi main tools
  78  CONFIG=configure configure.in config.sub config.guess \
  79         missing install-sh mkinstalldirs
  80  OLD_WINDOWS = Exports.def flite.sln fliteDll.vcproj
  81 @@ -56,7 +56,7 @@
  82                  config.cache config.log config.status \
  83                 config/config config/system.mak FileList
  84
  85 -HOST_ONLY_DIRS = tools main
  86 +HOST_ONLY_DIRS = main tools
  87  ALL = $(BUILD_DIRS)
  88
  89  config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; )  >&2)