git.annexia.org
/
fedora-ocaml-rebuild.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add more OCaml packages.
[fedora-ocaml-rebuild.git]
/
Goalfile
diff --git
a/Goalfile
b/Goalfile
index
5c016c8
..
ea70faa
100644
(file)
--- a/
Goalfile
+++ b/
Goalfile
@@
-4,16
+4,13
@@
include "fedora.gl"
let fedora-dir = "%HOME/d/fedora"
let fedora-dir = "%HOME/d/fedora"
-let fedora-branch = "master"
-let fedora-tag = "f32-build-side-18015"
-let koji = "koji"
-#let koji = "koji -p riscv64"
-let fedpkg = "fedpkg"
-#let fedpkg = "fedpkg --user-config %HOME/d/fedora-ocaml-rebuild/fedpkg-user-config"
+#let fedora-branch = "master"
+let fedora-branch = "f32"
+let fedora-tag = "f32-build-side-19863"
# The magic string that must appear in %changelog when the
# package has been rebuilt.
# The magic string that must appear in %changelog when the
# package has been rebuilt.
-let fedora-rebuild-name = "OCaml 4.10.0
+beta1 rebuild
."
+let fedora-rebuild-name = "OCaml 4.10.0
final (Fedora 32)
."
# Packages that are blocked. Any dependent packages are also blocked
# automatically.
# Packages that are blocked. Any dependent packages are also blocked
# automatically.
@@
-28,32
+25,26
@@
let fedora-ignored = [
# All OCaml-related source package names
let other-packages = [
# All OCaml-related source package names
let other-packages = [
- "alt-ergo", "apron", "brltty",
- "graphviz", "hevea", "hivex",
- "l
ibguestfs", "libnbd", "nbdkit
",
+ "alt-ergo", "apron", "brltty",
"coccinelle",
+ "graphviz", "h
axe", "h
evea", "hivex",
+ "l
aby", "libguestfs", "libnbd", "opam
",
"virt-top", "virt-v2v",
"virt-top", "virt-v2v",
+ "z3",
- # no OCaml code, but needs to be rebuilt after Coq
- #"flocq"
+ # For Coq:
+ "coq", "frama-c",
+ "why3", "zenon",
+ "flocq",
- # Coq problems:
- # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/6I2CB4KNAZXH6TKX5WQZJ3ZQGBIOCNJK/
- # "coq", "frama-c", "gappalib-coq",
- # "why3", "zenon",
- # "flocq",
+ # Causes a cyclic dependency between libnbd <-> nbdkit. We need
+ # to fix this in goals itself, but in the meantime disable nbdkit
+ # and build it by hand.
+ # "nbdkit",
- #
plplot FTBFS for unrelated reasons
+ #
https://bugzilla.redhat.com/show_bug.cgi?id=1797853
# "plplot",
# "plplot",
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=1792740
- # "z3",
-
- # Coccinelle uses -unsafe-string.
- # "coccinelle",
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=1792770
- # "opam",
]
]
+
pure function get-source-packages () returning strings = {
cd %fedora-dir
for f in ocaml* %other-packages; do
pure function get-source-packages () returning strings = {
cd %fedora-dir
for f in ocaml* %other-packages; do
@@
-63,4
+54,4
@@
pure function get-source-packages () returning strings = {
let fedora-source-packages = get-source-packages ()
# Main goal: Rebuild all packages in Koji.
let fedora-source-packages = get-source-packages ()
# Main goal: Rebuild all packages in Koji.
-goal all = : wrap ("
*
koji-built", fedora-source-packages)
+goal all = : wrap ("
is-
koji-built", fedora-source-packages)