diff options
Diffstat (limited to 'sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch')
-rw-r--r-- | sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch new file mode 100644 index 000000000000..54c7963a9a60 --- /dev/null +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20120414-flags-parallel.patch @@ -0,0 +1,82 @@ +--- a/Include.make ++++ b/Include.make +@@ -1,4 +1,4 @@ + USRSBINDIR := /usr/sbin + USRLIBDIR := /usr/lib + MAN8 := /usr/share/man/man8 +-CFLAGS := -Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} ++CFLAGS := -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} +--- a/kernel_test/Makefile ++++ b/kernel_test/Makefile +@@ -3,20 +3,18 @@ ALL_FILES = tomoyo_filesystem_test tomoyo_file_test tomoyo_rewrite_test newns to + all: $(ALL_FILES) + chmod 755 testall.sh + +-CC=gcc +- +-CFLAGS=-Wall -O2 ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} ++CFLAGS += -Wall ${shell $(CC) -Wno-pointer-sign -S -o /dev/null -x c - < /dev/null > /dev/null 2>&1 && echo "-Wno-pointer-sign"} + + # + # Tools for kernel testing. + # + + tomoyo_new_test: tomoyo_new_test.c include.h +- $(CC) $(CFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo_new_test tomoyo_new_test.c -lutil + chmod 700 tomoyo_new_test + + .c: include.h +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + chmod 700 $@ + + # +--- a/sbin/Makefile ++++ b/sbin/Makefile +@@ -9,7 +9,7 @@ install: all + cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/sbin/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +--- a/usr_lib_tomoyo/Makefile ++++ b/usr_lib_tomoyo/Makefile +@@ -9,7 +9,7 @@ install: all + cp -af --remove-destination $(BUILD_FILES) tomoyotools.conf ../README.tomoyo ../COPYING.tomoyo $(INSTALLDIR)/usr/lib/tomoyo/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile +index cdaf507..2b7c4f0 100644 +--- a/usr_sbin/Makefile ++++ b/usr_sbin/Makefile +@@ -14,17 +14,17 @@ $(BUILD_FILES): libtomoyotools.so + sleep 10 + + libtomoyotools.so: tomoyotools.c tomoyotools.h +- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.1 + ln -sf libtomoyotools.so.1.0.1 libtomoyotools.so + + .c: +- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. + + tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so +- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON + + tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so +- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. + + install: all + mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib |