[redhat-lsb/f16] Resolves:rh#738256:- redhat-lsb fails to build on ARM

[pnemade]

commit 8992e4db5220c1a299b337366a8927e0741fd45a
Author: Parag Nemade <pnemade at redhat.com>
Date:   Wed Nov 30 15:33:27 2011 +0530

    Resolves:rh#738256:- redhat-lsb fails to build on ARM

 redhat-lsb-trigger.patch |   38 +++++++++++++++++++++++++++++---------
 redhat-lsb.spec          |    9 +++++++--
 2 files changed, 36 insertions(+), 11 deletions(-)
---
diff --git a/redhat-lsb-trigger.patch b/redhat-lsb-trigger.patch
index 9ed3786..c2bab3c 100644
--- a/redhat-lsb-trigger.patch
+++ b/redhat-lsb-trigger.patch
@@ -1,6 +1,6 @@
---- redhat_lsb_trigger.c.jj	2008-04-16 19:50:14.000000000 +0200
-+++ redhat_lsb_trigger.c	2009-10-26 19:51:12.886058784 +0100
-@@ -423,10 +423,76 @@ is_ia64 (void)
+--- redhat_lsb_trigger.c.triggerfix	2008-04-16 18:50:14.000000000 +0100
++++ redhat_lsb_trigger.c	2011-09-14 11:50:42.563080000 +0100
+@@ -423,10 +423,76 @@
  #define is_ia64() 0
  #endif
  
@@ -79,10 +79,18 @@
    INTERNAL_SYSCALL_DECL (err);
    char lsbsover[] = LSBSOVER;
    char *LSBVER, *p = lsbsover;
-@@ -455,11 +521,18 @@ void __libc_csu_fini (void) { }
+@@ -450,15 +516,38 @@
+ int __libc_multiple_threads __attribute__((nocommon));
+ int __libc_enable_asynccancel (void) { return 0; }
+ void __libc_disable_asynccancel (int x) { }
++#ifndef __arm__
+ void __libc_csu_init (void) { }
+ void __libc_csu_fini (void) { }
++#endif
  pid_t __fork (void) { return -1; }
  char thr_buf[65536];
  
+-#ifndef __powerpc__
 +void
 +__attribute__ ((noreturn))
 +__stack_chk_fail (void)
@@ -92,16 +100,28 @@
 +    INTERNAL_SYSCALL (exit, err, 1, 1);
 +}
 +
- #ifndef __powerpc__
++#if defined __powerpc__
++
++struct startup_info
++{
++  void *sda_base;
++  int (*main) (int, char **, char **, void *);
++  int (*init) (int, char **, char **, void *);
++  void (*fini) (void);
++};
++
++int __libc_start_main (int argc, char **argv, char **ev,
++		       void *auxvec, void (*rtld_fini) (void),
++		       struct startup_info *stinfo,
++		       char **stack_on_entry)
++#elif defined __arm__
  
 -/* /usr/lib/gcc/ppc64-redhat-linux/4.1.2/../../../../lib64/libc.a(libc-start.o): In function `__libc_start_main':
 - *  * (.opd+0x10): multiple definition of `__libc_start_main'  */
--int ___libc_start_main (int (*main) (int argc, char **argv),
-+int __libc_start_main (int (*main) (int argc, char **argv),
+ int ___libc_start_main (int (*main) (int argc, char **argv),
                         int argc, char **argv,
  		       void (*init) (void), void (*fini) (void),
- 		       void (*rtld_fini) (void), void * stack_end)
-@@ -472,9 +545,7 @@ struct startup_info
+@@ -472,9 +561,7 @@
    void (*fini) (void);
  };
  
diff --git a/redhat-lsb.spec b/redhat-lsb.spec
index f0d97a2..0c3704b 100644
--- a/redhat-lsb.spec
+++ b/redhat-lsb.spec
@@ -49,13 +49,14 @@
 Summary: LSB base libraries support for Red Hat Enterprise Linux
 Name: redhat-lsb
 Version: 4.0
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 URL: http://www.linuxfoundation.org/collaborate/workgroups/lsb
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 #Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{upstreamlsbrelver}.tar.gz
 Patch0: lsb-release-3.1-update-init-functions.patch
 Patch1: redhat-lsb-lsb_start_daemon-fix.patch
 Patch2: redhat-lsb-trigger.patch
+Patch3: redhat-lsb-arm.patch
 License: GPLv2
 Group: System Environment/Base
 BuildRequires: glibc-static
@@ -86,7 +87,7 @@ Provides: lsb = %{version}
 Provides: lsb-core-%{archname} = %{version}
 Provides: lsb-core-noarch = %{version}
 
-ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x
+ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x  %{arm}
 
 %ifarch %{ix86}
 # archLSB IA32 Base Libraries
@@ -617,6 +618,7 @@ The Linux Standard Base (LSB) Printing Specifications define components that are
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0 -b .triggerfix
+%patch3 -p1 -b .arm
 
 %build
 cd lsb-release-%{upstreamlsbrelver}
@@ -727,6 +729,9 @@ fi
 
 
 %changelog
+* Wed Nov 30 2011 Parag <pnemade AT redhat DOT com> - 4.0-7.1
+- Resolves:rh#738256:- redhat-lsb fails to build on ARM
+
 * Wed Oct 12 2011 Parag <pnemade AT redhat DOT com> - 4.0-7
 - Resolves:rh#654689,rh#736822
 - Added dependencies for perl-Locale-Codes and perl-Class-ISA