[meego-packaging] [meego-commits] 15584: Changes to Trunk:Testing/clucene

[Zhu, Peter J]

Did you know which packages are using clucene? Nothing has build dependency or runtime dependency on this

Peter

> -----Original Message-----
> From: meego-commits-bounces at meego.com
> [mailto:meego-commits-bounces at meego.com] On Behalf Of Carsten V. Munk
> Sent: Friday, April 01, 2011 4:35 PM
> To: meego-commits at meego.com
> Subject: [meego-commits] 15584: Changes to Trunk:Testing/clucene
> 
> Hi,
> I have made the following changes to clucene in project Trunk:Testing. Please
> review and accept ASAP.
> 
> Thank You,
> Carsten V. Munk
> 
> [This message was auto-generated]
> 
> ---
> 
> Request #15584:
> 
>   submit:   home:cvm:branches:clucene/clucene(r12)(update) ->
> Trunk:Testing/clucene
> 
> 
> Message:
>      Fix BMC#15123 - Clucene fails to build for ARM after RunFast was
> enabled - tests fail.
>   Clucene test suite requires IEEE compliance for floating port, enabled this for
> ARM VFP
>   systems. Disable test suite for armv7l due to fix not working there (possible
> qemu bug).
>   Works on armv7hl/armv8el.
> 
> 
> State:   new          2011-04-01T01:34:44 cvm
> Comment: None
> 
> 
> 
> changes files:
> --------------
> --- clucene.changes
> +++ clucene.changes
> @@ -0,0 +1,6 @@
> +* Fri Apr 1 2011 Carsten Munk <carsten at maemo.org> - 0.9.21
> +- Fix BMC#15123 - Clucene fails to build for ARM after RunFast was enabled -
> tests fail.
> +  Clucene test suite requires IEEE compliance for floating port, enabled this
> for ARM VFP
> +  systems. Disable test suite for armv7l due to fix not working there (possible
> qemu bug).
> +  Works on armv7hl/armv8el.
> +
> 
> new:
> ----
>   clucene-0.9.21-arm-runfast-fix.patch
> 
> spec files:
> -----------
> --- clucene.spec
> +++ clucene.spec
> @@ -6,6 +6,7 @@
>  Group:		Development/System
>  URL:		http://www.sourceforge.net/projects/clucene
>  Source0:
> 	http://downloads.sourceforge.net/clucene/clucene-core-%{version}.tar.bz
> 2
> +Patch0:		clucene-0.9.21-arm-runfast-fix.patch
>  BuildRequires:	automake gawk
> 
>  %description
> @@ -35,6 +36,7 @@
> 
>  %prep
>  %setup -q -c -a 0
> +%patch0 -p0
> 
>  %build
>  pushd %{name}-core-%{version}
> @@ -60,7 +62,8 @@
> 
>  # Run the tests
>  ## It currently fails 2 tests for ppc64 builds, upstream is looking into it.
> -%ifnarch ppc64
> +## Currently fails two tests for armv7l but not in armv7hl.
> +%ifnarch ppc64 armv7el armv7l
>  %check
>  pushd %{name}-core-%{version}
>  make check
> 
> other changes:
> --------------
> 
> ++++++ clucene-0.9.21-arm-runfast-fix.patch (new)
> --- clucene-0.9.21-arm-runfast-fix.patch
> +++ clucene-0.9.21-arm-runfast-fix.patch
> +diff -ru clucene-core-0.9.21/test/testall.cpp
> clucene-core-0.9.21-runfast-fix/test/testall.cpp
> +--- clucene-core-0.9.21/test/testall.cpp	2008-08-22 10:40:11.000000000
> -0400
> ++++ clucene-core-0.9.21-runfast-fix/test/testall.cpp	2011-04-01
> 04:05:36.000000000 -0400
> +@@ -13,6 +13,10 @@
> + 	#include <crtdbg.h>
> + #endif
> + #endif
> ++
> ++#ifdef __ARM_PCS_VFP
> ++#include <fpu_control.h>
> ++#endif
> + char* cl_tempDir;
> + bool cl_quiet;
> + char clucene_data_location[1024];
> +@@ -35,6 +39,9 @@
> + 	bool times = false;
> + 	uint64_t startTime=0;
> +
> ++#ifdef __ARM_PCS_VFP
> ++	_FPU_SETCW(_FPU_IEEE);
> ++#endif
> + 	cl_tempDir = NULL;
> + 	if ( Misc::dir_Exists("/tmp") )
> + 		cl_tempDir = "/tmp";
> 
> _______________________________________________
> MeeGo-commits mailing list
> MeeGo-commits at meego.com
> http://lists.meego.com/listinfo/meego-commits