| 1 |
ssuominen 11/02/10 17:22:26 |
| 2 |
|
| 3 |
Added: ical-3.0-makefile.patch |
| 4 |
Removed: ical-3.0-ldflags.patch |
| 5 |
Log: |
| 6 |
Fix check target to work with -j wrt #315949 by Kevin McCarthy. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-office/ical/files/ical-3.0-makefile.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/ical/files/ical-3.0-makefile.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/ical/files/ical-3.0-makefile.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: ical-3.0-makefile.patch |
| 17 |
=================================================================== |
| 18 |
Add LDFLAGS to linker calls |
| 19 |
Fix deps on check targets for parallel tests |
| 20 |
|
| 21 |
Patch by Kevin McCarthy <signals42@×××××.com> |
| 22 |
|
| 23 |
--- Makefile.in |
| 24 |
+++ Makefile.in |
| 25 |
@@ -74,13 +74,13 @@ |
| 26 |
all: $(CONFIGURED) ical |
| 27 |
|
| 28 |
ical: $(LIB3) $(LIB2) $(LIB1) $(OBJS) main.o |
| 29 |
- $(CXXLINKER) -o $@ $(OBJS) main.o $(LIBS) |
| 30 |
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) main.o $(LIBS) |
| 31 |
|
| 32 |
ical-bundle: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o |
| 33 |
- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(BLIBS) |
| 34 |
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(BLIBS) |
| 35 |
|
| 36 |
ical-tiny: $(LIB3) $(LIB2) $(LIB1) $(OBJS) mbundle.o |
| 37 |
- $(CXXLINKER) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS) |
| 38 |
+ $(CXXLINKER) $(LDFLAGS) -o $@ $(OBJS) mbundle.o $(TINY_BLIBS) |
| 39 |
|
| 40 |
$(LIB1): FRC |
| 41 |
@echo making in calendar |
| 42 |
@@ -195,7 +195,7 @@ |
| 43 |
check_text: |
| 44 |
@ICAL_LIBRARY=$(srcdir) ./ical -nodisplay -f $(srcdir)/tests/no_x.tcl |
| 45 |
|
| 46 |
-check_x: |
| 47 |
+check_x: check_text |
| 48 |
@ICAL_LIBRARY=$(srcdir) ./ical -f $(srcdir)/tests/x.tcl |
| 49 |
|
| 50 |
# Rules for shipping html documentation |
Archives