| 1 |
mrueg 14/06/26 14:04:57 |
| 2 |
|
| 3 |
Added: igraph-0.7.1-unbundle.patch |
| 4 |
Log: |
| 5 |
Version bump. Tests still fail. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key ) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/igraph/files/igraph-0.7.1-unbundle.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/igraph/files/igraph-0.7.1-unbundle.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: igraph-0.7.1-unbundle.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/configure.ac b/configure.ac |
| 18 |
index acf76cd..a9db7bd 100644 |
| 19 |
--- a/configure.ac |
| 20 |
+++ b/configure.ac |
| 21 |
@@ -167,7 +167,8 @@ if test "x$enable_gmp" != "xno"; then |
| 22 |
AC_CHECK_HEADER([gmp.h], [ |
| 23 |
AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library]) |
| 24 |
gmp_support=yes |
| 25 |
- LDFLAGS="${LDFLAGS} -lgmp" |
| 26 |
+ GMP_LIBS="-lgmp" |
| 27 |
+ AC_SUBST(GMP_LIBS) |
| 28 |
PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lgmp" |
| 29 |
]) |
| 30 |
]) |
| 31 |
@@ -231,24 +232,16 @@ else |
| 32 |
fi |
| 33 |
|
| 34 |
if test "$internal_blas" = "no"; then |
| 35 |
- AC_CHECK_LIB([blas], [daxpy_], [], |
| 36 |
- AC_CHECK_LIB([blas], [daxpy], [], |
| 37 |
- AC_CHECK_LIB([blas], [DAXPY_], [], |
| 38 |
- AC_CHECK_LIB([blas], [DAXPY], [], |
| 39 |
- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)])))) |
| 40 |
- LDFLAGS="${LDFLAGS} -lblas" |
| 41 |
+ PKG_CHECK_MODULES([BLAS],[blas]) |
| 42 |
+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}" |
| 43 |
PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lblas" |
| 44 |
else |
| 45 |
AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library]) |
| 46 |
fi |
| 47 |
|
| 48 |
if test "$internal_lapack" = "no"; then |
| 49 |
- AC_CHECK_LIB([lapack], [dlarnv_], [], |
| 50 |
- AC_CHECK_LIB([lapack], [dlarnv], [], |
| 51 |
- AC_CHECK_LIB([lapack], [DLARNV_], [], |
| 52 |
- AC_CHECK_LIB([lapack], [DLARNV], [], |
| 53 |
- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)])))) |
| 54 |
- LDFLAGS="${LDFLAGS} -llapack" |
| 55 |
+ PKG_CHECK_MODULES([LAPACK],[lapack]) |
| 56 |
+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}" |
| 57 |
PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -llapack" |
| 58 |
else |
| 59 |
AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library]) |
| 60 |
@@ -258,17 +251,15 @@ if test "$internal_arpack" = "no"; then |
| 61 |
if test "$tls_support" = "yes"; then |
| 62 |
AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library]) |
| 63 |
fi |
| 64 |
- AC_CHECK_LIB([arpack], [dsaupd_], [], |
| 65 |
- AC_CHECK_LIB([arpack], [dsaupd], [], |
| 66 |
- AC_CHECK_LIB([arpack], [DSAUPD_], [], |
| 67 |
- AC_CHECK_LIB([arpack], [DSAUPD], [], |
| 68 |
- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)])))) |
| 69 |
- LDFLAGS="${LDFLAGS} -larpack" |
| 70 |
+ PKG_CHECK_MODULES([ARPACK],[arpack]) |
| 71 |
+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}" |
| 72 |
PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -larpack" |
| 73 |
else |
| 74 |
AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library]) |
| 75 |
fi |
| 76 |
|
| 77 |
+PKG_CHECK_MODULES([CS],[cxsparse]) |
| 78 |
+ |
| 79 |
glpk_support=no |
| 80 |
AC_ARG_ENABLE(glpk, AC_HELP_STRING([--disable-glpk], [Compile without the GLPK library])) |
| 81 |
if test "x$enable_glpk" != "xno"; then |
| 82 |
@@ -283,7 +274,8 @@ if test "x$enable_glpk" != "xno"; then |
| 83 |
], [ |
| 84 |
AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library]) |
| 85 |
glpk_support=yes |
| 86 |
- LDFLAGS="${LDFLAGS} -lglpk" |
| 87 |
+ GLPK_LIBS="-lglpk" |
| 88 |
+ AC_SUBST(GLPK_LIBS) |
| 89 |
PKGCONFIG_LIBS_PRIVATE="${PKGCONFIG_LIBS_PRIVATE} -lglpk" |
| 90 |
]) |
| 91 |
]) |
| 92 |
diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out |
| 93 |
index ec38497..6603034 100644 |
| 94 |
--- a/examples/simple/igraph_arpack_rnsolve.out |
| 95 |
+++ b/examples/simple/igraph_arpack_rnsolve.out |
| 96 |
@@ -16,7 +16,7 @@ |
| 97 |
--- |
| 98 |
22.0483 0 |
| 99 |
-21.3281 0 |
| 100 |
--3.00735 -19.2957 |
| 101 |
+-3.00735 19.2957 |
| 102 |
--- |
| 103 |
0.373224 0.226696 0.204213 0.0473383 |
| 104 |
-0.289145 -0.296079 -0.0479785 0.156365 |
| 105 |
@@ -31,7 +31,7 @@ |
| 106 |
--- |
| 107 |
-21.3281 0 |
| 108 |
-12.4527 0 |
| 109 |
--3.00735 -19.2957 |
| 110 |
+-3.00735 19.2957 |
| 111 |
--- |
| 112 |
-0.226696 0.695866 -0.204213 -0.0473383 |
| 113 |
0.296079 0.120213 0.0479785 -0.156365 |
| 114 |
@@ -46,7 +46,7 @@ |
| 115 |
--- |
| 116 |
-3.00735 19.2957 |
| 117 |
-3.00735 -19.2957 |
| 118 |
-12.1099 6.27293 |
| 119 |
+12.1099 -6.27293 |
| 120 |
--- |
| 121 |
0.0768616 -0.195028 -0.152389 0.21912 |
| 122 |
0.147607 0.0704569 0.346547 0.125122 |
| 123 |
diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out |
| 124 |
index dfe2c22..9fe81bf 100644 |
| 125 |
--- a/examples/simple/igraph_layout_merge2.out |
| 126 |
+++ b/examples/simple/igraph_layout_merge2.out |
| 127 |
@@ -1,13 +1,13 @@ |
| 128 |
--2.73912 -2.95429 |
| 129 |
--0.479512 -4.00008 |
| 130 |
-1.96326 -3.51798 |
| 131 |
-3.65613 -1.69214 |
| 132 |
-3.95248 0.780051 |
| 133 |
-2.73912 2.95429 |
| 134 |
-0.479512 4.00008 |
| 135 |
--1.96326 3.51798 |
| 136 |
--3.65613 1.69214 |
| 137 |
--3.95248 -0.780051 |
| 138 |
+-2.55311 -3.13964 |
| 139 |
+-0.22007 -4.0407 |
| 140 |
+2.19703 -3.39835 |
| 141 |
+3.77493 -1.45795 |
| 142 |
+3.91094 1.03935 |
| 143 |
+2.55311 3.13964 |
| 144 |
+0.22007 4.0407 |
| 145 |
+-2.19703 3.39835 |
| 146 |
+-3.77493 1.45795 |
| 147 |
+-3.91094 -1.03935 |
| 148 |
-1.6061 6.30088 |
| 149 |
-4.92661 5.80435 |
| 150 |
-3.69637 8.92826 |
| 151 |
diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c |
| 152 |
index c39d0e5..fdfd264 100644 |
| 153 |
--- a/examples/simple/igraph_sparsemat2.c |
| 154 |
+++ b/examples/simple/igraph_sparsemat2.c |
| 155 |
@@ -21,7 +21,7 @@ |
| 156 |
|
| 157 |
*/ |
| 158 |
|
| 159 |
-#include <cs/cs.h> |
| 160 |
+#include <cs.h> |
| 161 |
#include <igraph.h> |
| 162 |
#include <igraph_sparsemat.h> |
| 163 |
#include <igraph_blas_internal.h> |
| 164 |
diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c |
| 165 |
index 630bf1a..b23cbe1 100644 |
| 166 |
--- a/examples/simple/igraph_sparsemat3.c |
| 167 |
+++ b/examples/simple/igraph_sparsemat3.c |
| 168 |
@@ -21,7 +21,7 @@ |
| 169 |
|
| 170 |
*/ |
| 171 |
|
| 172 |
-#include <cs/cs.h> |
| 173 |
+#include <cs.h> |
| 174 |
#include <igraph.h> |
| 175 |
#include <igraph_sparsemat.h> |
| 176 |
|
| 177 |
diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c |
| 178 |
index 4d85bde..7497faf 100644 |
| 179 |
--- a/examples/simple/igraph_sparsemat4.c |
| 180 |
+++ b/examples/simple/igraph_sparsemat4.c |
| 181 |
@@ -21,7 +21,7 @@ |
| 182 |
|
| 183 |
*/ |
| 184 |
|
| 185 |
-#include <cs/cs.h> |
| 186 |
+#include <cs.h> |
| 187 |
#include <igraph.h> |
| 188 |
#include <igraph_sparsemat.h> |
| 189 |
|
| 190 |
diff --git a/src/Makefile.am b/src/Makefile.am |
| 191 |
index e7085c5..194f4a0 100644 |
| 192 |
--- a/src/Makefile.am |
| 193 |
+++ b/src/Makefile.am |
| 194 |
@@ -9,9 +9,6 @@ AM_YFLAGS = -d |
| 195 |
|
| 196 |
lib_LTLIBRARIES = libigraph.la |
| 197 |
|
| 198 |
-include lapack/blas.inc |
| 199 |
-include lapack/lapack.inc |
| 200 |
-include lapack/arpack.inc |
| 201 |
include plfit/plfit.inc |
| 202 |
|
| 203 |
F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\ |
| 204 |
@@ -99,8 +96,6 @@ if INTERNAL_ARPACK |
| 205 |
ARPACK_LIB = libarpack.la |
| 206 |
endif |
| 207 |
|
| 208 |
-include ../optional/glpk/glpk.inc |
| 209 |
- |
| 210 |
if INTERNAL_GLPK |
| 211 |
libglpk_la_SOURCES = $(GLPK) |
| 212 |
libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk |
| 213 |
@@ -255,7 +250,7 @@ SOURCES = basic_query.c games.c cocitation.c iterators.c \ |
| 214 |
drl_layout_3d.cpp drl_graph_3d.cpp \ |
| 215 |
DensityGrid_3d.cpp \ |
| 216 |
foreign-dl-parser.y foreign-dl-lexer.l \ |
| 217 |
- $(CS) sparsemat.c mixing.c bigint.c bignum.c \ |
| 218 |
+ sparsemat.c mixing.c bigint.c bignum.c \ |
| 219 |
version.c optimal_modularity.c \ |
| 220 |
igraph_fixed_vectorlist.c separators.c \ |
| 221 |
igraph_marked_queue.c igraph_estack.c st-cuts.c \ |
| 222 |
@@ -274,8 +269,8 @@ libigraph_la_SOURCES = $(SOURCES) $(HEADERS_PRIVATE) |
| 223 |
libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) |
| 224 |
libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS) |
| 225 |
libigraph_la_LDFLAGS = -no-undefined |
| 226 |
-libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \ |
| 227 |
- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PRPACK_LIB) \ |
| 228 |
+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \ |
| 229 |
+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PRPACK_LIB) $(CS_LIBS) \ |
| 230 |
$(PLFIT_LIB) |
| 231 |
|
| 232 |
if INTERNAL_GLPK |
| 233 |
diff --git a/src/sparsemat.c b/src/sparsemat.c |
| 234 |
index f96d022..6990c91 100644 |
| 235 |
--- a/src/sparsemat.c |
| 236 |
+++ b/src/sparsemat.c |
| 237 |
@@ -23,7 +23,7 @@ |
| 238 |
|
| 239 |
#include "config.h" |
| 240 |
|
| 241 |
-#include "cs/cs.h" |
| 242 |
+#include "cs.h" |
| 243 |
|
| 244 |
#include "igraph_sparsemat.h" |
| 245 |
#include "igraph_error.h" |
| 246 |
diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 247 |
index 6da83b2..c0b82d6 100644 |
| 248 |
--- a/tests/Makefile.am |
| 249 |
+++ b/tests/Makefile.am |
| 250 |
@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac |
| 251 |
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ |
| 252 |
} >$(srcdir)/package.m4 |
| 253 |
|
| 254 |
-EXTRA_DIST += package.m4 |
| 255 |
+#EXTRA_DIST += package.m4 |
| 256 |
|
| 257 |
TESTSUITE_AT = \ |
| 258 |
testsuite.at \ |
| 259 |
diff --git a/tests/mt.at b/tests/mt.at |
| 260 |
index 050974a..9558d6f 100644 |
| 261 |
--- a/tests/mt.at |
| 262 |
+++ b/tests/mt.at |
| 263 |
@@ -29,5 +29,5 @@ AT_CLEANUP |
| 264 |
AT_SETUP([Thread-safe ARPACK:]) |
| 265 |
AT_KEYWORDS([thread-safe ARPACK]) |
| 266 |
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal], |
| 267 |
- [-lpthread]) |
| 268 |
+ [-lpthread $(${PKG_CONFIG} --libs arpack)]) |
| 269 |
AT_CLEANUP |
| 270 |
diff --git a/tests/types.at b/tests/types.at |
| 271 |
index f80a6a2..29ac739 100644 |
| 272 |
--- a/tests/types.at |
| 273 |
+++ b/tests/types.at |
| 274 |
@@ -133,7 +133,7 @@ AT_CLEANUP |
| 275 |
AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ]) |
| 276 |
AT_KEYWORDS([sparse matrix igraph_sparsemat_t]) |
| 277 |
AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out], |
| 278 |
- [], [INTERNAL], [-lblas]) |
| 279 |
+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)]) |
| 280 |
AT_CLEANUP |
| 281 |
|
| 282 |
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ]) |
| 283 |
-- |
| 284 |
2.0.0 |
Archives