[gentoo-commits] gentoo-x86 commit in sys-apps/ccs-tools/files: ccs-tools-1.8.0_p20110214-as-needed.patch ccs-tools-1.8.0_p20110214-ldflags.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/ccs-tools/files: ccs-tools-1.8.0_p20110214-as-needed.patch ccs-tools-1.8.0_p20110214-ldflags.patch

[Naohiro Aota (naota)]

naota       11/09/29 21:48:41

  Added:                ccs-tools-1.8.0_p20110214-as-needed.patch
                        ccs-tools-1.8.0_p20110214-ldflags.patch
  Log:
  Clean up sed; Respect LDFLAGS; Deal with --as-needed. Patch-By: thomasq Bug #364921
  
  (Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch

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
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

Index: ccs-tools-1.8.0_p20110214-as-needed.patch
===================================================================
--- 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



1.1                  sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch

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
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

Index: ccs-tools-1.8.0_p20110214-ldflags.patch
===================================================================
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)