diff options
| author | Matthew Maurer <maurer@matthewmaurer.org> | 2015-06-10 18:05:23 +0200 |
|---|---|---|
| committer | Matthew Maurer <maurer@matthewmaurer.org> | 2015-06-27 16:54:10 +0000 |
| commit | 90a4de0f1b70db2e8f9a47d04a11919fc798e652 (patch) | |
| tree | 34be4808b1a1b5051df858075d46d614dc1c66bd /pkgs/development/ocaml-modules/bitstring/camlp4-git.patch | |
| parent | da4266afb617e3167d459ad6dbf69179934d936e (diff) | |
| download | nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar.gz nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar.bz2 nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar.lz nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar.xz nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.tar.zst nixpkgs-90a4de0f1b70db2e8f9a47d04a11919fc798e652.zip | |
ocaml-bitstring: init at 2.0.4 and f1673f8
Diffstat (limited to 'pkgs/development/ocaml-modules/bitstring/camlp4-git.patch')
| -rw-r--r-- | pkgs/development/ocaml-modules/bitstring/camlp4-git.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch new file mode 100644 index 00000000000..24d2e362dfa --- /dev/null +++ b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch @@ -0,0 +1,44 @@ +diff --git a/Makefile.in b/Makefile.in +index d040f4c..cc1a8f5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -40,7 +40,7 @@ pkg_extlib = @OCAML_PKG_extlib@ + enable_coverage = @enable_coverage@ + + OCAMLCFLAGS = -g +-OCAMLCPACKAGES = ++OCAMLCPACKAGES = -package camlp4 + OCAMLCLIBS = -linkpkg + OCAMLOPTFLAGS = $(OCAMLCFLAGS) + OCAMLOPTPACKAGES = $(OCAMLCPACKAGES) +@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli + -I +camlp4 -pp camlp4of -c $< + + pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma +- $(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ ++ $(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \ ++ bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \ + -pp camlp4of -c $< -o $@ + + bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma + $(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \ +- $(OCAMLCFLAGS) $(OCAMLCLIBS) \ ++ $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \ + bitstring.cma bitstring_persistent.cma \ + $< -o $@ + +@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern + + create_test_pattern: create_test_pattern.cmo + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ +- unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \ ++ unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \ + $(OCAMLCLIBS) \ + -I . bitstring.cma bitstring_persistent.cma $< -o $@ + + create_test_pattern.cmo: create_test_pattern.ml + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \ ++ $(OCAMLCPACKAGES) \ + unix.cma -I +camlp4 \ + -I . -c $< -o $@ + |