[cminpack] fix build on non-x86 64-bit arches

Dan Horák sharkcz at fedoraproject.org
Tue Oct 25 14:32:54 UTC 2011


commit 78cb68bf649fcd1ffac650c9d12cf55ffd4ed5a3
Author: Dan Horák <dan at danny.cz>
Date:   Tue Oct 25 16:32:51 2011 +0200

    fix build on non-x86 64-bit arches

 cminpack-1.1.3-64bit.patch |   18 ++++++++++++++++++
 cminpack.spec              |    7 ++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/cminpack-1.1.3-64bit.patch b/cminpack-1.1.3-64bit.patch
new file mode 100644
index 0000000..e52d1c3
--- /dev/null
+++ b/cminpack-1.1.3-64bit.patch
@@ -0,0 +1,18 @@
+diff -up cminpack-1.1.3/cmake/cminpack_utils.cmake.64bit cminpack-1.1.3/cmake/cminpack_utils.cmake
+--- cminpack-1.1.3/cmake/cminpack_utils.cmake.64bit	2011-10-25 16:20:16.000000000 +0200
++++ cminpack-1.1.3/cmake/cminpack_utils.cmake	2011-10-25 16:20:41.000000000 +0200
+@@ -5,13 +5,8 @@ macro(GET_OS_INFO)
+         set(OS_WIN TRUE)
+     endif(WIN32)
+ 
+-    set(CMINPACK_LIB_INSTALL_DIR "lib")
++    set(CMINPACK_LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+     if(OS_LINUX)
+-        if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-            set(CMINPACK_LIB_INSTALL_DIR "lib64")
+-        else(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+-            set(CMINPACK_LIB_INSTALL_DIR "lib")
+-        endif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+         message (STATUS "Operating system is Linux")
+     elseif(OS_BSD)
+         message (STATUS "Operating system is BSD")
diff --git a/cminpack.spec b/cminpack.spec
index 557cf18..528a64c 100644
--- a/cminpack.spec
+++ b/cminpack.spec
@@ -1,12 +1,13 @@
 Name:           cminpack
 Version:        1.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Solver for nonlinear equations and nonlinear least squares problems
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://devernay.free.fr/hacks/cminpack/cminpack.html
 Source0:        http://devernay.free.fr/hacks/cminpack/%{name}-%{version}.tar.gz
+Patch0:         %{name}-1.1.3-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -28,6 +29,7 @@ cminpack.
 
 %prep
 %setup -q
+%patch0 -p1 -b .64bit
 
 %build
 mkdir build
@@ -63,6 +65,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Oct 25 2011 Dan Horák <dan[at]danny.cz> - 1.1.3-2
+- fix build on non-x86 64-bit arches
+
 * Wed Mar 23 2011 - Rich Mattes <richmattes at gmail.com> - 1.1.3-1
 - Upgrade to vesion 1.1.3
 


More information about the scm-commits mailing list