diff options
| author |   Naohiro Aota <naota@gentoo.org> | 2011-09-29 21:48:41 +0000 |
|---|---|---|
| committer | Naohiro Aota <naota@gentoo.org> | 2011-09-29 21:48:41 +0000 |
| commit | 3177ae952741e87dca6860f05f7e26b31769c3fd (patch) | |
| tree | 7782d67c3b59d2e6511c53048dbdae3d1f93ecf1 /sys-apps/ccs-tools/files | |
| parent | masked version bump for ebuild testing (diff) | |
| download | gentoo-2-3177ae952741e87dca6860f05f7e26b31769c3fd.tar.gz gentoo-2-3177ae952741e87dca6860f05f7e26b31769c3fd.tar.bz2 gentoo-2-3177ae952741e87dca6860f05f7e26b31769c3fd.zip | |
Clean up sed; Respect LDFLAGS; Deal with --as-needed. Patch-By: thomasq Bug #364921
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/ccs-tools/files')
| -rw-r--r-- | sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch | 11 | ||||
| -rw-r--r-- | sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch | 52 |
2 files changed, 63 insertions, 0 deletions
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch new file mode 100644 index 000000000000..8dcc9295beec --- /dev/null +++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch @@ -0,0 +1,11 @@ +--- trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile 2011/08/20 04:19:39 5357 ++++ trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile 2011/09/28 08:53:43 5494 +@@ -19,7 +19,7 @@ + ln -sf libccstools.so.2.0.2 libccstools.so + + .c: +- $(CC) $(CFLAGS) -o $@ -lccstools -L. $< ++ $(CC) $(CFLAGS) -o $@ $< -lccstools -L. + + ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so + $(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch new file mode 100644 index 000000000000..947cce65eb2d --- /dev/null +++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch @@ -0,0 +1,52 @@ +diff --git a/sbin/Makefile b/sbin/Makefile +index cc61f13..3bdb292 100644 +--- a/sbin/Makefile ++++ b/sbin/Makefile +@@ -9,7 +9,7 @@ install: all + $(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR) + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_lib_ccs/Makefile b/usr_lib_ccs/Makefile +index 8181201..bee5eae 100644 +--- a/usr_lib_ccs/Makefile ++++ b/usr_lib_ccs/Makefile +@@ -11,7 +11,7 @@ install: all + $(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/ + + .c: +- $(CC) $(CFLAGS) -o $@ $< ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< + + clean: + rm -f -- $(BUILD_FILES) +diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile +index 6dff8c7..f324c79 100644 +--- a/usr_sbin/Makefile ++++ b/usr_sbin/Makefile +@@ -15,17 +15,17 @@ + sleep 10 + + libccstools.so: ccstools.c ccstools.h +- $(CC) $(CFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2 ++ $(CC) $(CFLAGS) $(LDFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2 + ln -sf libccstools.so.1.0.2 libccstools.so + + .c: +- $(CC) $(CFLAGS) -o $@ $< -lccstools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. + + ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so +- $(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON + + ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so +- $(CC) $(CFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. ++ $(CC) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L. + + install: all + mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR) |