Permalink
Browse files

Disable shared libs for now

  • Loading branch information...
1 parent 5957e11 commit 5f0d5a1033ece3bda58850df803f7bca15e27802 outpaddling committed Nov 12, 2012
Showing with 26 additions and 49 deletions.
  1. +22 −14 suitesparse/Makefile
  2. +1 −32 suitesparse/PLIST
  3. +3 −3 suitesparse/distinfo
View
@@ -1,8 +1,10 @@
# $NetBSD$
# FreeBSD Id: ports/math/suitesparse/Makefile,v 1.38 2011/07/20 16:17:35 bf Exp
-DISTNAME= SuiteSparse-3.6.1
-PKGNAME= suitesparse-3.6.1
+# DISTNAME= SuiteSparse-3.6.1
+# PKGNAME= suitesparse-3.6.1
+DISTNAME= SuiteSparse-4.0.2
+PKGNAME= suitesparse-4.0.2
CATEGORIES= math
MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/
@@ -33,17 +35,17 @@ PICFLAG?= -fpic
BLAS= -lblas
LAPACK= -llapack
-# USE_TOOLS+=gsed causes this on CentOS 6.3:
# /home/bacon/Pkgsrc/pkgsrc-1/mk/pkgformat/pkg/list-dependencies: line 52: -e: command not found
# Problem is ${SED} is empty
-USE_TOOLS+= gmake gsed
# TOOLS_PLATFORM.gsed= #empty
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake gsed
USE_LANGUAGES= c c++ fortran77
WRKSRC=${WRKDIR}/SuiteSparse
-WRKSRC_SHARED=${WRKSRC}_shared
+# Creating shared libs for all platforms is complicated. Putting this off
+# for now.
+# WRKSRC_SHARED=${WRKSRC}_shared
SVERSION=1
.if defined (WITH_METIS)
@@ -54,7 +56,8 @@ CHOLMOD_CONFIG =
CHOLMOD_CONFIG = -DNPARTITION
.endif
-AUTO_MKDIRS= yes
+AUTO_MKDIRS= yes
+INSTALLATION_DIRS= include/suitesparse lib
post-patch:
${FIND} ${WRKSRC} -type f \( -name 'Makefile' -o -name '*.mk' \) \
@@ -78,8 +81,9 @@ post-patch:
do-build:
cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \
${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS}
- cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
- ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS}
+
+# cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \
+# ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS}
# OS X ld does not support -Bshareable or --whole-archive
# Find a portable way to add sonames
@@ -94,14 +98,18 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${DESTDIR}${PREFIX}/include/suitesparse
.endfor
(cd ${DESTDIR}${PREFIX}/include && ${LN} -sf suitesparse ufsparse)
- ${INSTALL_DATA} ${WRKSRC}/UFconfig/*.h ${DESTDIR}${PREFIX}/include/suitesparse
${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${DESTDIR}${PREFIX}/include/suitesparse
- for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
- ${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \
- $${i%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib ; \
- j=$${i##*/} ; ${LN} -sf $${j%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib/$${j%.a}.so ; \
+ for i in `find ${WRKSRC} -type f -name '*.a'` ; do \
+ ${INSTALL_DATA} $${i} ${DESTDIR}${PREFIX}/lib ; \
done
+# Shared libs
+# for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \
+# ${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \
+# $${i%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib ; \
+# j=$${i##*/} ; ${LN} -sf $${j%.a}.so.${SVERSION} ${DESTDIR}${PREFIX}/lib/$${j%.a}.so ; \
+# done
+
.include "../../math/blas/buildlink3.mk"
.include "../../math/lapack/buildlink3.mk"
.if defined (WITH_METIS)
View
@@ -29,7 +29,6 @@ include/suitesparse/spqr.hpp
include/suitesparse/SuiteSparseQR_C.h
include/suitesparse/SuiteSparseQR_definitions.h
include/suitesparse/SuiteSparseQR.hpp
-include/suitesparse/UFconfig.h
include/suitesparse/umfpack_col_to_triplet.h
include/suitesparse/umfpack_defaults.h
include/suitesparse/umfpack_free_numeric.h
@@ -65,47 +64,17 @@ include/suitesparse/umfpack_triplet_to_col.h
include/suitesparse/umfpack_wsolve.h
include/ufsparse
lib/libamd.a
-lib/libamd.so
-lib/libamd.so.1
lib/libbtf.a
-lib/libbtf.so
-lib/libbtf.so.1
lib/libcamd.a
-lib/libcamd.so
-lib/libcamd.so.1
lib/libccolamd.a
-lib/libccolamd.so
-lib/libccolamd.so.1
lib/libcerbla.a
-lib/libcerbla.so
-lib/libcerbla.so.1
lib/libcholmod.a
-lib/libcholmod.so
-lib/libcholmod.so.1
lib/libcolamd.a
-lib/libcolamd.so
-lib/libcolamd.so.1
lib/libcsparse.a
-lib/libcsparse.so
-lib/libcsparse.so.1
lib/libcxsparse.a
-lib/libcxsparse.so
-lib/libcxsparse.so.1
lib/libklu.a
-lib/libklu.so
-lib/libklu.so.1
lib/libldl.a
-lib/libldl.so
-lib/libldl.so.1
lib/librbio.a
-lib/librbio.so
-lib/librbio.so.1
lib/libspqr.a
-lib/libspqr.so
-lib/libspqr.so.1
-lib/libufconfig.a
-lib/libufconfig.so
-lib/libufconfig.so.1
+lib/libsuitesparseconfig.a
lib/libumfpack.a
-lib/libumfpack.so
-lib/libumfpack.so.1
@@ -1,7 +1,7 @@
$NetBSD$
-SHA1 (SuiteSparse-3.6.1.tar.gz) = c5ef9a518c2915585bc00097c49326fc62679251
-RMD160 (SuiteSparse-3.6.1.tar.gz) = b96c7c8921f231cfb6af831d5d9a1fb3b4f0afab
-Size (SuiteSparse-3.6.1.tar.gz) = 13043105 bytes
+SHA1 (SuiteSparse-4.0.2.tar.gz) = 46b24a28eef4b040ea5a02d2c43e82e28b7d6195
+RMD160 (SuiteSparse-4.0.2.tar.gz) = 69b7becaba2cd26edc13d182bf59a8d6ac38b90b
+Size (SuiteSparse-4.0.2.tar.gz) = 22421100 bytes
SHA1 (patch-SPQR_Source_spqr__factorize.cpp) = bbd599ef35d7c321a13c33bf5bcb49ffed3c5abb
SHA1 (patch-UFconfig-UFconfig.mk) = e0f1c891f145e13af73331892ce24dea3cd267e9

0 comments on commit 5f0d5a1

Please sign in to comment.