1 |
eva 09/01/29 23:05:12 |
2 |
|
3 |
Added: libbtctl-0.10.0-parallel-make.patch |
4 |
Removed: libbtctl-0.6.0-aclocal_openobex.patch |
5 |
libbtctl-0.6.0-libdir.patch |
6 |
Log: |
7 |
Fix parallel make, bug #235991. Fix effectless sed. Remove old revisions. |
8 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 net-wireless/libbtctl/files/libbtctl-0.10.0-parallel-make.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/libbtctl/files/libbtctl-0.10.0-parallel-make.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-wireless/libbtctl/files/libbtctl-0.10.0-parallel-make.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: libbtctl-0.10.0-parallel-make.patch |
17 |
=================================================================== |
18 |
Index: libbtctl-0.10.0/src/Makefile.am |
19 |
=================================================================== |
20 |
--- libbtctl-0.10.0.orig/src/Makefile.am |
21 |
+++ libbtctl-0.10.0/src/Makefile.am |
22 |
@@ -37,27 +37,27 @@ obex_server_source_test_LDADD = \ |
23 |
libbtctl.la \ |
24 |
$(BTCTL_LIBS) $(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
25 |
|
26 |
-btctl_async_test_LDFLAGS= \ |
27 |
+btctl_async_test_LDADD = \ |
28 |
libbtctl.la $(BTCTL_LIBS) \ |
29 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
30 |
|
31 |
-btobexclient_test_LDFLAGS= \ |
32 |
+btobexclient_test_LDADD = \ |
33 |
libbtctl.la $(BTCTL_LIBS) \ |
34 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
35 |
|
36 |
-btobex_test_LDFLAGS= \ |
37 |
+btobex_test_LDADD = \ |
38 |
libbtctl.la $(BTCTL_LIBS) \ |
39 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
40 |
|
41 |
-btctl_discovery_test_LDFLAGS= \ |
42 |
+btctl_discovery_test_LDADD = \ |
43 |
libbtctl.la $(BTCTL_LIBS) \ |
44 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
45 |
|
46 |
-btlist_LDFLAGS = \ |
47 |
+btlist_LDADD = \ |
48 |
libbtctl.la $(BTCTL_LIBS) \ |
49 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
50 |
|
51 |
-btsignal_watch_LDFLAGS = \ |
52 |
+btsignal_watch_LDADD = \ |
53 |
libbtctl.la $(BTCTL_LIBS) \ |
54 |
$(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
55 |
|
56 |
@@ -80,7 +80,8 @@ pkginclude_HEADERS = \ |
57 |
btobex-client.h btctl-types.h |
58 |
|
59 |
libbtctl_la_LDFLAGS = \ |
60 |
- -version-info $(BTCTL_LT_VERSION) \ |
61 |
+ -version-info $(BTCTL_LT_VERSION) |
62 |
+libbtctl_la_LIBADD = \ |
63 |
$(BTCTL_LIBS) $(BLUETOOTH_LIBS) $(OPENOBEX_LIBS) |
64 |
|
65 |
|
66 |
@@ -123,6 +124,7 @@ btctl-py.c: btctl.defs btctl.override |
67 |
|
68 |
btctl_la_SOURCES = btctl-py.c btctl-pymodule.c |
69 |
btctl_la_LIBADD = libbtctl.la |
70 |
-btctl_la_LDFLAGS = $(BTCTLPY_LIBS) -module -avoid-version |
71 |
+btctl_la_LDFLAGS = -module -avoid-version |
72 |
+btctl_la_LIBADD = $(BTCTLPY_LIBS) |
73 |
endif |