[meego-commits] 5938: Changes to Trunk/meego-lsb

[Anas Nashif]

Hi,
I have made the following changes to meego-lsb in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5938:

  submit:   Trunk:Testing/meego-lsb(r3) -> Trunk/meego-lsb


Message:
    Move to Trunk

State:   new          2010-07-22T07:54:22 nashif
Comment: None



changes files:
--------------
--- meego-lsb.changes
+++ meego-lsb.changes
@@ -0,0 +1,3 @@
+* Thu Jul 22 2010 Yu <yu.a.wang at intel.com> - 4.0
+- Add an patch to fix multiple definition building error
+

new:
----
  fix-building-error.patch

spec files:
-----------
--- meego-lsb.spec
+++ meego-lsb.spec
@@ -54,6 +54,7 @@
 Source0: %{name}-%{version}-%{srcrelease}.tar.bz2
 Source1: lsb-release-%{upstreamlsbrelver}.tar.gz
 Patch0: lsb-release.patch
+Patch1: fix-building-error.patch
 License: GPLv2
 Group: System/Base
 BuildRoot: %{_tmppath}/%{name}-root
@@ -347,6 +348,7 @@
 %prep
 %setup -q -a 1
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd lsb-release-%{upstreamlsbrelver}

other changes:
--------------

++++++ fix-building-error.patch (new)
--- fix-building-error.patch
+++ fix-building-error.patch
+--- meego-lsb-4.0/meego_lsb_trigger.c	2009-01-17 07:43:55.000000000 +0800
++++ meego-lsb-4/meego_lsb_trigger.c	2010-07-22 10:24:47.970424597 +0800
+@@ -450,8 +450,8 @@
+ int __libc_multiple_threads __attribute__((nocommon));
+ int __libc_enable_asynccancel (void) { return 0; }
+ void __libc_disable_asynccancel (int x) { }
+-void __libc_csu_init (void) { }
+-void __libc_csu_fini (void) { }
++/* void __libc_csu_init (void) { } */
++/* void __libc_csu_fini (void) { } */
+ pid_t __fork (void) { return -1; }
+ char thr_buf[65536];
+