rpms/kernel-xen-2.6/devel xen-build-id.patch,1.1.2.1,1.1.2.2

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27573

Modified Files:
      Tag: private-ehabkost-debuginfo-branch
	xen-build-id.patch 
Log Message:
Fix xen-build-id.patch to use CC exit code instead of CC output

On Rawhide, the --build-id check command emits a warning:

  $ gcc -Wl,--build-id -nostdlib -o /dev/null -xc /dev/null
  /usr/bin/ld: warning: cannot find entry symbol _start; defaulting to 000000000040010c

Therefore, we can't just check for empty output. Changing the ld-option
function to check the command exit code instead.


xen-build-id.patch:

Index: xen-build-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/xen-build-id.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- xen-build-id.patch	22 Oct 2007 20:06:09 -0000	1.1.2.1
+++ xen-build-id.patch	23 Oct 2007 12:53:41 -0000	1.1.2.2
@@ -1,20 +1,24 @@
---- xen-3.1.0-src/Config.mk.~1~
-+++ xen-3.1.0-src/Config.mk
+Index: xen-3.1.0-rc7-7041b52471c3/Config.mk
+===================================================================
+--- xen-3.1.0-rc7-7041b52471c3.orig/Config.mk
++++ xen-3.1.0-rc7-7041b52471c3/Config.mk
 @@ -52,6 +52,12 @@ define cc-ver-check-closure
      endif
  endef
  
 +# ld-option: Check if linker supports first option, else fall back to second.
 +# Usage: LDFLAGS_DIRECT += $(call ld-option,$(CC),--build-id,)
-+ld-option = $(shell if test -z "`$(1) -Wl,$(2) -nostdlib -o /dev/null -xc \
-+              /dev/null 2>&1`"; then echo "$(2)"; else echo "$(3)"; fi ;)
++ld-option = $(shell if $(1) -Wl,$(2) -nostdlib -o /dev/null -xc \
++              /dev/null 2>&1 >/dev/null; then echo "$(2)"; else echo "$(3)"; fi ;)
 +
 +
  ifneq ($(debug),y)
  CFLAGS += -DNDEBUG
  else
---- xen-3.1.0-src/xen/Rules.mk.~1~
-+++ xen-3.1.0-src/xen/Rules.mk
+Index: xen-3.1.0-rc7-7041b52471c3/xen/Rules.mk
+===================================================================
+--- xen-3.1.0-rc7-7041b52471c3.orig/xen/Rules.mk
++++ xen-3.1.0-rc7-7041b52471c3/xen/Rules.mk
 @@ -72,6 +72,9 @@ CFLAGS   := $(strip $(CFLAGS) $(CFLAGS-y
  AFLAGS   := $(strip $(AFLAGS) $(AFLAGS-y))
  AFLAGS   += $(patsubst -std=gnu%,,$(CFLAGS))