aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlayman <layman@localhost>2013-11-22 20:08:05 +1100
committerlayman <layman@localhost>2013-11-22 20:08:05 +1100
commit2881aee2c5cae892ef137ea8ce594dc78b93bf66 (patch)
tree60d1352a48430409d9b1481ade6f29092a6cc054 /sci-libs/gsl
parentsys-cluster/charm-6.6.0_rc1: Rewrote patch to enable shared mode. (diff)
downloadsci-2881aee2c5cae892ef137ea8ce594dc78b93bf66.tar.gz
sci-2881aee2c5cae892ef137ea8ce594dc78b93bf66.tar.bz2
sci-2881aee2c5cae892ef137ea8ce594dc78b93bf66.zip
Add 1 more chunk for multifit/Makefile.am
Diffstat (limited to 'sci-libs/gsl')
-rw-r--r--sci-libs/gsl/files/gsl-1.16-cblas-external.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
index 7277aa42e..c29ef5294 100644
--- a/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
+++ b/sci-libs/gsl/files/gsl-1.16-cblas-external.patch
@@ -207,6 +207,19 @@ diff -Nur gsl-1.16.orig/Makefile.am gsl-1.16/Makefile.am
-e 's|@LIBS[@]|$(LIBS)|g' \
-e 's|@VERSION[@]|$(VERSION)|g'
+--- gsl-1.16.orig/multifit/Makefile.am 2013-07-18 06:04:26.000000000 +1000
++++ gsl-1.16/multifit/Makefile.am 2013-11-22 16:57:26.170330257 +1100
+@@ -13,8 +13,8 @@
+ TESTS = $(check_PROGRAMS)
+
+ test_SOURCES = test.c
+-test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++test_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../sort/libgslsort.la ../statistics/libgslstatistics.la ../vector/libgslvector.la ../block/libgslblock.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+
+ #demo_SOURCES = demo.c
+-#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la ../cblas/libgslcblas.la ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
++#demo_LDADD = libgslmultifit.la ../linalg/libgsllinalg.la ../permutation/libgslpermutation.la ../blas/libgslblas.la @CBLAS_LINK_LIBS@ ../matrix/libgslmatrix.la ../vector/libgslvector.la ../block/libgslblock.la ../randist/libgslrandist.la ../rng/libgslrng.la ../complex/libgslcomplex.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../utils/libutils.la ../sys/libgslsys.la
+
diff -Nur gsl-1.16.orig/multimin/Makefile.am gsl-1.16/multimin/Makefile.am
--- gsl-1.16.orig/multimin/Makefile.am 2013-07-17 13:04:26.000000000 -0700
+++ gsl-1.16/multimin/Makefile.am 2013-08-19 15:25:27.729497736 -0700