forked from ocaml/opam-repository
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix camlp4 on non-natdynlink systems
camlp4's all target depends on ocaml-native-dynlink, not just ocaml-native. This in particular affects Cygwin when the flexdll package has not been installed (which has ocamlopt but does not have natdynlink).
- Loading branch information
Showing
20 changed files
with
310 additions
and
24 deletions.
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+1/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+2/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+3/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+4/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+6/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.02+7/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.03+1/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
packages/camlp4/camlp4.4.04+1/files/f0ea53725465260556832398096cef8d3f20b49d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f0ea53725465260556832398096cef8d3f20b49d Mon Sep 17 00:00:00 2001 | ||
| From: David Allsopp <[email protected]> | ||
| Date: Mon, 8 Jan 2018 12:59:08 +0000 | ||
| Subject: [PATCH] Fix make byte for systems with no natdynlink | ||
|
|
||
| 2a31a83 builds a native-code preprocessor if ocamlbuild supports native | ||
| code. However, it's possible to have systems which support native code but | ||
| don't have natdynlink (e.g. Cygwin without flexdll support) and in this | ||
| case the build fails. | ||
|
|
||
| Signed-off-by: David Allsopp <[email protected]> | ||
| --- | ||
| myocamlbuild.ml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/myocamlbuild.ml b/myocamlbuild.ml | ||
| index 7264df134..ecaac916f 100644 | ||
| --- a/myocamlbuild.ml | ||
| +++ b/myocamlbuild.ml | ||
| @@ -76,7 +76,7 @@ let () = | ||
| else | ||
| let exe = | ||
| "camlp4boot" ^ | ||
| - if !Options.native_plugin then | ||
| + if C.ocamlnat then | ||
| (* If we are using a native plugin, we might as well use a native | ||
| preprocessor. *) | ||
| ".native" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.