OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Mar-2008 15:21:10
Branch: HEAD Handle: 2008032114211000
Modified files:
openpkg-src/espeak espeak.patch
Log:
fix run-time path
Summary:
Revision Changes Path
1.2 +12 -4 openpkg-src/espeak/espeak.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/espeak/espeak.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 espeak.patch
--- openpkg-src/espeak/espeak.patch 21 Mar 2008 13:19:43 -0000 1.1
+++ openpkg-src/espeak/espeak.patch 21 Mar 2008 14:21:10 -0000 1.2
@@ -1,6 +1,6 @@
Index: src/Makefile
--- src/Makefile.orig 2008-03-09 20:22:06 +0100
-+++ src/Makefile 2008-03-21 13:58:43 +0100
++++ src/Makefile 2008-03-21 15:19:43 +0100
@@ -25,7 +25,7 @@
MKDIR = mkdir -p
@@ -10,7 +10,7 @@
ifeq ($(AUDIO),pulseaudio)
-@@ -53,29 +53,29 @@
+@@ -53,36 +53,35 @@
SRCS1=$(speak_SOURCES)
OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
@@ -34,7 +34,7 @@
-all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
- mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
-+all: $(BIN_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
++all: $(STATIC_LIB_NAME) $(BIN2_NAME)
.cpp.o:
- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\"
-Wall -pedantic -I. -c -fno-exceptions $<
@@ -48,9 +48,17 @@
$(CXX) -o $@ $(OBJS3) $(LIBS3)
+
+ x_%.o: %.cpp
+- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -pedantic \
+- -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
++ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\"
-fPIC -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
+
+ $(LIB_NAME): $(OBJS2)
+ $(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2)
$(LIBS2)
Index: src/espeak.cpp
--- src/espeak.cpp.orig 2008-03-13 02:08:03 +0100
-+++ src/espeak.cpp 2008-03-21 13:58:37 +0100
++++ src/espeak.cpp 2008-03-21 15:19:10 +0100
@@ -26,6 +26,10 @@
#include "speak_lib.h"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
