1 |
naota 11/09/29 21:48:41 |
2 |
|
3 |
Added: ccs-tools-1.8.0_p20110214-as-needed.patch |
4 |
ccs-tools-1.8.0_p20110214-ldflags.patch |
5 |
Log: |
6 |
Clean up sed; Respect LDFLAGS; Deal with --as-needed. Patch-By: thomasq Bug #364921 |
7 |
|
8 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: ccs-tools-1.8.0_p20110214-as-needed.patch |
17 |
=================================================================== |
18 |
--- trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile 2011/08/20 04:19:39 5357 |
19 |
+++ trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile 2011/09/28 08:53:43 5494 |
20 |
@@ -19,7 +19,7 @@ |
21 |
ln -sf libccstools.so.2.0.2 libccstools.so |
22 |
|
23 |
.c: |
24 |
- $(CC) $(CFLAGS) -o $@ -lccstools -L. $< |
25 |
+ $(CC) $(CFLAGS) -o $@ $< -lccstools -L. |
26 |
|
27 |
ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so |
28 |
$(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON |
29 |
|
30 |
|
31 |
|
32 |
1.1 sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch |
33 |
|
34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch?rev=1.1&view=markup |
35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch?rev=1.1&content-type=text/plain |
36 |
|
37 |
Index: ccs-tools-1.8.0_p20110214-ldflags.patch |
38 |
=================================================================== |
39 |
diff --git a/sbin/Makefile b/sbin/Makefile |
40 |
index cc61f13..3bdb292 100644 |
41 |
--- a/sbin/Makefile |
42 |
+++ b/sbin/Makefile |
43 |
@@ -9,7 +9,7 @@ install: all |
44 |
$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) |
45 |
|
46 |
.c: |
47 |
- $(CC) $(CFLAGS) -o $@ $< |
48 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
49 |
|
50 |
clean: |
51 |
rm -f -- $(BUILD_FILES) |
52 |
diff --git a/usr_lib_ccs/Makefile b/usr_lib_ccs/Makefile |
53 |
index 8181201..bee5eae 100644 |
54 |
--- a/usr_lib_ccs/Makefile |
55 |
+++ b/usr_lib_ccs/Makefile |
56 |
@@ -11,7 +11,7 @@ install: all |
57 |
$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/ |
58 |
|
59 |
.c: |
60 |
- $(CC) $(CFLAGS) -o $@ $< |
61 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
62 |
|
63 |
clean: |
64 |
rm -f -- $(BUILD_FILES) |
65 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile |
66 |
index 6dff8c7..f324c79 100644 |
67 |
--- a/usr_sbin/Makefile |
68 |
+++ b/usr_sbin/Makefile |
69 |
@@ -15,17 +15,17 @@ |
70 |
sleep 10 |
71 |
|
72 |
libccstools.so: ccstools.c ccstools.h |
73 |
- $(CC) $(CFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2 |
74 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2 |
75 |
ln -sf libccstools.so.1.0.2 libccstools.so |
76 |
|
77 |
.c: |
78 |
- $(CC) $(CFLAGS) -o $@ $< -lccstools -L. |
79 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. |
80 |
|
81 |
ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so |
82 |
- $(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON |
83 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON |
84 |
|
85 |
ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so |
86 |
- $(CC) $(CFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. |
87 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. |
88 |
|
89 |
install: all |
90 |
mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR) |