this repo has no description
Merge pull request #24677 from jmid/patch-lbvs_consent
Patch lbvs_consent 2.1.1-2.2.0 to support openbabel-3
authored by
Marcello Seri
and committed by
GitHub
840d3224
78f6cb00
+149
-17
+28
packages/lbvs_consent/lbvs_consent.2.1.1/files/makefile.patch
+28
packages/lbvs_consent/lbvs_consent.2.1.1/files/makefile.patch
···
1
+
From 72b06302f05f20ae6eb9fb045bacc651c0c2257c Mon Sep 17 00:00:00 2001
2
+
From: Jan Midtgaard <mail@janmidtgaard.dk>
3
+
Date: Thu, 26 Oct 2023 09:46:09 +0200
4
+
Subject: [PATCH] Support openbabel-2.0 and openbabel-3 via pkg-config
5
+
6
+
---
7
+
src/Makefile | 7 +++++--
8
+
1 file changed, 5 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/src/Makefile b/src/Makefile
11
+
index c075908..0e8b4f5 100644
12
+
--- a/src/Makefile
13
+
+++ b/src/Makefile
14
+
@@ -1,6 +1,9 @@
15
+
+CFLAGS := `pkg-config --silence-errors --cflags openbabel-2.0 || pkg-config --cflags openbabel-3`
16
+
+LDFLAGS := `pkg-config --silence-errors --libs openbabel-2.0 || pkg-config --libs openbabel-3`
17
+
+
18
+
ob_maccs: ob_maccs.cpp
19
+
- c++ -W -Wall -I/usr/include/openbabel-2.0 ob_maccs.cpp \
20
+
- -o lbvs_consent_ob_maccs -lopenbabel -Wl,-R/usr/lib
21
+
+ c++ -W -Wall $(CFLAGS) ob_maccs.cpp \
22
+
+ -o lbvs_consent_ob_maccs $(LDFLAGS) -Wl,-R/usr/lib
23
+
24
+
clean:
25
+
\rm -f lbvs_consent_ob_maccs
26
+
--
27
+
2.34.1
28
+
+10
-5
packages/lbvs_consent/lbvs_consent.2.1.1/opam
+10
-5
packages/lbvs_consent/lbvs_consent.2.1.1/opam
···
5
5
bug-reports: "https://github.com/UnixJunkie/consent/issues"
6
6
dev-repo: "git+https://github.com/UnixJunkie/consent.git"
7
7
license: "GPL"
8
+
patches: ["makefile.patch"]
8
9
build: [
9
10
[make "obmaccs"]
10
11
["dune" "build" "-p" name "-j" jobs]
···
15
16
]
16
17
depends: [
17
18
"dune" {>= "1.6"}
18
-
"batteries"
19
+
"batteries" {>= "2.6.0"}
19
20
"bitv" {>= "1.2"}
20
-
"parmap"
21
+
"parmap" {>= "1.1.1"}
21
22
"dolog" {>= "4.0.0" & < "5.0.0"}
22
-
"camlzip"
23
+
"camlzip" {>= "1.06"}
23
24
"qcheck"
24
-
"minivpt"
25
-
"cpm"
25
+
"minivpt" {>= "2.0.0"}
26
+
"cpm" {>= "4.0.0"}
26
27
"dokeysto_camltc"
27
28
"minicli" {>= "5.0.0"}
28
29
"conf-boost"
29
30
"conf-openbabel"
30
31
"conf-python-3"
31
32
"conf-rdkit"
33
+
"conf-pkg-config"
32
34
]
33
35
synopsis: "Chemoinformatics software for consensus fingerprint queries"
34
36
description: """
···
54
56
doi={10.1186/s13321-017-0248-5},
55
57
}
56
58
"""
59
+
extra-files: [
60
+
["makefile.patch" "md5=01bf7fbabdfd52ea6217db33ce25dfa7"]
61
+
]
57
62
url {
58
63
src: "https://github.com/UnixJunkie/consent/archive/v2.1.1.tar.gz"
59
64
checksum: "md5=bb7bc5cd982b03b87a7eb5d899835a50"
+28
packages/lbvs_consent/lbvs_consent.2.1.2/files/makefile.patch
+28
packages/lbvs_consent/lbvs_consent.2.1.2/files/makefile.patch
···
1
+
From 72b06302f05f20ae6eb9fb045bacc651c0c2257c Mon Sep 17 00:00:00 2001
2
+
From: Jan Midtgaard <mail@janmidtgaard.dk>
3
+
Date: Thu, 26 Oct 2023 09:46:09 +0200
4
+
Subject: [PATCH] Support openbabel-2.0 and openbabel-3 via pkg-config
5
+
6
+
---
7
+
src/Makefile | 7 +++++--
8
+
1 file changed, 5 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/src/Makefile b/src/Makefile
11
+
index c075908..0e8b4f5 100644
12
+
--- a/src/Makefile
13
+
+++ b/src/Makefile
14
+
@@ -1,6 +1,9 @@
15
+
+CFLAGS := `pkg-config --silence-errors --cflags openbabel-2.0 || pkg-config --cflags openbabel-3`
16
+
+LDFLAGS := `pkg-config --silence-errors --libs openbabel-2.0 || pkg-config --libs openbabel-3`
17
+
+
18
+
ob_maccs: ob_maccs.cpp
19
+
- c++ -W -Wall -I/usr/include/openbabel-2.0 ob_maccs.cpp \
20
+
- -o lbvs_consent_ob_maccs -lopenbabel -Wl,-R/usr/lib
21
+
+ c++ -W -Wall $(CFLAGS) ob_maccs.cpp \
22
+
+ -o lbvs_consent_ob_maccs $(LDFLAGS) -Wl,-R/usr/lib
23
+
24
+
clean:
25
+
\rm -f lbvs_consent_ob_maccs
26
+
--
27
+
2.34.1
28
+
+10
-5
packages/lbvs_consent/lbvs_consent.2.1.2/opam
+10
-5
packages/lbvs_consent/lbvs_consent.2.1.2/opam
···
5
5
bug-reports: "https://github.com/UnixJunkie/consent/issues"
6
6
dev-repo: "git+https://github.com/UnixJunkie/consent.git"
7
7
license: "GPL"
8
+
patches: ["makefile.patch"]
8
9
build: [
9
10
[make "obmaccs"]
10
11
["dune" "build" "-p" name "-j" jobs]
···
15
16
]
16
17
depends: [
17
18
"dune" {>= "1.6"}
18
-
"batteries"
19
+
"batteries" {>= "3.0.0"}
19
20
"bitv" {>= "1.2"}
20
-
"parmap"
21
+
"parmap" {>= "1.1.1"}
21
22
"dolog" {>= "4.0.0"}
22
-
"camlzip"
23
+
"camlzip" {>= "1.06"}
23
24
"qcheck"
24
-
"minivpt"
25
-
"cpm"
25
+
"minivpt" {>= "2.0.0"}
26
+
"cpm" {>= "4.0.0"}
26
27
"dokeysto_camltc"
27
28
"minicli" {>= "5.0.0"}
28
29
"conf-boost"
29
30
"conf-openbabel"
30
31
"conf-python-3"
31
32
"conf-rdkit"
33
+
"conf-pkg-config"
32
34
]
33
35
synopsis: "Chemoinformatics software for consensus fingerprint queries"
34
36
description: """
···
54
56
doi={10.1186/s13321-017-0248-5},
55
57
}
56
58
"""
59
+
extra-files: [
60
+
["makefile.patch" "md5=01bf7fbabdfd52ea6217db33ce25dfa7"]
61
+
]
57
62
url {
58
63
src: "https://github.com/UnixJunkie/consent/archive/v2.1.2.tar.gz"
59
64
checksum: "md5=c5781fa8303fba1a661c03ded74cc87b"
+28
packages/lbvs_consent/lbvs_consent.2.1.3/files/makefile.patch
+28
packages/lbvs_consent/lbvs_consent.2.1.3/files/makefile.patch
···
1
+
From 72b06302f05f20ae6eb9fb045bacc651c0c2257c Mon Sep 17 00:00:00 2001
2
+
From: Jan Midtgaard <mail@janmidtgaard.dk>
3
+
Date: Thu, 26 Oct 2023 09:46:09 +0200
4
+
Subject: [PATCH] Support openbabel-2.0 and openbabel-3 via pkg-config
5
+
6
+
---
7
+
src/Makefile | 7 +++++--
8
+
1 file changed, 5 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/src/Makefile b/src/Makefile
11
+
index c075908..0e8b4f5 100644
12
+
--- a/src/Makefile
13
+
+++ b/src/Makefile
14
+
@@ -1,6 +1,9 @@
15
+
+CFLAGS := `pkg-config --silence-errors --cflags openbabel-2.0 || pkg-config --cflags openbabel-3`
16
+
+LDFLAGS := `pkg-config --silence-errors --libs openbabel-2.0 || pkg-config --libs openbabel-3`
17
+
+
18
+
ob_maccs: ob_maccs.cpp
19
+
- c++ -W -Wall -I/usr/include/openbabel-2.0 ob_maccs.cpp \
20
+
- -o lbvs_consent_ob_maccs -lopenbabel -Wl,-R/usr/lib
21
+
+ c++ -W -Wall $(CFLAGS) ob_maccs.cpp \
22
+
+ -o lbvs_consent_ob_maccs $(LDFLAGS) -Wl,-R/usr/lib
23
+
24
+
clean:
25
+
\rm -f lbvs_consent_ob_maccs
26
+
--
27
+
2.34.1
28
+
+9
-4
packages/lbvs_consent/lbvs_consent.2.1.3/opam
+9
-4
packages/lbvs_consent/lbvs_consent.2.1.3/opam
···
5
5
bug-reports: "https://github.com/UnixJunkie/consent/issues"
6
6
dev-repo: "git+https://github.com/UnixJunkie/consent.git"
7
7
license: "GPL-3.0-only"
8
+
patches: ["makefile.patch"]
8
9
build: [
9
10
[make "obmaccs"]
10
11
["dune" "build" "-p" name "-j" jobs]
···
16
17
depends: [
17
18
"ocaml" {>= "5.0.0"}
18
19
"dune" {>= "1.6"}
19
-
"batteries"
20
+
"batteries" {>= "3.0.0"}
20
21
"bitv" {>= "1.2"}
21
-
"parmap" # FBR: replace by parany in the near future
22
+
"parmap" {>= "1.1.1"} # FBR: replace by parany in the near future
22
23
"dolog" {>= "4.0.0"}
23
-
"camlzip"
24
+
"camlzip" {>= "1.06"}
24
25
"qcheck"
25
26
"vpt"
26
-
"cpm"
27
+
"cpm" {>= "4.0.0"}
27
28
"dokeysto"
28
29
"minicli" {>= "5.0.0"}
29
30
"conf-boost"
30
31
"conf-openbabel"
31
32
"conf-python-3"
32
33
"conf-rdkit"
34
+
"conf-pkg-config"
33
35
]
34
36
synopsis: "Chemoinformatics software for consensus fingerprint queries"
35
37
description: """
···
55
57
doi={10.1186/s13321-017-0248-5},
56
58
}
57
59
"""
60
+
extra-files: [
61
+
["makefile.patch" "md5=01bf7fbabdfd52ea6217db33ce25dfa7"]
62
+
]
58
63
url {
59
64
src: "https://github.com/UnixJunkie/consent/archive/v2.1.3.tar.gz"
60
65
checksum: "md5=0f31a77be622c4b90ae4659f5a5fba57"
+28
packages/lbvs_consent/lbvs_consent.2.2.0/files/makefile.patch
+28
packages/lbvs_consent/lbvs_consent.2.2.0/files/makefile.patch
···
1
+
From 72b06302f05f20ae6eb9fb045bacc651c0c2257c Mon Sep 17 00:00:00 2001
2
+
From: Jan Midtgaard <mail@janmidtgaard.dk>
3
+
Date: Thu, 26 Oct 2023 09:46:09 +0200
4
+
Subject: [PATCH] Support openbabel-2.0 and openbabel-3 via pkg-config
5
+
6
+
---
7
+
src/Makefile | 7 +++++--
8
+
1 file changed, 5 insertions(+), 2 deletions(-)
9
+
10
+
diff --git a/src/Makefile b/src/Makefile
11
+
index c075908..0e8b4f5 100644
12
+
--- a/src/Makefile
13
+
+++ b/src/Makefile
14
+
@@ -1,6 +1,9 @@
15
+
+CFLAGS := `pkg-config --silence-errors --cflags openbabel-2.0 || pkg-config --cflags openbabel-3`
16
+
+LDFLAGS := `pkg-config --silence-errors --libs openbabel-2.0 || pkg-config --libs openbabel-3`
17
+
+
18
+
ob_maccs: ob_maccs.cpp
19
+
- c++ -W -Wall -I/usr/include/openbabel-2.0 ob_maccs.cpp \
20
+
- -o lbvs_consent_ob_maccs -lopenbabel -Wl,-R/usr/lib
21
+
+ c++ -W -Wall $(CFLAGS) ob_maccs.cpp \
22
+
+ -o lbvs_consent_ob_maccs $(LDFLAGS) -Wl,-R/usr/lib
23
+
24
+
clean:
25
+
\rm -f lbvs_consent_ob_maccs
26
+
--
27
+
2.34.1
28
+
+8
-3
packages/lbvs_consent/lbvs_consent.2.2.0/opam
+8
-3
packages/lbvs_consent/lbvs_consent.2.2.0/opam
···
5
5
bug-reports: "https://github.com/UnixJunkie/consent/issues"
6
6
dev-repo: "git+https://github.com/UnixJunkie/consent.git"
7
7
license: "GPL-3.0-only"
8
+
patches: ["makefile.patch"]
8
9
build: [
9
10
[make "obmaccs"]
10
11
["dune" "build" "-p" name "-j" jobs]
···
16
17
depends: [
17
18
"ocaml" {>= "5.0.0"}
18
19
"dune" {>= "1.6"}
19
-
"batteries"
20
+
"batteries" {>= "3.0.0"}
20
21
"bitv" {>= "1.2"}
21
22
"parany" {>= "13.1.0"} # we need Parany.get_rank()
22
23
"dolog" {>= "4.0.0"}
23
-
"camlzip"
24
+
"camlzip" {>= "1.06"}
24
25
"qcheck"
25
26
"vpt"
26
-
"cpm"
27
+
"cpm" {>= "4.0.0"}
27
28
"dokeysto"
28
29
"minicli" {>= "5.0.0"}
29
30
"conf-boost"
30
31
"conf-openbabel"
31
32
"conf-python-3"
32
33
"conf-rdkit"
34
+
"conf-pkg-config"
33
35
]
34
36
synopsis: "Chemoinformatics software for consensus fingerprint queries"
35
37
description: """
···
55
57
doi={10.1186/s13321-017-0248-5},
56
58
}
57
59
"""
60
+
extra-files: [
61
+
["makefile.patch" "md5=01bf7fbabdfd52ea6217db33ce25dfa7"]
62
+
]
58
63
url {
59
64
src: "https://github.com/UnixJunkie/consent/archive/v2.2.0.tar.gz"
60
65
checksum: "md5=b6c428377847378a08b878fd9264ddee"