Mercurial > mxe-octave
annotate src/of-sparsersb-1-cross-build.patch @ 4058:c7e31c07c915
of-sparsrb: add new package
* src/librsb.mk: new file
* src/librsb-1-nobzero.patch: new patch
* src/of-sparsersb.mk: new file
* src/of-sparsersb-1-cross-build.patch: new patch
* src/libgomp.mk: install libgomp.spec to build tools
* build_packages.m: add sparserb package
* index.html: add librsb and of-sparsersb packages
* Makefile.in: add sparsersb package to of-
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Sun, 22 Nov 2015 19:01:31 -0500 |
| parents | |
| children |
| rev | line source |
|---|---|
|
4058
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 diff -ur sparsersb-1.0.0.orig/src/autogen.sh sparsersb-1.0.0/src/autogen.sh |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 --- sparsersb-1.0.0.orig/src/autogen.sh 2015-11-10 06:07:55.812398937 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 +++ sparsersb-1.0.0/src/autogen.sh 2015-11-22 18:40:12.413271177 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
4 @@ -16,6 +16,9 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 if test x"\$LIBRSB_LIBS" = x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 LIBRSB_LIBS="\`\$LIBRSB_CONFIG --ldflags | sed 's/ -static/ /g'\` -lgomp" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 +if test x"\$SPARSERSB_LIBS" = x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 + SPARSERSB_LIBS="\`\$LIBRSB_CONFIG --extra_libs\`" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 +fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 AC_OPENMP([]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 ## |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 STATUS_MSG=" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 diff -ur sparsersb-1.0.0.orig/src/configure sparsersb-1.0.0/src/configure |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 --- sparsersb-1.0.0.orig/src/configure 2015-11-10 06:07:55.806398985 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
16 +++ sparsersb-1.0.0/src/configure 2015-11-22 18:41:23.740687962 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 @@ -616,6 +616,7 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 mpath |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 subver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 ver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 +OCTAVE_CONFIG |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 MKOCTFILE |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
23 OBJEXT |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
24 EXEEXT |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
25 @@ -2689,6 +2690,45 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
26 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
27 test -z "$MKOCTFILE" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no mkoctfile found on path" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
28 $as_echo "$as_me: WARNING: no mkoctfile found on path" >&2;} |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 +# Extract the first word of "octave-config", so it can be a program name with args. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 +set dummy octave-config; ac_word=$2 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 +$as_echo_n "checking for $ac_word... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
33 +if ${ac_cv_prog_OCTAVE_CONFIG+:} false; then : |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
34 + $as_echo_n "(cached) " >&6 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
35 +else |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
36 + if test -n "$OCTAVE_CONFIG"; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
37 + ac_cv_prog_OCTAVE_CONFIG="$OCTAVE_CONFIG" # Let the user override the test. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
38 +else |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
39 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
40 +for as_dir in $PATH |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
41 +do |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
42 + IFS=$as_save_IFS |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
43 + test -z "$as_dir" && as_dir=. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
44 + for ac_exec_ext in '' $ac_executable_extensions; do |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
45 + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
46 + ac_cv_prog_OCTAVE_CONFIG="octave-config" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
47 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
48 + break 2 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
49 + fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
50 +done |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
51 + done |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
52 +IFS=$as_save_IFS |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
53 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
54 +fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
55 +fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
56 +OCTAVE_CONFIG=$ac_cv_prog_OCTAVE_CONFIG |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
57 +if test -n "$OCTAVE_CONFIG"; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
58 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_CONFIG" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
59 +$as_echo "$OCTAVE_CONFIG" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
60 +else |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
61 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
62 +$as_echo "no" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
63 +fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
64 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
65 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
66 +test -z "$OCTAVE_CONFIG" && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no octave-config found on path" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
67 +$as_echo "$as_me: WARNING: no octave-config found on path" >&2;} |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
68 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
69 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
70 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
71 @@ -2840,15 +2880,17 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
72 # add -fPIC or equivalent flags |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
73 FPICFLAG=`$MKOCTFILE -p FPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
74 CPICFLAG=`$MKOCTFILE -p CPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
75 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
76 FFLAGS="$FFLAGS $FPICFLAG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
77 CFLAGS="$CFLAGS $CPICFLAG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
78 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
79 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
80 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
81 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
82 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
83 RSBOI_CXXFLAGS="" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
84 if test x$RSBOI_VERBOSE_CONFIG != x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
85 - RSBOI_CXXFLAGS="$RSBOI_CXXFLAGS -D''RSBOI_VERBOSE_CONFIG=$RSBOI_VERBOSE_CONFIG"; |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
86 + RSBOI_CXXFLAGS="$RSBOI_CXXFLAGS -DRSBOI_VERBOSE_CONFIG=$RSBOI_VERBOSE_CONFIG"; |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
87 fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
88 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
89 F77=`$MKOCTFILE -p F77` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
90 @@ -2858,6 +2900,7 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
91 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
92 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
93 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
94 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
95 CXX=`$MKOCTFILE -p CXX` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
96 CXXFLAGS=`$MKOCTFILE -p CXXFLAGS` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
97 CXXPICFLAG=`$MKOCTFILE -p CXXPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
98 @@ -2967,6 +3010,11 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
99 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
100 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
101 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
102 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
103 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
104 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
105 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
106 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
107 # Extract the first word of "octave", so it can be a program name with args. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
108 set dummy octave; ac_word=$2 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
109 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
110 @@ -3004,25 +3052,25 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
111 fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
112 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
113 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
114 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCTAVE_VERSION in Octave" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
115 -$as_echo_n "checking for OCTAVE_VERSION in Octave... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
116 -OCTAVE_VERSION=`echo "disp(OCTAVE_VERSION)" | $OCTAVE -qf` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
117 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VERSION in octave-config" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
118 +$as_echo_n "checking for VERSION in octave-config... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
119 +OCTAVE_VERSION=`$OCTAVE_CONFIG -p VERSION` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
120 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCTAVE_VERSION" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
121 $as_echo "$OCTAVE_VERSION" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
122 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
123 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
124 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
125 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('canonical_host_type') in Octave" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
126 -$as_echo_n "checking for octave_config_info('canonical_host_type') in Octave... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
127 -canonical_host_type=`echo "disp(octave_config_info('canonical_host_type'))" | $OCTAVE -qf` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
128 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CANONICAL_HOST_TYPE in octave-config" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
129 +$as_echo_n "checking for CANONICAL_HOST_TYPE in octave-config... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
130 +canonical_host_type=`$OCTAVE_CONFIG -p CANONICAL_HOST_TYPE` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
131 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $canonical_host_type" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
132 $as_echo "$canonical_host_type" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
133 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
134 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
135 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
136 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('SHLEXT') in Octave" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
137 -$as_echo_n "checking for octave_config_info('SHLEXT') in Octave... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
138 -SHLEXT=`echo "disp(octave_config_info('SHLEXT'))" | $OCTAVE -qf` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
139 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHLEXT in octave-config" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
140 +$as_echo_n "checking for SHLEXT in octave-config... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
141 +SHLEXT=`$OCTAVE_CONFIG -p SHLEXT` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
142 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHLEXT" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
143 $as_echo "$SHLEXT" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
144 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
145 @@ -3188,16 +3236,16 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
146 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
147 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
148 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
149 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('AR') in Octave" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
150 -$as_echo_n "checking for octave_config_info('AR') in Octave... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
151 -AR=`echo "disp(octave_config_info('AR'))" | $OCTAVE -qf` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
152 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AR in mkoctfile" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
153 +$as_echo_n "checking for AR in mkoctfile... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
154 +AR=`$MKOCTFILE -p AR` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
155 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
156 $as_echo "$AR" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
157 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
158 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
159 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for octave_config_info('ARFLAGS') in Octave" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
160 -$as_echo_n "checking for octave_config_info('ARFLAGS') in Octave... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
161 -ARFLAGS=`echo "disp(octave_config_info('ARFLAGS'))" | $OCTAVE -qf` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
162 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARFLAGS in mkoctfile" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
163 +$as_echo_n "checking for ARFLAGS in mkoctfile... " >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
164 +ARFLAGS=`$MKOCTFILE -p ARFLAGS` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
165 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARFLAGS" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
166 $as_echo "$ARFLAGS" >&6; } |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
167 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
168 @@ -3325,7 +3373,9 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
169 CXXFLAGS: $CXXFLAGS |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
170 octave: $OCTAVE (version $OCTAVE_VERSION) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
171 mkoctfile: $MKOCTFILE for Octave $subver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
172 + octave-config: $OCTAVE_CONFIG for Octave $subver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
173 swig: $SWIG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
174 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
175 # Extract the first word of "librsb-config", so it can be a program name with args. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
176 set dummy librsb-config; ac_word=$2 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
177 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
178 @@ -3372,6 +3422,9 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
179 if test x"$LIBRSB_LIBS" = x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
180 LIBRSB_LIBS="`$LIBRSB_CONFIG --ldflags | sed 's/ -static/ /g'` -lgomp" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
181 fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
182 +if test x"$SPARSERSB_LIBS" = x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
183 + SPARSERSB_LIBS="`$LIBRSB_CONFIG --extra_libs`" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
184 +fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
185 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
186 OPENMP_CFLAGS= |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
187 # Check whether --enable-openmp was given. |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
188 diff -ur sparsersb-1.0.0.orig/src/configure.base sparsersb-1.0.0/src/configure.base |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
189 --- sparsersb-1.0.0.orig/src/configure.base 2015-11-10 06:07:55.808398969 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
190 +++ sparsersb-1.0.0/src/configure.base 2015-11-22 18:40:51.666950216 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
191 @@ -54,6 +54,8 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
192 dnl Check for mkoctfile |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
193 AC_CHECK_PROG(MKOCTFILE,mkoctfile,mkoctfile) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
194 test -z "$MKOCTFILE" && AC_MSG_WARN([no mkoctfile found on path]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
195 +AC_CHECK_PROG(OCTAVE_CONFIG,octave-config,octave-config) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
196 +test -z "$OCTAVE_CONFIG" && AC_MSG_WARN([no octave-config found on path]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
197 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
198 AC_SUBST(ver) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
199 AC_SUBST(subver) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
200 @@ -193,21 +195,24 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
201 # add -fPIC or equivalent flags |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
202 FPICFLAG=`$MKOCTFILE -p FPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
203 CPICFLAG=`$MKOCTFILE -p CPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
204 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
205 FFLAGS="$FFLAGS $FPICFLAG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
206 CFLAGS="$CFLAGS $CPICFLAG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
207 AC_SUBST(CC) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
208 AC_SUBST(CFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
209 AC_SUBST(CPPFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
210 AC_SUBST(CPICFLAG) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
211 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
212 RSBOI_CXXFLAGS="" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
213 if test x$RSBOI_VERBOSE_CONFIG != x ; then |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
214 - RSBOI_CXXFLAGS="$RSBOI_CXXFLAGS -D''RSBOI_VERBOSE_CONFIG=$RSBOI_VERBOSE_CONFIG"; |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
215 + RSBOI_CXXFLAGS="$RSBOI_CXXFLAGS -DRSBOI_VERBOSE_CONFIG=$RSBOI_VERBOSE_CONFIG"; |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
216 fi |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
217 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
218 dnl Fortran compiler and flags |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
219 F77=`$MKOCTFILE -p F77` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
220 FFLAGS=`$MKOCTFILE -p FFLAGS` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
221 FPICFLAG=`$MKOCTFILE -p FPICFLAG` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
222 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
223 AC_SUBST(F77) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
224 AC_SUBST(FFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
225 AC_SUBST(FPICFLAG) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
226 @@ -304,6 +309,24 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
227 AC_SUBST($2) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
228 ]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
229 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
230 +dnl Use octave-config to get an octave setting |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
231 +dnl and set as an variable |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
232 +dnl |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
233 +AC_DEFUN(OCTAVE_CONFIG_EVAL, |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
234 +[AC_MSG_CHECKING([for $1 in octave-config]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
235 +$2=`$OCTAVE_CONFIG -p $1` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
236 +AC_MSG_RESULT($$2) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
237 +AC_SUBST($2) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
238 +]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
239 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
240 +AC_DEFUN(MKOCTFILE_EVAL, |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
241 +[AC_MSG_CHECKING([for $1 in mkoctfile]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
242 +$2=`$MKOCTFILE -p $1` |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
243 +AC_MSG_RESULT($$2) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
244 +AC_SUBST($2) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
245 +]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
246 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
247 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
248 dnl Check status of an octave variable |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
249 dnl |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
250 dnl OCTAVE_CHECK_EXIST(variable,action_if_true,action_if_false) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
251 @@ -321,13 +344,16 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
252 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
253 dnl should check that $(OCTAVE) --version matches $(MKOCTFILE) --version |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
254 AC_CHECK_PROG(OCTAVE,octave,octave) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
255 -OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
256 +dnl OCTAVE_EVAL(OCTAVE_VERSION,OCTAVE_VERSION) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
257 +OCTAVE_CONFIG_EVAL(VERSION,OCTAVE_VERSION) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
258 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
259 dnl grab canonical host type so we can write system specific install stuff |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
260 -OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
261 +dnl OCTAVE_EVAL(octave_config_info('canonical_host_type'),canonical_host_type) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
262 +OCTAVE_CONFIG_EVAL(CANONICAL_HOST_TYPE,canonical_host_type) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
263 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
264 dnl grab SHLEXT from octave config |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
265 -OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
266 +dnl OCTAVE_EVAL(octave_config_info('SHLEXT'),SHLEXT) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
267 +OCTAVE_CONFIG_EVAL(SHLEXT,SHLEXT) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
268 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
269 AC_PROG_LN_S |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
270 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
271 @@ -346,8 +372,10 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
272 OF_CHECK_LIB(m,sin,[OTHERLIBS=-lm]) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
273 AC_SUBST(OTHERLIBS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
274 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
275 -OCTAVE_EVAL(octave_config_info('AR'),AR) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
276 -OCTAVE_EVAL(octave_config_info('ARFLAGS'),ARFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
277 +dnl OCTAVE_EVAL(octave_config_info('AR'),AR) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
278 +dnl OCTAVE_EVAL(octave_config_info('ARFLAGS'),ARFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
279 +MKOCTFILE_EVAL(AR,AR) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
280 +MKOCTFILE_EVAL(ARFLAGS,ARFLAGS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
281 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
282 CPPFLAGS="$CPPFLAGS -DSTATIC_LINKED" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
283 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
284 @@ -402,4 +430,6 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
285 CXXFLAGS: $CXXFLAGS |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
286 octave: $OCTAVE (version $OCTAVE_VERSION) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
287 mkoctfile: $MKOCTFILE for Octave $subver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
288 + octave-config: $OCTAVE_CONFIG for Octave $subver |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
289 swig: $SWIG" |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
290 + |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
291 diff -ur sparsersb-1.0.0.orig/src/Makeconf.in sparsersb-1.0.0/src/Makeconf.in |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
292 --- sparsersb-1.0.0.orig/src/Makeconf.in 2015-11-10 06:07:55.808398969 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
293 +++ sparsersb-1.0.0/src/Makeconf.in 2015-11-10 06:19:13.844014051 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
294 @@ -61,6 +61,7 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
295 OCTAVE = @OCTAVE@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
296 OCTAVE_VERSION = @OCTAVE_VERSION@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
297 MKOCTFILE = @MKOCTFILE@ -DHAVE_OCTAVE_$(ver) -v |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
298 +OCTAVE_CONFIG = @OCTAVE_CONFIG@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
299 SHLEXT = @SHLEXT@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
300 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
301 ver = @ver@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
302 diff -ur sparsersb-1.0.0.orig/src/Makefile sparsersb-1.0.0/src/Makefile |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
303 --- sparsersb-1.0.0.orig/src/Makefile 2015-11-10 06:07:55.811398945 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
304 +++ sparsersb-1.0.0/src/Makefile 2015-11-10 06:21:58.401707659 -0500 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
305 @@ -23,7 +23,7 @@ |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
306 #LIBRSB_LIBS=$(RSBLIBDIR)/librsb.a |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
307 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
308 $(SPARSERSB_OCT): sparsersb.cc |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
309 - CXXFLAGS="$(CXXFLAGS)" $(MKOCTFILE) -D''RSB_SPARSERSB_LABEL=sparsersb $(RSBOI_CXXFLAGS) $(LIBRSB_CXXFLAGS) -o $@ $< $(LIBRSB_LIBS) $(SPARSERSB_LIBS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
310 + CXXFLAGS="$(CXXFLAGS)" $(MKOCTFILE) -D'RSB_SPARSERSB_LABEL=sparsersb' $(RSBOI_CXXFLAGS) $(LIBRSB_CXXFLAGS) -o $@ $< $(LIBRSB_LIBS) $(SPARSERSB_LIBS) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
311 |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
312 rtest: $(SPARSERSB_OCT) |
|
c7e31c07c915
of-sparsrb: add new package
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
313 $(OCTAVE) --silent ../inst/sparsersbtester.m |