diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2011-09-29 22:34:06 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2011-09-29 22:34:06 +0000 |
| commit | 37be8c7c5d46f7b2f6346a468c9c8161c47ea9fe (patch) | |
| tree | b5f15bee9eaf1b67ef4fbbb74042796fa33f44e0 /sys-apps/tomoyo-tools/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-37be8c7c5d46f7b2f6346a468c9c8161c47ea9fe.tar.gz gentoo-2-37be8c7c5d46f7b2f6346a468c9c8161c47ea9fe.tar.bz2 gentoo-2-37be8c7c5d46f7b2f6346a468c9c8161c47ea9fe.zip | |
Version bumped. Bug #355823
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/tomoyo-tools/files')
| -rw-r--r-- | sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch (renamed from sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch) | 46 | ||||
| -rw-r--r-- | sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch (renamed from sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch) | 0 |
2 files changed, 17 insertions, 29 deletions
diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch index 8b5167702a92..278e28fad6f7 100644 --- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-flags-parallel.patch +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-flags-parallel.patch @@ -62,41 +62,29 @@ clean: rm -f -- $(BUILD_FILES) ---- a/usr_sbin/Makefile 2011-01-17 22:55:46.784698002 +0100 -+++ b/usr_sbin/Makefile 2011-01-17 23:01:59.420137754 +0100 -@@ -1,25 +1,29 @@ - BUILD_FILES = tomoyo-domainmatch tomoyo-queryd tomoyo-pstree tomoyo-checkpolicy tomoyo-editpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy -+SIMPLE = tomoyo-domainmatch tomoyo-pstree tomoyo-checkpolicy tomoyo-findtemp tomoyo-ld-watch tomoyo-loadpolicy tomoyo-patternize tomoyo-savepolicy tomoyo-setlevel tomoyo-setprofile tomoyo-sortpolicy tomoyo-diffpolicy tomoyo-selectpolicy +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 - all: libtomoyotools.so $(BUILD_FILES) + 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 -+$(SIMPLE): % : %.c libtomoyotools.so -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. -+ - /usr/include/curses.h: - @echo "/usr/include/curses.h is missing." - @echo "Run 'yum install ncurses-devel' or 'apt-get install libncurses5-dev'" - sleep 10 + .c: +- $(CC) $(CFLAGS) -o $@ $< -ltomoyotools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -ltomoyotools -L. --tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h -- $(CC) $(CFLAGS) -o tomoyo-editpolicy editpolicy*.c -lncurses -ltomoyotools -L. -DCOLOR_ON || ln -f dummy tomoyo-editpolicy -+tomoyo-editpolicy: tomoyotools.h editpolicy*.c readline.h /usr/include/curses.h libtomoyotools.so + 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 -- $(CC) $(CFLAGS) -o tomoyo-queryd tomoyo-queryd.c -lncurses -ltomoyotools -L. || ln -f dummy tomoyo-queryd -+tomoyo-queryd: tomoyotools.h tomoyo-queryd.c readline.h /usr/include/curses.h libtomoyotools.so + 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. - libtomoyotools.so: tomoyotools.c tomoyotools.h -- $(CC) $(CFLAGS) -fPIC tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.0 -+ $(CC) $(CFLAGS) -fPIC $(LDFLAGS) tomoyotools.c -shared -Wl,-soname,libtomoyotools.so.1 -o libtomoyotools.so.1.0.0 - ln -sf libtomoyotools.so.1.0.0 libtomoyotools.so - - .c: -- $(CC) $(CFLAGS) -o $@ -ltomoyotools -L. $< -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -ltomoyotools -L. $< - install: all mkdir -p $(INSTALLDIR)/usr/sbin $(INSTALLDIR)/usr/lib - cp -af --remove-destination $(BUILD_FILES) $(INSTALLDIR)/usr/sbin/ diff --git a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch index 7e005702e6a0..7e005702e6a0 100644 --- a/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20100820-gentoo.patch +++ b/sys-apps/tomoyo-tools/files/tomoyo-tools-2.3.0_p20110929-gentoo.patch |