Skip to content

Commit 6b979e1

Browse files
authored
Merge pull request #24545 from jmid/conf-openbabel-fix
Fix conf-openbabel on openbabel 3
2 parents ae1be37 + aeb82c3 commit 6b979e1

File tree

2 files changed

+14
-21
lines changed

2 files changed

+14
-21
lines changed

packages/conf-openbabel/conf-openbabel.0.1/files/test.cpp

Lines changed: 0 additions & 8 deletions
This file was deleted.

packages/conf-openbabel/conf-openbabel.0.1/opam

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,27 @@ homepage: "http://openbabel.org/"
44
license: "GPL-1.0-or-later"
55
authors: "http://openbabel.org/wiki/THANKS"
66
bug-reports: "https://github.com/ocaml/opam-repository/issues"
7-
build: [
8-
["c++" "-I/usr/include/openbabel-2.0" "test.cpp" "-lopenbabel"]
9-
{os != "macos"}
10-
[
11-
"c++"
12-
"-I/usr/local/include/openbabel-2.0"
13-
"test.cpp"
14-
"-L/usr/local/lib"
15-
"-lopenbabel"
16-
] {os = "macos"}
7+
build: [["sh" "-c" "pkg-config openbabel-2.0 || pkg-config openbabel-3"]]
8+
depends: ["conf-pkg-config" {build}]
9+
x-ci-accept-failures: [
10+
"debian-11"
11+
"debian-unstable"
12+
"alpine-3.18"
13+
"oraclelinux-7"
14+
"oraclelinux-8"
15+
"oraclelinux-9"
1716
]
18-
x-ci-accept-failures: ["debian-11" "debian-unstable"]
1917
depexts: [
20-
["libopenbabel-dev"] {os-family = "debian"}
18+
["libopenbabel-dev"] {os-family = "debian" | os-family = "ubuntu"}
19+
["openbabel"] {os-distribution = "arch"}
20+
["openbabel-devel"] {os-distribution = "fedora"}
21+
["openbabel-devel"] {os-family = "suse" | os-family = "opensuse"}
2122
["open-babel"] {os = "macos" & os-distribution = "homebrew"}
2223
["openbabel-devel"] {os-distribution = "centos"}
24+
["openbabel"] {os = "freebsd"}
2325
]
2426
synopsis: "Virtual package relying on openbabel library installation"
2527
description: """
2628
This package can only install if the openbabel devel library is installed
2729
on the system."""
28-
extra-files: ["test.cpp" "md5=0a2f6ad381a1624089cd12718bfbfdd8"]
2930
flags: conf

0 commit comments

Comments
 (0)