-
Notifications
You must be signed in to change notification settings - Fork 8
/
bnmin1.rb
82 lines (72 loc) · 3.14 KB
/
bnmin1.rb
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
class Bnmin1 < Formula
desc "Bojan Nikolic's minimisation and statistical inference library"
homepage "https://www.mrao.cam.ac.uk/~bn204/oof/bnmin1.html"
url "https://www.mrao.cam.ac.uk/~bn204/soft/bnmin1-1.11.tar.bz2"
sha256 "e2367190a4d6439e122cc2d78ad8224dcd9690fbc201f36a2a87fec149a39540"
depends_on "swig" => :build
depends_on "boost"
depends_on "gcc"
depends_on "gsl@1"
# Patch 1: Allow the use of SWIG 2.x for Python bindings
# Patch 2: Fix naming of static library
# Patch 3: Make fprior_t struct public as it is referenced in public priorlist_t
patch :DATA
def install
ENV.deparallelize
# Avoid arithmetic overflow in pda_d1mach.f
ENV["FFLAGS"] = "-fno-range-check"
# Workaround to get fortran and C++ to play together (see Homebrew issue #20173)
ENV.append "LDFLAGS", "-L/usr/lib -lstdc++"
system "./configure", "--disable-debug", "--disable-dependency-tracking",
"--prefix=#{prefix}", "--enable-static"
system "make", "install"
end
test do
system "#{bin}/t_unit"
end
end
__END__
diff --git a/pybind/configure b/pybind/configure
index 828ea58..0d06394 100755
--- a/pybind/configure
+++ b/pybind/configure
@@ -15462,9 +15462,9 @@ $as_echo "$swig_version" >&6; }
if test -z "$available_patch" ; then
available_patch=0
fi
- if test $available_major -ne $required_major \
- -o $available_minor -ne $required_minor \
- -o $available_patch -lt $required_patch ; then
+ if test $available_major -lt $required_major \
+ -o $available_major -eq $required_major -a $available_minor -lt $required_minor \
+ -o $available_major -eq $required_major -a $available_minor -eq $required_minor -a $available_patch -lt $required_patch ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.31 is required. You have $swig_version. You should look at http://www.swig.org" >&5
$as_echo "$as_me: WARNING: SWIG version >= 1.3.31 is required. You have $swig_version. You should look at http://www.swig.org" >&2;}
SWIG='echo "Error: SWIG version >= 1.3.31 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false'
diff --git a/bnmin1.pc.in b/bnmin1.pc.in
index 792bc60..f0f6f91 100644
--- a/bnmin1.pc.in
+++ b/bnmin1.pc.in
@@ -6,5 +6,5 @@ includedir=@includedir@
Name: BNMin1
Description: B. Nikolic's minimisation library
Version: @VERSION@
-Libs: -L${libdir} ${libdir}/libbnmin1.la
+Libs: -L${libdir} -lbnmin1
Cflags: -I${includedir}
diff --git a/src/priors.hxx b/src/priors.hxx
index 424c9c2..0ebdff0 100644
--- a/src/priors.hxx
+++ b/src/priors.hxx
@@ -89,6 +89,7 @@ namespace Minim {
std::vector< Minim::DParamCtr > _mpars;
+ public:
struct fprior_t
{
const double * p;
@@ -96,7 +97,6 @@ namespace Minim {
double pmax;
};
- public:
typedef std::list<fprior_t> priorlist_t;
private: