diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-04-21 06:38:32 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-04-21 06:38:32 +0000 |
| commit | 22dcd296a138e16a911f0f27c7584a1decee36e0 (patch) | |
| tree | 09872bfac5034e1a0a9c01db353c3638b4c81941 /sci-libs/libcmatrix/files | |
| parent | Remove the blocker on test-unit since tests now work with it installed. (diff) | |
| download | historical-22dcd296a138e16a911f0f27c7584a1decee36e0.tar.gz historical-22dcd296a138e16a911f0f27c7584a1decee36e0.tar.bz2 historical-22dcd296a138e16a911f0f27c7584a1decee36e0.zip | |
Correct linking against bicatalis new atlas version
Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/libcmatrix/files')
| -rw-r--r-- | sci-libs/libcmatrix/files/3.2.1-atlas.patch | 33 | ||||
| -rw-r--r-- | sci-libs/libcmatrix/files/3.2.1-shared.patch | 8 |
2 files changed, 37 insertions, 4 deletions
diff --git a/sci-libs/libcmatrix/files/3.2.1-atlas.patch b/sci-libs/libcmatrix/files/3.2.1-atlas.patch new file mode 100644 index 000000000000..b10b41d4e389 --- /dev/null +++ b/sci-libs/libcmatrix/files/3.2.1-atlas.patch @@ -0,0 +1,33 @@ + configure-libraries.ac | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/configure-libraries.ac b/configure-libraries.ac +index a64e79c..afc75b8 100755 +--- a/configure-libraries.ac ++++ b/configure-libraries.ac +@@ -33,6 +33,7 @@ AC_ARG_WITH(atlas, + AS_HELP_STRING([--with-atlas],[use the ATLAS BLAS library (default-use if found)]),,with_atlas=check) + if test x$with_atlas != xno; then + FOUNDATLAS=yes ++ PKG_CHECK_MODULES([ATLAS], [cblas]) + AC_CHECK_HEADERS(cblas.h,,FOUNDATLAS=no + AC_MSG_WARN([ATLAS header files (cblas.h) not found + Is CPPFLAGS is defined to include relevant directory?])) +@@ -40,7 +41,7 @@ Is CPPFLAGS is defined to include relevant directory?])) + AC_MSG_WARN([ATLAS library (libatlas.a) not found + Is LDFLAGS is defined to include relevant directory?])) + if test x$FOUNDATLAS = xyes; then +- LIBS="-lcblas $LIBS" ++ LIBS="$ATLAS_LIBS $LIBS" + CXXFLAGS="$CXXFLAGS -DLCM_USE_EXTERNAL" + else + if test x$with_atlas = xyes; then +@@ -49,6 +50,8 @@ Is LDFLAGS is defined to include relevant directory?])) + fi + fi + ++AC_SUBST(ATLAS_LIBS) ++ + AC_ARG_WITH(acml, + AS_HELP_STRING([--with-acml],[use the ACML BLAS library (default=no)]),,with_acml=no) + if test x$with_acml = xyes; then diff --git a/sci-libs/libcmatrix/files/3.2.1-shared.patch b/sci-libs/libcmatrix/files/3.2.1-shared.patch index 9ab453d98b17..4e843027abde 100644 --- a/sci-libs/libcmatrix/files/3.2.1-shared.patch +++ b/sci-libs/libcmatrix/files/3.2.1-shared.patch @@ -46,22 +46,22 @@ index 1361371..1448e76 100755 - chmod a+rx $@ - $(RANLIB) $@ +lib/libcmatrix.so.3.2.1: $(ALLNORMOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) ++ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLNORMOBJS) @ATLAS_LIBS@ + ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so.3 + ln -sf libcmatrix.so.3.2.1 lib/libcmatrix.so + +lib/libcmatrix_p.so.3.2.1: $(ALLPROFOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) ++ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLPROFOBJS) @ATLAS_LIBS@ + ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so.3 + ln -sf libcmatrix_p.so.3.2.1 lib/libcmatrix_p.so + +lib/libcmatrix-g.so.3.2.1: $(ALLGOBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) ++ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLGOBJS) @ATLAS_LIBS@ + ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so.3 + ln -sf libcmatrix-g.so.3.2.1 lib/libcmatrix-g.so + +lib/libcmatrix.so_r.3.2.1: $(ALLTHROBJS) -+ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) ++ $(CXX) $(LDFLAGS) -fPIC -shared -Wl,--soname,libcmatrix.so.3 -o $@ $(ALLTHROBJS) @ATLAS_LIBS@ + ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so.3 + ln -sf libcmatrix_r.so.3.2.1 lib/libcmatrix_r.so |