[meego-commits] 7298: Changes to Trunk/orc

[Peter Zhu]

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

Thank You,
Peter Zhu

[This message was auto-generated]

---

Request #7298:

  submit:   Trunk:Testing/orc(r2) -> Trunk/orc


Message:
    Move to Trunk

State:   new          2010-09-03T02:31:42 peter
Comment: None



changes files:
--------------
--- orc.changes
+++ orc.changes
@@ -0,0 +1,4 @@
+* Tue Aug 10 2010 Carsten Munk <carsten at maemo.org> - 0.4.5
+- Fix ARM build error (hardcoded cross compiler)
+- Disable tests for ARM as NEON isn't properly supported in QEMU target.
+

new:
----
  orc-0.4.5-arm-build-failure.patch

spec files:
-----------
--- orc.spec
+++ orc.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
 # 
 # >> macros
 # << macros
@@ -14,6 +14,7 @@
 URL:        http://code.entropywave.com/projects/orc/
 Source0:    http://code.entropywave.com/download/orc/orc-%{version}.tar.gz
 Source100:  orc.yaml
+Patch0:     orc-0.4.5-arm-build-failure.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(gtk-doc)
@@ -65,6 +66,8 @@
 %setup -q -n %{name}-%{version}
 autoreconf -vif
 
+# orc-0.4.5-arm-build-failure.patch
+%patch0 -p1
 # >> setup
 # << setup
 
@@ -84,7 +87,6 @@
 # >> install pre
 # << install pre
 make install DESTDIR=%{buildroot} INSTALL="install -p"
-
 # >> install post
 
 # Remove unneeded files.
@@ -100,7 +102,9 @@
 # << install post
 %check
 # >> check
+%ifnarch %{arm}
 make check
+%endif
 # << check
 
 

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

++++++ orc-0.4.5-arm-build-failure.patch (new)
--- orc-0.4.5-arm-build-failure.patch
+++ orc-0.4.5-arm-build-failure.patch
+diff -ru orc-0.4.5-old/orc-test/orctest.c orc-0.4.5/orc-test/orctest.c
+--- orc-0.4.5-old/orc-test/orctest.c	2010-06-07 21:59:01.000000000 -0400
++++ orc-0.4.5/orc-test/orctest.c	2010-08-10 02:27:01.000000000 -0400
+@@ -146,7 +146,7 @@
+ }
+ 
+ 
+-#define PREFIX "/opt/arm-2008q3/bin/arm-none-linux-gnueabi-"
++#define PREFIX ""
+ 
+ OrcTestResult
+ orc_test_gcc_compile_neon (OrcProgram *p)

++++++ orc.yaml
--- orc.yaml
+++ orc.yaml
@@ -7,6 +7,8 @@
 URL: http://code.entropywave.com/projects/orc/
 Sources:
     - http://code.entropywave.com/download/orc/orc-%{version}.tar.gz
+Patches:
+    - orc-0.4.5-arm-build-failure.patch
 Description: |
     Orc is a library and set of tools for compiling and executing
     very simple programs that operate on arrays of data.  The "language"