Blame SOURCES/glibc-rh730379.patch

b9ba6d
2011-08-17  Ulrich Drepper  <drepper@gmail.com>
b9ba6d
b9ba6d
	* Makeconfig (override CFLAGS): Add library-specific CFLAGS.
b9ba6d
	* resolv/Makefile: Define CFLAGS-libresolv.
b9ba6d
b9ba6d
Index: glibc-2.12-2-gc4ccff1/Makeconfig
b9ba6d
===================================================================
b9ba6d
--- glibc-2.12-2-gc4ccff1.orig/Makeconfig
b9ba6d
+++ glibc-2.12-2-gc4ccff1/Makeconfig
b9ba6d
@@ -700,7 +700,9 @@ CPPFLAGS = $($(subdir)-CPPFLAGS) $(+incl
b9ba6d
 override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
b9ba6d
 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
b9ba6d
 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(
b9ba6d
-		  $(CFLAGS-$(@F))
b9ba6d
+		  $(CFLAGS-$(@F)) \
b9ba6d
+		  $(foreach lib,$(libof-$(basename $(@F))) \
b9ba6d
+				$(libof-$(
b9ba6d
 override CXXFLAGS = $(c++-sysincludes) \
b9ba6d
 		    $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
b9ba6d
 		    $(CFLAGS-$(suffix $@)) $(CFLAGS-$(
b9ba6d
Index: glibc-2.12-2-gc4ccff1/resolv/Makefile
b9ba6d
===================================================================
b9ba6d
--- glibc-2.12-2-gc4ccff1.orig/resolv/Makefile
b9ba6d
+++ glibc-2.12-2-gc4ccff1/resolv/Makefile
b9ba6d
@@ -76,6 +76,9 @@ CPPFLAGS += -Dgethostbyname=res_gethostb
b9ba6d
 	    -Dgetnetbyname=res_getnetbyname \
b9ba6d
 	    -Dgetnetbyaddr=res_getnetbyaddr
b9ba6d
 
b9ba6d
+ifeq (yes,$(have-ssp))
b9ba6d
+CFLAGS-libresolv += -fstack-protector
b9ba6d
+endif
b9ba6d
 CFLAGS-res_hconf.c = -fexceptions
b9ba6d
 CFLAGS-res_send.c += -fno-strict-aliasing
b9ba6d