From: | "William Hubbs (williamh)" <williamh@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in app-accessibility/espeak/files: espeak-1.44.05-respect-ldflags.patch |
Date: | Fri, 29 Oct 2010 18:06:42 |
Message-Id: | 20101029180633.E01082003C@flycatcher.gentoo.org |
1 | williamh 10/10/29 18:06:33 |
2 | |
3 | Added: espeak-1.44.05-respect-ldflags.patch |
4 | Log: |
5 | version bump, also fixes #303094, thanks to Kacper Kowalik |
6 | |
7 | (Portage version: 2.2.0_alpha2/cvs/Linux i686) |
8 | |
9 | Revision Changes Path |
10 | 1.1 app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-accessibility/espeak/files/espeak-1.44.05-respect-ldflags.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: espeak-1.44.05-respect-ldflags.patch |
16 | =================================================================== |
17 | diff --git a/src/Makefile b/src/Makefile |
18 | index da9409e..4fb26d1 100755 |
19 | --- a/src/Makefile |
20 | +++ b/src/Makefile |
21 | @@ -80,10 +80,10 @@ all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME) |
22 | $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions $< |
23 | |
24 | $(BIN_NAME): $(OBJS1) |
25 | - $(CXX) -o $@ $(OBJS1) $(LIBS1) |
26 | + $(CXX) $(LDFLAGS) -o $@ $(OBJS1) $(LIBS1) |
27 | |
28 | $(BIN2_NAME): $(OBJS3) $(LIB_NAME) |
29 | - $(CXX) -o $@ $(OBJS3) $(LIBS3) |
30 | + $(CXX) $(LDFLAGS) -o $@ $(OBJS3) $(LIBS3) |
31 | |
32 | |
33 | |
34 | @@ -92,7 +92,8 @@ x_%.o: %.cpp |
35 | -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o |
36 | |
37 | $(LIB_NAME): $(OBJS2) |
38 | - $(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2) |
39 | + $(CXX) $(LDFLAGS) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ \ |
40 | + $(OBJS2) $(LIBS2) |
41 | |
42 | $(STATIC_LIB_NAME): $(OBJS2) |
43 | $(AR) cqs $(STATIC_LIB_NAME) $(OBJS2) |