1 |
naota 11/09/29 22:43:40 |
2 |
|
3 |
Added: tomoyo-tools-2.4.0_p20110929-flags-parallel.patch |
4 |
Removed: tomoyo-tools-2.4.0_p20110820-flags-parallel.patch |
5 |
Log: |
6 |
Version bumped. Bug #355823 |
7 |
|
8 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110929-flags-parallel.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110929-flags-parallel.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/tomoyo-tools/files/tomoyo-tools-2.4.0_p20110929-flags-parallel.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: tomoyo-tools-2.4.0_p20110929-flags-parallel.patch |
17 |
=================================================================== |
18 |
diff --git a/Include.make b/Include.make |
19 |
index 3f85e61..c34ba28 100644 |
20 |
--- a/Include.make |
21 |
+++ b/Include.make |
22 |
@@ -1,7 +1,5 @@ |
23 |
-CC := gcc |
24 |
INSTALL := install |
25 |
SBINDIR := /sbin |
26 |
USRSBINDIR := /usr/sbin |
27 |
USRLIBDIR := /usr/lib |
28 |
MAN8 := /usr/share/man/man8 |
29 |
-CFLAGS := -Wall -O2 |
30 |
diff --git a/kernel_test/Makefile b/kernel_test/Makefile |
31 |
index 2559b4b..ef599a2 100644 |
32 |
--- a/kernel_test/Makefile |
33 |
+++ b/kernel_test/Makefile |
34 |
@@ -10,16 +10,14 @@ all: $(ALL_FILES) |
35 |
|
36 |
$(ALL_FILES): include.h |
37 |
|
38 |
-CC=gcc |
39 |
- |
40 |
-CFLAGS=-Wall -O2 |
41 |
+CFLAGS += -Wall -O2 |
42 |
|
43 |
# |
44 |
# Tools for kernel testing. |
45 |
# |
46 |
|
47 |
.c: |
48 |
- $(CC) $(CFLAGS) -o $@ $< |
49 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
50 |
|
51 |
# |
52 |
# Delete all test programs. |
53 |
diff --git a/sbin/Makefile b/sbin/Makefile |
54 |
index 0f53bc6..0e8e42e 100644 |
55 |
--- a/sbin/Makefile |
56 |
+++ b/sbin/Makefile |
57 |
@@ -9,7 +9,7 @@ install: all |
58 |
$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) |
59 |
|
60 |
.c: |
61 |
- $(CC) $(CFLAGS) -o $@ $< |
62 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
63 |
|
64 |
clean: |
65 |
rm -f -- $(BUILD_FILES) |
66 |
diff --git a/usr_lib_tomoyo/Makefile b/usr_lib_tomoyo/Makefile |
67 |
index 94020ee..f20ae40 100644 |
68 |
--- a/usr_lib_tomoyo/Makefile |
69 |
+++ b/usr_lib_tomoyo/Makefile |
70 |
@@ -11,7 +11,7 @@ install: all |
71 |
$(INSTALL) -m 0644 ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/$(USRLIBDIR)/tomoyo/ |
72 |
|
73 |
.c: |
74 |
- $(CC) $(CFLAGS) -o $@ $< |
75 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< |
76 |
|
77 |
clean: |
78 |
rm -f -- $(BUILD_FILES) |
79 |
diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile |
80 |
index fa715b0..5b991db 100644 |
81 |
--- a/usr_sbin/Makefile |
82 |
+++ b/usr_sbin/Makefile |
83 |
@@ -15,17 +15,17 @@ $(BUILD_FILES): libtomoyotools.so |
84 |
sleep 10 |
85 |
|
86 |
libtomoyotools.so: tomoyotools.c tomoyotools.h |
87 |
- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.2 |
88 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.2 -o libtomoyotools.so.2.0.2 |
89 |
ln -sf libtomoyotools.so.2.0.2 libtomoyotools.so |
90 |
|
91 |
.c: |
92 |
- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. |
93 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. |
94 |
|
95 |
tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so |
96 |
- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
97 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON |
98 |
|
99 |
tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so |
100 |
- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
101 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. |
102 |
|
103 |
install: all |
104 |
mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR) |