[meego-commits] 5984: Changes to Trunk/lzo

[Anas Nashif]

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

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5984:

  submit:   Trunk/lzo(r4) -> Trunk/lzo


Message:
    Move to Trunk

State:   new          2010-07-25T23:54:19 nashif
Comment: None



changes files:
--------------
--- lzo.changes
+++ lzo.changes
@@ -0,0 +1,3 @@
+* Wed Jun 30 2010 Austin Zhang <austin.zhang at intel.com> - 2.03
+- Fixed building optimization issue derived from compiler update
+

spec files:
-----------
--- lzo.spec
+++ lzo.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.13~pre
+# spectacle version 0.17
 # 
 # >> macros
 # << macros
@@ -15,11 +15,8 @@
 Source0:    http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
 Source100:  lzo.yaml
 Patch0:     lzo-2.02-configure.patch
-Requires(post):  /sbin/ldconfig
-Requires(postun):  /sbin/ldconfig
 BuildRequires:  zlib-devel
 
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
 LZO is a portable lossless data compression library written in ANSI C.
@@ -34,8 +31,6 @@
 Summary:    Mini version of lzo for apps which don't need the full version
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires(post):  /sbin/ldconfig
-Requires(postun):  /sbin/ldconfig
 
 %description minilzo
 A small (mini) version of lzo for embedding into applications which don't need
@@ -57,6 +52,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+
+# lzo-2.02-configure.patch
 %patch0 -p1
 # >> setup
 # << setup
@@ -67,14 +64,15 @@
 
 %configure --disable-static \
     --disable-dependency-tracking \
-    --enable-shared
+    --enable-shared \
+    CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
 
-# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post
 # build minilzo too (bz 439979)
-gcc %{optflags} -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
+#gcc %{optflags} -O2 -g -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
+gcc -O2 -g -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
 gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
 # << build post
 %install
@@ -89,14 +87,9 @@
 install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo
 # << install post
 %check
-# >> check_scriptlets
+# >> check
 make check test
-# << check_scriptlets
-
-%clean
-rm -rf %{buildroot}
-
-
+# << check
 
 %post -p /sbin/ldconfig
 
@@ -106,7 +99,6 @@
 
 %postun minilzo -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 # >> files

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

++++++ lzo.yaml
--- lzo.yaml
+++ lzo.yaml
@@ -22,6 +22,7 @@
 ConfigOptions:
     - --disable-dependency-tracking
     - --enable-shared
+    - CFLAGS="`echo $CFLAGS | sed 's/-O2//g'`"
 Builder: make
 NeedCheckSection: True
 SubPackages: