[m4ri] New upstream version. Install the pkgconfig file, but remove the libm requirement.
Jerry James
jjames at fedoraproject.org
Mon Oct 10 18:08:13 UTC 2011
commit 90c62217839e162fc6b6eaac0ce894283764a832
Author: Jerry James <loganjerry at gmail.com>
Date: Mon Oct 10 12:07:53 2011 -0600
New upstream version.
Install the pkgconfig file, but remove the libm requirement.
.gitignore | 2 +-
m4ri-no-sse3.patch | 40 ++++++++++++++++++++--------------------
m4ri.spec | 18 ++++++++++++++++--
sources | 2 +-
4 files changed, 38 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 871567f..861a9fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/m4ri-20110715.tar.gz
+/m4ri-20111004.tar.gz
diff --git a/m4ri-no-sse3.patch b/m4ri-no-sse3.patch
index df32c70..11e376e 100644
--- a/m4ri-no-sse3.patch
+++ b/m4ri-no-sse3.patch
@@ -1,17 +1,17 @@
---- ./Makefile.am.orig 2011-07-11 08:18:19.000000000 -0600
-+++ ./Makefile.am 2011-07-21 09:23:11.038954507 -0600
-@@ -14,7 +14,7 @@
+--- ./Makefile.am.orig 2011-10-04 04:44:26.000000000 -0600
++++ ./Makefile.am 2011-10-10 11:26:42.184200763 -0600
+@@ -17,7 +17,7 @@ pkgconfig_DATA = m4ri.pc
#libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20110715 -no-undefined
+ libm4ri_la_LDFLAGS = -release 0.0.20111004 -no-undefined
-libm4ri_la_LIBADD = -lm
+libm4ri_la_LIBADD = -lgomp
check_PROGRAMS=test_multiplication test_elimination test_trsm test_pls test_solve test_kernel test_random test_smallops test_transpose test_colswap
test_multiplication_SOURCES=testsuite/test_multiplication.c
---- ./m4/ax_ext.m4.orig 2011-07-11 08:18:19.000000000 -0600
-+++ ./m4/ax_ext.m4 2011-07-21 09:23:11.038954507 -0600
-@@ -65,21 +65,8 @@
+--- ./m4/ax_ext.m4.orig 2011-10-04 04:44:26.000000000 -0600
++++ ./m4/ax_ext.m4 2011-10-10 11:27:32.240152635 -0600
+@@ -65,21 +65,8 @@ AC_DEFUN([AX_EXT],
fi
])
@@ -35,8 +35,8 @@
if test "$ax_cv_have_mmx_ext" = yes; then
AC_DEFINE(HAVE_MMX,,[Support mmx instructions])
---- ./m4/ax_func_posix_memalign.m4.orig 2011-07-11 08:18:19.000000000 -0600
-+++ ./m4/ax_func_posix_memalign.m4 2011-07-21 09:23:11.038954507 -0600
+--- ./m4/ax_func_posix_memalign.m4.orig 2011-10-04 04:44:26.000000000 -0600
++++ ./m4/ax_func_posix_memalign.m4 2011-10-10 11:28:15.792109593 -0600
@@ -27,18 +27,15 @@
AC_DEFUN([AX_FUNC_POSIX_MEMALIGN],
[AC_CACHE_CHECK([for working posix_memalign],
@@ -59,9 +59,9 @@
],
[ax_cv_func_posix_memalign_works=yes],
[ax_cv_func_posix_memalign_works=no],
---- ./configure.ac.orig 2011-07-11 08:18:19.000000000 -0600
-+++ ./configure.ac 2011-07-21 09:23:11.039954472 -0600
-@@ -17,7 +17,7 @@
+--- ./configure.ac.orig 2011-10-04 04:44:26.000000000 -0600
++++ ./configure.ac 2011-10-10 11:28:32.672092626 -0600
+@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O.
AM_PROG_CC_C_O
@@ -70,9 +70,9 @@
AC_PROG_INSTALL
---- ./configure.orig 2011-07-11 08:18:25.000000000 -0600
-+++ ./configure 2011-07-21 09:23:35.012992883 -0600
-@@ -11913,35 +11913,8 @@
+--- ./configure.orig 2011-10-04 04:44:33.000000000 -0600
++++ ./configure 2011-10-10 11:28:53.815090706 -0600
+@@ -11913,35 +11913,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_sse2_ext" >&5
$as_echo "$ax_cv_have_sse2_ext" >&6; }
@@ -110,7 +110,7 @@
if test "$ax_cv_have_mmx_ext" = yes; then
-@@ -12180,11 +12153,15 @@
+@@ -12181,11 +12154,15 @@ else
int
main ()
{
@@ -126,12 +126,12 @@
}
_ACEOF
---- ./Makefile.in.orig 2011-07-11 08:18:26.000000000 -0600
-+++ ./Makefile.in 2011-07-21 09:23:35.882956640 -0600
-@@ -352,7 +352,7 @@
+--- ./Makefile.in.orig 2011-10-04 04:44:34.000000000 -0600
++++ ./Makefile.in 2011-10-10 11:28:54.758092014 -0600
+@@ -357,7 +357,7 @@ pkgconfig_DATA = m4ri.pc
#libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20110715 -no-undefined
+ libm4ri_la_LDFLAGS = -release 0.0.20111004 -no-undefined
-libm4ri_la_LIBADD = -lm
+libm4ri_la_LIBADD = -lgomp
test_multiplication_SOURCES = testsuite/test_multiplication.c
diff --git a/m4ri.spec b/m4ri.spec
index c98962e..b4f6bb3 100644
--- a/m4ri.spec
+++ b/m4ri.spec
@@ -1,5 +1,5 @@
Name: m4ri
-Version: 20110715
+Version: 20111004
Release: 1%{?dist}
Summary: Linear Algebra over F_2
Group: Development/Libraries
@@ -46,6 +46,12 @@ The %{name}-static package contains the static %{name} library.
%setup -q
%patch0
+# Remove an unnecessary direct library dependency from the pkgconfig file
+sed -i -e "s/ -lm//" m4ri.pc.in
+
+# Fix a couple of broken doxygen commands
+sed -i -e "s/\\\\output/\\\\return/" -e "s/\\\\seealso/\\\\see/" src/misc.h
+
%build
%ifarch %ix86
@@ -55,7 +61,10 @@ sed -e 's/^#undef HAVE_MMX/#define HAVE_MMX/' \
-e 's/^#undef HAVE_SSE$/#define HAVE_SSE/' \
-e 's/^#undef HAVE_SSE2/#define HAVE_SSE2/' \
-i src/config.h
-sed -i 's/^SIMD_FLAGS =.*/SIMD_FLAGS = -mmmx -msse -msse2/' Makefile
+sed -e 's/^#define __M4RI_HAVE_SSE2.*/#define __M4RI_HAVE_SSE2 1/' \
+ -e 's/^#define __M4RI_SIMD_CFLAGS/#define __M4RI_SIMD_CFLAGS " -mmmx -msse -msse2"/' \
+ -i src/m4ri_config.h
+sed -i 's/^SIMD_CFLAGS =.*/SIMD_CFLAGS = -mmmx -msse -msse2/' Makefile
%else
%configure --enable-openmp
%endif
@@ -121,6 +130,7 @@ make check
%doc doc/html
%{_includedir}/%{name}
%{_libdir}/lib%{name}.so
+%{_libdir}/pkgconfig/%{name}.pc
%files static
@@ -128,6 +138,10 @@ make check
%changelog
+* Mon Oct 10 2011 Jerry James <loganjerry at gmail.com> - 20111004-1
+- New upstream version
+- Install the pkgconfig file, but remove the libm requirement
+
* Thu Jul 21 2011 Jerry James <loganjerry at gmail.com> - 20110715-1
- New upstream version
- Preserve timestamps on modified header files
diff --git a/sources b/sources
index bc420f9..83ee43b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6cbb2a89aeb6f124006cf2b17f91e93d m4ri-20110715.tar.gz
+44bdb0b2eed5c24bea05ebeec252b7c3 m4ri-20111004.tar.gz
More information about the scm-commits
mailing list