diff options
author | 2010-08-28 17:47:57 +0200 | |
---|---|---|
committer | 2010-09-14 23:30:37 +0200 | |
commit | 306a0f6648be74eba596bce29d56aef06c412cf4 (patch) | |
tree | 635a8a696559a55da72bf5950e66cee19f6e026b | |
parent | fix repoman warnings (diff) | |
download | sci-306a0f6648be74eba596bce29d56aef06c412cf4.tar.gz sci-306a0f6648be74eba596bce29d56aef06c412cf4.tar.bz2 sci-306a0f6648be74eba596bce29d56aef06c412cf4.zip |
[sci-libs/clapack] Switch to cmake-based build system. Create install target and cmake export file. Build and run tests conditionally. Use f2c symbol prefix.
(Portage version: 2.1.8.3/git/Linux x86_64)
(Signed Manifest commit)
-rw-r--r-- | sci-libs/clapack/ChangeLog | 35 | ||||
-rw-r--r-- | sci-libs/clapack/Manifest | 25 | ||||
-rw-r--r-- | sci-libs/clapack/clapack-3.2.1-r3.ebuild | 34 | ||||
-rw-r--r-- | sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch | 189 | ||||
-rw-r--r-- | sci-libs/clapack/metadata.xml | 8 |
5 files changed, 291 insertions, 0 deletions
diff --git a/sci-libs/clapack/ChangeLog b/sci-libs/clapack/ChangeLog new file mode 100644 index 000000000..4dab0df86 --- /dev/null +++ b/sci-libs/clapack/ChangeLog @@ -0,0 +1,35 @@ +# ChangeLog for sci-libs/clapack +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/ChangeLog,v 1.5 2010/04/25 11:32:11 jlec Exp $ + +*clapack-3.2.1-r3 (28 Aug 2010) + + 28 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> + +clapack-3.2.1-r3.ebuild, +files/clapack-3.2.1-noblasf2c.patch, + +metadata.xml: + Switch to cmake-based build system. Create install target and cmake export + file. Build and run tests conditionally. Use f2c symbol prefix. + +*clapack-3.2.1-r2 (25 Apr 2010) + + 25 Apr 2010; Justin Lecher <jlec@gentoo.org> -clapack-3.2.1.ebuild, + -clapack-3.2.1-r1.ebuild, +clapack-3.2.1-r2.ebuild: + header move, #316769 + + 31 Mar 2010; Justin Lecher <jlec@gentoo.org> clapack-3.2.1.ebuild, + clapack-3.2.1-r1.ebuild: + [static] -> [statis-libs], as consequence of #312465 + +*clapack-3.2.1-r1 (18 Mar 2010) + + 18 Mar 2010; Justin Lecher <jlec@gentoo.org> + +files/3.2.1-solib.patch, clapack-3.2.1.ebuild, +clapack-3.2.1-r1.ebuild: + We are linking shared libs now + +*clapack-3.2.1 (04 Mar 2010) + + 04 Mar 2010; Justin Lecher <jlec@gentoo.org> + +clapack-3.2.1.ebuild, +metadata.xml: + New ebuild, imported from sci on request 206934 + + diff --git a/sci-libs/clapack/Manifest b/sci-libs/clapack/Manifest new file mode 100644 index 000000000..182157443 --- /dev/null +++ b/sci-libs/clapack/Manifest @@ -0,0 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX clapack-3.2.1-noblasf2c.patch 5839 RMD160 d30ff26a4ac811442d37af80bc6335f942b80505 SHA1 b16b68b076927299c32ec85d74790259d8ffb81f SHA256 cd1807a0d61a1dc51f0ef7d1e46c50c84a60f846ec6dfab380dc568e247ecc07 +DIST clapack-3.2.1-CMAKE.tgz 6017667 RMD160 42af2b40a78b0cc4020a961a2fe0faf73c20560c SHA1 5ea1bcc4314e392bca8b9e5f61d44355cf9f4cc1 SHA256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a +EBUILD clapack-3.2.1-r3.ebuild 813 RMD160 f5a883581aec697fd1be56f6901959901fd3165a SHA1 6d139b5d97027606bc7bd7993e649d23d5030f99 SHA256 727c732b73e96986bf5f8c6622911320a4a60ae6e2c246b564f30b0e071e463e +MISC ChangeLog 1221 RMD160 f964eaa9528ccc7068a00d7c79f184ae028c393d SHA1 de79944ab1e7b651baf9d14c2a6b112d9eaf6b91 SHA256 2e610e05192b45788cd93080d938293ed76c31db054b7befeb3fc0ad935b92ed +MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQIcBAEBAgAGBQJMeS+tAAoJENwGBM22xffetX0P/1/qUiButa61llMUpRC4bI3Z +mKPyeG6lulMQ+iItcS1KNFrgz0sZ41AyDoLmda1DEm9YBrTjtNzGfDWGlYE0C7Zx +CPGBhVHktT8NAL5n4CtF8pEuILGm7YHFnRByVDyq2eWwgm8batDIhlmCXckXguOU +04flqKveN6KckuCZgSI4jmrX2GcH1bY3Z0hHU6u/T4a82kXbTRNd/HbzLh2RwhQn +1IwR2LI53eTgJlPA0+VeXnIfypCroAPdLYm/kC7zOgKfKeiQefeSjLX8/Bog+zq4 +E4dYM5ZUzSK32S8J6AJkkn/uuqRAr682VRcMNp31+l8lCI8ShzUE66KGrQiAMFMp +bMRc3MA60EN1DhSZao0hJD+ZjaKzChfjrszZZ3DO6SYHm7D5UY8DA+7ZWpt/t5qt ++IKVSoYEXl6lPgvxrcYWpFwBRzxFONP1x73INouWbXe/fwijpX+tJoYr3Z8wIl9g ++U8GVOaWbQM3vjtPg+Eb/5/4FZdZsxIwAVUkDDlyWTdeLbkr2lv/TuHX+tqRdCxp +q+KXwuRdLMkjvuVCLbbtmmPnzX+rmtHiz6H4YZmAy2XKMD3mHHO9VS41UzVidTTu +uHIv/6FE2oKtooB1jvTFa22mxbQGTu7fogP2hJHsuuQrO6Q4j2+XOSj2x+kNHVn/ +Rxr1M4Gl2Nx2Hi5zcAbA +=mFcO +-----END PGP SIGNATURE----- diff --git a/sci-libs/clapack/clapack-3.2.1-r3.ebuild b/sci-libs/clapack/clapack-3.2.1-r3.ebuild new file mode 100644 index 000000000..363d9486f --- /dev/null +++ b/sci-libs/clapack/clapack-3.2.1-r3.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r2.ebuild,v 1.1 2010/04/25 09:40:16 jlec Exp $ + +EAPI="3" + +inherit eutils multilib toolchain-funcs versionator cmake-utils + +DESCRIPTION="f2c'ed version of LAPACK" +HOMEPAGE="http://www.netlib.org/clapack/" +SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-libs/libf2c-20081126[static-libs]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/clapack-${PV}-CMAKE + +src_prepare() { + epatch "${FILESDIR}"/${P}-noblasf2c.patch + + sed \ + -e 's:"f2c.h":<f2c.h>:g' \ + -i SRC/*.c || die +} + +src_configure() { + mycmakeargs=( $(cmake-utils_use_enable test TESTS) ) + cmake-utils_src_configure +} diff --git a/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch new file mode 100644 index 000000000..53e358991 --- /dev/null +++ b/sci-libs/clapack/files/clapack-3.2.1-noblasf2c.patch @@ -0,0 +1,189 @@ +diff -u -r -N clapack-3.2.1-CMAKE.orig/CMakeLists.txt clapack-3.2.1-CMAKE/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/CMakeLists.txt 2009-08-10 20:46:33.000000000 +0200 ++++ clapack-3.2.1-CMAKE/CMakeLists.txt 2010-08-28 14:04:30.000000000 +0200 +@@ -1,7 +1,10 @@ + cmake_minimum_required(VERSION 2.6) + project(CLAPACK C) +-enable_testing() +-include(CTest) ++ ++if(ENABLE_TESTS) ++ enable_testing() ++ include(CTest) ++endif(ENABLE_TESTS) + + if(WIN32 AND NOT CYGWIN) + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/winsecond.c) +@@ -11,24 +14,34 @@ + set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) + set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) + endif() +-enable_testing() ++ + option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) + if(NOT USE_BLAS_WRAP) + # _zrotg_ seems to be missing in the wrap header + add_definitions(-DNO_BLAS_WRAP) + endif() ++ + include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) +-add_subdirectory(F2CLIBS) +-add_subdirectory(BLAS) +-add_subdirectory(SRC) +-add_subdirectory(TESTING) ++ + set(CLAPACK_VERSION 3.2.1) + set(CPACK_PACKAGE_VERSION_MAJOR 3) + set(CPACK_PACKAGE_VERSION_MINOR 2) + set(CPACK_PACKAGE_VERSION_PATCH 1) ++ ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") ++ ++add_subdirectory(SRC) ++ ++if(ENABLE_TESTS) ++ add_subdirectory(TESTING) ++endif(ENABLE_TESTS) ++ + include(CPack) +-export(TARGETS f2c blas lapack FILE clapack-targets.cmake) ++ ++export(TARGETS clapack FILE clapack-targets.cmake) ++ + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in + ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY) + configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in + ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY) ++ +diff -u -r -N clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt clapack-3.2.1-CMAKE/SRC/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/SRC/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 ++++ clapack-3.2.1-CMAKE/SRC/CMakeLists.txt 2010-08-28 14:32:17.000000000 +0200 +@@ -375,6 +375,20 @@ + if(BUILD_COMPLEX16) + set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX}) + endif() +-add_library(lapack ${ALLOBJ} ${ALLXOBJ}) +-target_link_libraries(lapack blas) + ++add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ}) ++target_link_libraries(clapack blas f2c) ++set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}") ++ ++install( ++ TARGETS clapack EXPORT clapack ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++) ++ ++install( ++ FILES ../INCLUDE/clapack.h DESTINATION include/clapack ++) ++ ++install( ++ EXPORT clapack DESTINATION "share/cmake/Modules" FILE clapack-config.cmake ++) +diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/TESTING/EIG/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/EIG/CMakeLists.txt 2010-08-28 13:46:40.000000000 +0200 +@@ -119,7 +119,7 @@ + + macro(add_eig_executable name ) + add_executable(${name} ${ARGN}) +- target_link_libraries(${name} tmglib lapack ) ++ target_link_libraries(${name} tmglib clapack ) + endmacro(add_eig_executable) + + add_eig_executable(xeigtsts ${SEIGTST} ${SCIGTST} ${AEIGTST} +diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/TESTING/LIN/CMakeLists.txt 2009-08-10 20:06:06.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/LIN/CMakeLists.txt 2010-08-28 13:46:40.000000000 +0200 +@@ -189,7 +189,7 @@ + + macro(add_lin_executable name ) + add_executable(${name} ${ARGN}) +- target_link_libraries(${name} tmglib lapack) ++ target_link_libraries(${name} tmglib clapack) + endmacro(add_lin_executable) + + add_lin_executable(xlintsts ${ALINTST} ${SCLNTST} ${SLINTST} +diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt +--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/CMakeLists.txt 2009-08-10 19:47:54.000000000 +0200 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/CMakeLists.txt 2010-08-28 13:46:40.000000000 +0200 +@@ -65,5 +65,6 @@ + if(BUILD_COMPLEX16) + set(ALLOBJ $(ZMATGEN) $(DZATGEN)) + endif() +-add_library(tmglib ${ALLOBJ} ) ++ ++add_library(tmglib ${ALLOBJ} i_len_trim.c i_ceiling.c ) + +diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c +--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_ceiling.c 1970-01-01 01:00:00.000000000 +0100 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_ceiling.c 2010-08-28 13:46:40.000000000 +0200 +@@ -0,0 +1,38 @@ ++/* file has been copied from the included f2c library - dilfridge */ ++ ++#include <f2c.h> ++ ++#ifdef KR_headers ++integer i_sceiling(x) real *x; ++#else ++#ifdef __cplusplus ++extern "C" { ++#endif ++integer i_sceiling(real *x) ++#endif ++{ ++#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x))) ++ ++ return (integer) CEIL(*x); ++} ++#ifdef __cplusplus ++} ++#endif ++ ++ ++#ifdef KR_headers ++integer i_dceiling(x) doublereal *x; ++#else ++#ifdef __cplusplus ++extern "C" { ++#endif ++integer i_dceiling(doublereal *x) ++#endif ++{ ++#define CEIL(x) ((int)(x) + ((x) > 0 && (x) != (int)(x))) ++ ++ return (integer) CEIL(*x); ++} ++#ifdef __cplusplus ++} ++#endif +diff -u -r -N clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c +--- clapack-3.2.1-CMAKE.orig/TESTING/MATGEN/i_len_trim.c 1970-01-01 01:00:00.000000000 +0100 ++++ clapack-3.2.1-CMAKE/TESTING/MATGEN/i_len_trim.c 2010-08-28 13:46:40.000000000 +0200 +@@ -0,0 +1,25 @@ ++/* file has been copied from the included f2c library - dilfridge */ ++ ++#include <f2c.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#ifdef KR_headers ++integer i_len_trim(s, n) char *s; ftnlen n; ++#else ++integer i_len_trim(char *s, ftnlen n) ++#endif ++{ ++ int i; ++ ++ for(i=n-1;i>=0;i--) ++ if(s[i] != ' ') ++ return i + 1; ++ ++ return(0); ++} ++#ifdef __cplusplus ++} ++#endif diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml new file mode 100644 index 000000000..efb490d78 --- /dev/null +++ b/sci-libs/clapack/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>sci</herd> +<maintainer> + <email>sci@gentoo.org</email> +</maintainer> +</pkgmetadata> |