all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 4ba2a75108b6c016a2f99eeebe9296cb5429cff0 1593 bytes (raw)
name: gnu/packages/patches/ocaml-janestreet-fix-libdir.patch 	 # note: path name is non-authoritative(*)

 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
 
This patch adds a --libdir option to opam-installer so it installs the plugin
in the specified directory rather than in the default one (ocaml's directory in
the store, which is forbidden).
diff -aur package.pristine/Makefile package.new/Makefile
--- package.pristine/Makefile	2016-02-06 01:55:14.650150309 +0100
+++ package.new/Makefile	2016-02-06 01:57:56.012174364 +0100
@@ -29,26 +29,26 @@
 	ocaml -I js-utils js-utils/gen_install.ml

 install: $(NAME).install
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install

 uninstall: $(NAME).install
-	opam-installer -u --prefix $(PREFIX) $(NAME).install
+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install

 reinstall: $(NAME).install
-	opam-installer -u --prefix $(PREFIX) $(NAME).install &> /dev/null || true
-	opam-installer -i --prefix $(PREFIX) $(NAME).install
+	opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install &> /dev/null || true
+	opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) $(NAME).install

 bin.tar.gz: $(NAME).install
 	rm -rf _install
 	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
 	tar czf bin.tar.gz -C _install .
 	rm -rf _install

 bin.lzo: $(NAME).install
 	rm -rf _install
 	mkdir _install
-	opam-installer -i --prefix _install $(NAME).install
+	opam-installer -i --prefix _install --libdir $(LIBDIR) $(NAME).install
 	cd _install && lzop -1 -P -o ../bin.lzo `find . -type f`
 	rm -rf _install


debug log:

solving 4ba2a7510 ...
found 4ba2a7510 in https://yhetil.org/guix/20170127221228.4370-10-julien@lepiller.eu/

applying [1/1] https://yhetil.org/guix/20170127221228.4370-10-julien@lepiller.eu/
diff --git a/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch
new file mode 100644
index 000000000..4ba2a7510

1:14: space before tab in indent.
 	ocaml -I js-utils js-utils/gen_install.ml
1:31: space before tab in indent.
 	rm -rf _install
1:32: space before tab in indent.
 	mkdir _install
1:35: space before tab in indent.
 	tar czf bin.tar.gz -C _install .
1:36: space before tab in indent.
 	rm -rf _install
Checking patch gnu/packages/patches/ocaml-janestreet-fix-libdir.patch...
Applied patch gnu/packages/patches/ocaml-janestreet-fix-libdir.patch cleanly.
warning: squelched 5 whitespace errors
warning: 10 lines add whitespace errors.

index at:
100644 4ba2a75108b6c016a2f99eeebe9296cb5429cff0	gnu/packages/patches/ocaml-janestreet-fix-libdir.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.