festival/repos/extra-x86_64/festival-shared-build.patch

   1 --- speech_tools/config/rules/defaults.mak.orig 2007-03-16 12:39:12.000000000 -0400
   2 +++ speech_tools/config/rules/defaults.mak      2007-03-16 12:39:19.000000000 -0400
   3 @@ -69,15 +69,21 @@
   4         MADE_FROM_ABOVE:=$(N)
   5  endif
   6
   7 +ifneq ($(SHARED),0)
   8 +    LIBTYPE=so
   9 +else
  10 +    LIBTYPE=a
  11 +endif
  12 +
  13  ifndef PROJECT_LIBDEPS
  14 -    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).a)
  15 +    PROJECT_LIBDEPS = $(foreach l,$(PROJECT_LIBRARIES),$(PROJECT_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
  16  endif
  17  ifndef PROJECT_LIBS
  18      PROJECT_LIBS = $(foreach l,$(PROJECT_LIBRARIES),-L$(PROJECT_LIBRARY_DIR_$(l)) -l$(l))
  19  endif
  20
  21  ifndef REQUIRED_LIBDEPS
  22 -    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).a)
  23 +    REQUIRED_LIBDEPS = $(foreach l,$(REQUIRED_LIBRARIES),$(REQUIRED_LIBRARY_DIR_$(l))/lib$(l).$(LIBTYPE))
  24  endif
  25  ifndef REQUIRED_LIBS
  26      REQUIRED_LIBS = $(foreach l,$(REQUIRED_LIBRARIES),-L$(REQUIRED_LIBRARY_DIR_$(l)) -l$(l))
  27 --- festival/config/project.mak.orig    2007-03-16 13:01:40.000000000 -0400
  28 +++ festival/config/project.mak 2007-03-16 13:02:24.000000000 -0400
  29 @@ -83,6 +83,8 @@
  30  PROJECT_LIBRARY_DIR_Festival = $(TOP)/src/lib
  31  PROJECT_DEFAULT_LIBRARY = Festival
  32
  33 +PROJECT_LIBRARY_VERSION_Festival = $(PROJECT_VERSION).0
  34 +
  35  # Libraries used from other projects
  36
  37  REQUIRED_LIBRARIES = estools estbase eststring
  38 diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
  39 --- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100
  40 +++ speech_tools/config/compilers/gcc_defaults.mak      2010-12-06 10:27:51.000000000 +0100
  41 @@ -83,7 +83,7 @@ SHARED_CXXFLAGS  = -fPIC
  42  ifndef GCC_MAKE_SHARED_LIB
  43  # Older versions of gcc might have required -fno-shared-data
  44  #    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
  45 -    MAKE_SHARED_LIB = $(CXX) -shared -o XXX
  46 +    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
  47  else
  48      MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
  49  endif
  50 diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
  51 --- speech_tools/config/rules/library.mak.bettersoname  2001-04-04 13:55:32.000000000 +0200
  52 +++ speech_tools/config/rules/library.mak       2010-12-06 10:25:35.000000000 +0100
  53 @@ -103,14 +103,14 @@ endif
  54   ###########################################################################
  55
  56  lib%.so : lib%.a
  57 -       @echo Make Shared Library $*
  58 +       @echo Make Shared Library $(*F)
  59         @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
  60         @(cd shared_space ; $(AR) x ../$< )
  61 -       @echo Link Shared Library $*
  62 -       if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
  63 -       $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
  64 +       @echo Link Shared Library $(*F)
  65 +       if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
  66 +       $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
  67         @$(RM) -f shared_space/*.o $@
  68 -       @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
  69 +       @ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
  70
  71   ###########################################################################
  72   ##                                                                       ##