Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Janno
iris-coq
Commits
b419fc70
Commit
b419fc70
authored
Apr 25, 2018
by
Ralf Jung
Browse files
only do the 'reinstall build-dep package' on opam 1
parent
17a99876
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
b419fc70
...
...
@@ -31,13 +31,15 @@ build-dep: build-dep/opam phony
@
# that are incompatible with our build requirements.
@
# To achieve this, we create a fake opam package that has our build-dependencies as
@
# dependencies, but does not actually install anything.
@
# Reinstalling is needed in case the pin already exists, but the builddep
package changed.
@
#
Once we depend on opam 2, we can remov
e
t
ha
t last step
.
@
# Reinstalling is needed
with opam 1
in case the pin already exists, but the builddep
@
#
packag
e
c
ha
nged
.
@
BUILD_DEP_PACKAGE
=
"
$$
(egrep "
^name:
" build-dep/opam | sed 's/^name: *"
\(
.
*
\)
" */
\1
/')"
;
\
echo
"# Pinning build-dep package."
&&
\
opam pin add
-k
path
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
.dev build-dep
&&
\
echo
"# Reinstalling build-dep package."
&&
\
opam reinstall
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
(!
opam
--version
|
grep
"^1
\.
"
)
||
(
\
echo
"# Reinstalling build-dep package."
&&
\
opam reinstall
$(OPAMFLAGS)
"
$$
BUILD_DEP_PACKAGE"
\
)
# Some files that do *not* need to be forwarded to Makefile.coq
Makefile
:
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment