* [gentoo-commits] gentoo-x86 commit in dev-libs/igraph/files: igraph-0.6.4-unbundle.patch
@ 2013-02-21 20:18 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2013-02-21 20:18 UTC (permalink / raw
To: gentoo-commits
jlec 13/02/21 20:18:15
Added: igraph-0.6.4-unbundle.patch
Log:
dev-libs/igraph: Version Bump; unbundle correctly and use pkg-config to detect sys libs, #445114; fix tests, #421773; drop old
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Revision Changes Path
1.1 dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch?rev=1.1&content-type=text/plain
Index: igraph-0.6.4-unbundle.patch
===================================================================
configure.in | 32 ++++++++++++-------------------
examples/simple/igraph_arpack_rnsolve.out | 3 +++
examples/simple/igraph_layout_merge2.out | 20 +++++++++----------
examples/simple/igraph_sparsemat2.c | 2 +-
examples/simple/igraph_sparsemat3.c | 2 +-
examples/simple/igraph_sparsemat4.c | 2 +-
src/Makefile.am | 11 +++--------
src/sparsemat.c | 2 +-
tests/Makefile.am | 2 +-
tests/mt.at | 2 +-
tests/types.at | 2 +-
11 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/configure.in b/configure.in
index c617aec..6d5d162 100644
--- a/configure.in
+++ b/configure.in
@@ -165,7 +165,8 @@ if test "x$enable_gmp" != "xno"; then
AC_CHECK_HEADER([gmp.h], [
AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library])
gmp_support=yes
- LDFLAGS="${LDFLAGS} -lgmp"
+ GMP_LIBS="-lgmp"
+ AC_SUBST(GMP_LIBS)
])
])
fi
@@ -223,23 +224,15 @@ else
fi
if test "$internal_blas" = "no"; then
- AC_CHECK_LIB([blas], [daxpy_], [],
- AC_CHECK_LIB([blas], [daxpy], [],
- AC_CHECK_LIB([blas], [DAXPY_], [],
- AC_CHECK_LIB([blas], [DAXPY], [],
- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)]))))
- LDFLAGS="${LDFLAGS} -lblas"
+ PKG_CHECK_MODULES([BLAS],[blas])
+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}"
else
AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library])
fi
if test "$internal_lapack" = "no"; then
- AC_CHECK_LIB([lapack], [dlarnv_], [],
- AC_CHECK_LIB([lapack], [dlarnv], [],
- AC_CHECK_LIB([lapack], [DLARNV_], [],
- AC_CHECK_LIB([lapack], [DLARNV], [],
- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)]))))
- LDFLAGS="${LDFLAGS} -llapack"
+ PKG_CHECK_MODULES([LAPACK],[lapack])
+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
fi
@@ -248,16 +241,14 @@ if test "$internal_arpack" = "no"; then
if test "$tls_support" = "yes"; then
AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library])
fi
- AC_CHECK_LIB([arpack], [dsaupd_], [],
- AC_CHECK_LIB([arpack], [dsaupd], [],
- AC_CHECK_LIB([arpack], [DSAUPD_], [],
- AC_CHECK_LIB([arpack], [DSAUPD], [],
- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)]))))
- LDFLAGS="${LDFLAGS} -larpack"
+ PKG_CHECK_MODULES([ARPACK],[arpack])
+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library])
fi
+PKG_CHECK_MODULES([CS],[cxsparse])
+
glpk_support=no
if test "$internal_glpk" = "no"; then
AC_CHECK_LIB([glpk], [glp_read_mps], [
@@ -270,7 +261,8 @@ if test "$internal_glpk" = "no"; then
], [
AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library])
glpk_support=yes
- LDFLAGS="${LDFLAGS} -lglpk"
+ GLPK_LIBS="-lglpk"
+ AC_SUBST(GLPK_LIBS)
])
])
])
diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
index ec38497..47b1a6b 100644
--- a/examples/simple/igraph_arpack_rnsolve.out
+++ b/examples/simple/igraph_arpack_rnsolve.out
@@ -17,6 +17,7 @@
22.0483 0
-21.3281 0
-3.00735 -19.2957
+-3.00735 19.2957
---
0.373224 0.226696 0.204213 0.0473383
-0.289145 -0.296079 -0.0479785 0.156365
@@ -32,6 +33,7 @@
-21.3281 0
-12.4527 0
-3.00735 -19.2957
+-3.00735 19.2957
---
-0.226696 0.695866 -0.204213 -0.0473383
0.296079 0.120213 0.0479785 -0.156365
@@ -47,6 +49,7 @@
-3.00735 19.2957
-3.00735 -19.2957
12.1099 6.27293
+12.1099 -6.27293
---
0.0768616 -0.195028 -0.152389 0.21912
0.147607 0.0704569 0.346547 0.125122
diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out
index dfe2c22..9fe81bf 100644
--- a/examples/simple/igraph_layout_merge2.out
+++ b/examples/simple/igraph_layout_merge2.out
@@ -1,13 +1,13 @@
--2.73912 -2.95429
--0.479512 -4.00008
-1.96326 -3.51798
-3.65613 -1.69214
-3.95248 0.780051
-2.73912 2.95429
-0.479512 4.00008
--1.96326 3.51798
--3.65613 1.69214
--3.95248 -0.780051
+-2.55311 -3.13964
+-0.22007 -4.0407
+2.19703 -3.39835
+3.77493 -1.45795
+3.91094 1.03935
+2.55311 3.13964
+0.22007 4.0407
+-2.19703 3.39835
+-3.77493 1.45795
+-3.91094 -1.03935
-1.6061 6.30088
-4.92661 5.80435
-3.69637 8.92826
diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
index 296e52e..3abd0e3 100644
--- a/examples/simple/igraph_sparsemat2.c
+++ b/examples/simple/igraph_sparsemat2.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
#include <igraph_blas_internal.h>
diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
index 630bf1a..b23cbe1 100644
--- a/examples/simple/igraph_sparsemat3.c
+++ b/examples/simple/igraph_sparsemat3.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
index 4d85bde..7497faf 100644
--- a/examples/simple/igraph_sparsemat4.c
+++ b/examples/simple/igraph_sparsemat4.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index af7cae7..5db09eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,6 @@ AM_YFLAGS = -d
lib_LTLIBRARIES = libigraph.la
-include lapack/blas.inc
-include lapack/lapack.inc
-include lapack/arpack.inc
include plfit/plfit.inc
F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\
@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
ARPACK_LIB = libarpack.la
endif
-include ../optional/glpk/glpk.inc
-
if INTERNAL_GLPK
libglpk_la_SOURCES = $(GLPK)
libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
@@ -247,7 +242,7 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
drl_layout_3d.cpp drl_graph_3d.cpp \
DensityGrid_3d.cpp \
foreign-dl-parser.y foreign-dl-lexer.l \
- $(CS) sparsemat.c mixing.c bigint.c bignum.c \
+ sparsemat.c mixing.c bigint.c bignum.c \
version.c optimal_modularity.c \
igraph_fixed_vectorlist.c separators.c \
igraph_marked_queue.c igraph_estack.c st-cuts.c \
@@ -263,8 +258,8 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_LDFLAGS = -no-undefined
-libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PLFIT_LIB)
+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PLFIT_LIB) $(CS_LIBS)
if INTERNAL_GLPK
libigraph_la_CFLAGS += -I$(top_srcdir)/optional/glpk
diff --git a/src/sparsemat.c b/src/sparsemat.c
index 2cbdab1..b78b88d 100644
--- a/src/sparsemat.c
+++ b/src/sparsemat.c
@@ -23,7 +23,7 @@
#include "config.h"
-#include "cs/cs.h"
+#include <cs.h>
#include "igraph_sparsemat.h"
#include "igraph_error.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d0ba59..af9bca9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.in
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
} >$(srcdir)/package.m4
-EXTRA_DIST += package.m4
+#EXTRA_DIST += package.m4
TESTSUITE_AT = \
testsuite.at \
diff --git a/tests/mt.at b/tests/mt.at
index 050974a..e1496ac 100644
--- a/tests/mt.at
+++ b/tests/mt.at
@@ -29,5 +29,5 @@ AT_CLEANUP
AT_SETUP([Thread-safe ARPACK:])
AT_KEYWORDS([thread-safe ARPACK])
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
- [-lpthread])
+ [-lpthread $(pkg-config --libs arpack)])
AT_CLEANUP
diff --git a/tests/types.at b/tests/types.at
index f80a6a2..45087e8 100644
--- a/tests/types.at
+++ b/tests/types.at
@@ -133,7 +133,7 @@ AT_CLEANUP
AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ])
AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
- [], [INTERNAL], [-lblas])
+ [], [INTERNAL], [$(pkg-config --libs blas)])
AT_CLEANUP
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/igraph/files: igraph-0.6.4-unbundle.patch
@ 2013-02-27 17:01 Justin Lecher (jlec)
0 siblings, 0 replies; 3+ messages in thread
From: Justin Lecher (jlec) @ 2013-02-27 17:01 UTC (permalink / raw
To: gentoo-commits
jlec 13/02/27 17:01:13
Modified: igraph-0.6.4-unbundle.patch
Log:
dev-libs/igraph: Use detected pkg-config instead of generic
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)
Revision Changes Path
1.2 dev-libs/igraph/files/igraph-0.6.4-unbundle.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch?r1=1.1&r2=1.2
Index: igraph-0.6.4-unbundle.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/igraph/files/igraph-0.6.4-unbundle.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- igraph-0.6.4-unbundle.patch 21 Feb 2013 20:18:15 -0000 1.1
+++ igraph-0.6.4-unbundle.patch 27 Feb 2013 17:01:13 -0000 1.2
@@ -257,7 +257,7 @@
AT_KEYWORDS([thread-safe ARPACK])
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
- [-lpthread])
-+ [-lpthread $(pkg-config --libs arpack)])
++ [-lpthread $(${PKG_CONFIG} --libs arpack)])
AT_CLEANUP
diff --git a/tests/types.at b/tests/types.at
index f80a6a2..45087e8 100644
@@ -268,7 +268,7 @@
AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
- [], [INTERNAL], [-lblas])
-+ [], [INTERNAL], [$(pkg-config --libs blas)])
++ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
AT_CLEANUP
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/igraph/files: igraph-0.6.4-unbundle.patch
@ 2014-06-26 13:57 Michael Palimaka (kensington)
0 siblings, 0 replies; 3+ messages in thread
From: Michael Palimaka (kensington) @ 2014-06-26 13:57 UTC (permalink / raw
To: gentoo-commits
kensington 14/06/26 13:57:11
Removed: igraph-0.6.4-unbundle.patch
Log:
Remove old.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-26 13:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-26 13:57 [gentoo-commits] gentoo-x86 commit in dev-libs/igraph/files: igraph-0.6.4-unbundle.patch Michael Palimaka (kensington)
-- strict thread matches above, loose matches on Subject: below --
2013-02-27 17:01 Justin Lecher (jlec)
2013-02-21 20:18 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox