From bb2df4cd5d88a4f7e643e1f6b849c0b50ad87874 Mon Sep 17 00:00:00 2001 From: Bryan Phelps Date: Thu, 5 Mar 2020 11:37:40 -0800 Subject: [PATCH] Build: Statically link oniguruma (#1416) * Static lib * Fix lockfiles * Update lockfiles --- bench.esy.lock/index.json | 33 +++++++++++-------- .../package.json | 5 +++ esy.lock/index.json | 33 +++++++++++-------- .../package.json | 5 +++ integrationtest.esy.lock/index.json | 33 +++++++++++-------- .../package.json | 5 +++ package.json | 3 +- test.esy.lock/index.json | 33 +++++++++++-------- .../package.json | 5 +++ 9 files changed, 98 insertions(+), 57 deletions(-) create mode 100644 bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json create mode 100644 esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json create mode 100644 integrationtest.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json create mode 100644 test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json diff --git a/bench.esy.lock/index.json b/bench.esy.lock/index.json index 53c6f2d85c..4b3207ad79 100644 --- a/bench.esy.lock/index.json +++ b/bench.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "4967fa0c4fc9acf6af842d9976113428", + "checksum": "fb466589a0d55bd2329b587e89201ef0", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b6@d41d8cd9": { @@ -380,7 +380,8 @@ "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-oniguruma@6.9.4000@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "@reason-native/rely@1.3.1@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" @@ -880,15 +881,13 @@ "dependencies": [], "devDependencies": [] }, - "esy-oniguruma@6.9.4000@d41d8cd9": { - "id": "esy-oniguruma@6.9.4000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9": { + "id": "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "name": "esy-oniguruma", - "version": "6.9.4000", + "version": "github:onivim/esy-oniguruma#4698ce4", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-oniguruma/-/esy-oniguruma-6.9.4000.tgz#sha1:cf7ce7c957094170bb246e2122ba74a35da880ae" - ] + "source": [ "github:onivim/esy-oniguruma#4698ce4" ] }, "overrides": [], "dependencies": [], @@ -2258,8 +2257,8 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/menhir@opam:20200211@90483d81": { - "id": "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604": { + "id": "@opam/menhir@opam:20200211@26571604", "name": "@opam/menhir", "version": "opam:20200211", "source": { @@ -2274,11 +2273,17 @@ "path": "bench.esy.lock/opam/menhir.20200211" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" + } + ], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", "@opam/menhirLib@opam:20200211@99279102", - "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", @@ -3204,7 +3209,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@90483d81", + "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@26571604", "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/easy-format@opam:1.3.1@54402780", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -3291,7 +3296,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.4@64c45329", - "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] diff --git a/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json new file mode 100644 index 0000000000..6882a38539 --- /dev/null +++ b/bench.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@opam/fix": "*" + } +} diff --git a/esy.lock/index.json b/esy.lock/index.json index 74ac4af840..8d5fe7e21e 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "4967fa0c4fc9acf6af842d9976113428", + "checksum": "fb466589a0d55bd2329b587e89201ef0", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b6@d41d8cd9": { @@ -380,7 +380,8 @@ "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-oniguruma@6.9.4000@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "@reason-native/rely@1.3.1@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" @@ -880,15 +881,13 @@ "dependencies": [], "devDependencies": [] }, - "esy-oniguruma@6.9.4000@d41d8cd9": { - "id": "esy-oniguruma@6.9.4000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9": { + "id": "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "name": "esy-oniguruma", - "version": "6.9.4000", + "version": "github:onivim/esy-oniguruma#4698ce4", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-oniguruma/-/esy-oniguruma-6.9.4000.tgz#sha1:cf7ce7c957094170bb246e2122ba74a35da880ae" - ] + "source": [ "github:onivim/esy-oniguruma#4698ce4" ] }, "overrides": [], "dependencies": [], @@ -2257,8 +2256,8 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/menhir@opam:20200211@90483d81": { - "id": "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604": { + "id": "@opam/menhir@opam:20200211@26571604", "name": "@opam/menhir", "version": "opam:20200211", "source": { @@ -2273,11 +2272,17 @@ "path": "esy.lock/opam/menhir.20200211" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" + } + ], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", "@opam/menhirLib@opam:20200211@99279102", - "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", @@ -3203,7 +3208,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@90483d81", + "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@26571604", "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/easy-format@opam:1.3.1@54402780", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -3290,7 +3295,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.4@64c45329", - "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] diff --git a/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json new file mode 100644 index 0000000000..6882a38539 --- /dev/null +++ b/esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@opam/fix": "*" + } +} diff --git a/integrationtest.esy.lock/index.json b/integrationtest.esy.lock/index.json index da984a5eda..9ce6a1d5b8 100644 --- a/integrationtest.esy.lock/index.json +++ b/integrationtest.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "4967fa0c4fc9acf6af842d9976113428", + "checksum": "fb466589a0d55bd2329b587e89201ef0", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b6@d41d8cd9": { @@ -380,7 +380,8 @@ "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-oniguruma@6.9.4000@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "@reason-native/rely@1.3.1@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" @@ -880,15 +881,13 @@ "dependencies": [], "devDependencies": [] }, - "esy-oniguruma@6.9.4000@d41d8cd9": { - "id": "esy-oniguruma@6.9.4000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9": { + "id": "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "name": "esy-oniguruma", - "version": "6.9.4000", + "version": "github:onivim/esy-oniguruma#4698ce4", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-oniguruma/-/esy-oniguruma-6.9.4000.tgz#sha1:cf7ce7c957094170bb246e2122ba74a35da880ae" - ] + "source": [ "github:onivim/esy-oniguruma#4698ce4" ] }, "overrides": [], "dependencies": [], @@ -2258,8 +2257,8 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/menhir@opam:20200211@90483d81": { - "id": "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604": { + "id": "@opam/menhir@opam:20200211@26571604", "name": "@opam/menhir", "version": "opam:20200211", "source": { @@ -2274,11 +2273,17 @@ "path": "integrationtest.esy.lock/opam/menhir.20200211" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "integrationtest.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" + } + ], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", "@opam/menhirLib@opam:20200211@99279102", - "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", @@ -3204,7 +3209,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@90483d81", + "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@26571604", "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/easy-format@opam:1.3.1@54402780", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -3291,7 +3296,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.4@64c45329", - "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] diff --git a/integrationtest.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/integrationtest.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json new file mode 100644 index 0000000000..6882a38539 --- /dev/null +++ b/integrationtest.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@opam/fix": "*" + } +} diff --git a/package.json b/package.json index 4a6ac7dc99..d130353f89 100644 --- a/package.json +++ b/package.json @@ -255,8 +255,9 @@ "rench": "bryphe/rench#a976fe5", "@esy-ocaml/reason": "facebook/reason#8f71db0", "reason-textmate": "onivim/reason-textmate#5f0dc38", + "reason-harfbuzz": "revery-ui/reason-harfbuzz#eca58ea", "@esy-ocaml/libffi": "onivim/libffi#590b041", - "reason-harfbuzz": "revery-ui/reason-harfbuzz#eca58ea" + "esy-oniguruma": "onivim/esy-oniguruma#4698ce4" }, "devDependencies": { "ocaml": "~4.8", diff --git a/test.esy.lock/index.json b/test.esy.lock/index.json index c6ef4928a3..79a635d566 100644 --- a/test.esy.lock/index.json +++ b/test.esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "4b38e24c1172794a982390069029b267", + "checksum": "6de628762af695f9f7f26a00439ecd0f", "root": "Oni2@link-dev:./package.json", "node": { "yarn-pkg-config@github:esy-ocaml/yarn-pkg-config#db3a0b6@d41d8cd9": { @@ -380,7 +380,8 @@ "overrides": [], "dependencies": [ "reperf@1.5.0@d41d8cd9", "refmterr@3.3.0@d41d8cd9", - "ocaml@4.8.1000@d41d8cd9", "esy-oniguruma@6.9.4000@d41d8cd9", + "ocaml@4.8.1000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "@reason-native/rely@1.3.1@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/reason@github:facebook/reason#8f71db0@d41d8cd9" @@ -880,15 +881,13 @@ "dependencies": [], "devDependencies": [] }, - "esy-oniguruma@6.9.4000@d41d8cd9": { - "id": "esy-oniguruma@6.9.4000@d41d8cd9", + "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9": { + "id": "esy-oniguruma@github:onivim/esy-oniguruma#4698ce4@d41d8cd9", "name": "esy-oniguruma", - "version": "6.9.4000", + "version": "github:onivim/esy-oniguruma#4698ce4", "source": { "type": "install", - "source": [ - "archive:https://registry.npmjs.org/esy-oniguruma/-/esy-oniguruma-6.9.4000.tgz#sha1:cf7ce7c957094170bb246e2122ba74a35da880ae" - ] + "source": [ "github:onivim/esy-oniguruma#4698ce4" ] }, "overrides": [], "dependencies": [], @@ -2257,8 +2256,8 @@ "ocaml@4.8.1000@d41d8cd9", "@opam/dune@opam:2.3.1@b10b59bf" ] }, - "@opam/menhir@opam:20200211@90483d81": { - "id": "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604": { + "id": "@opam/menhir@opam:20200211@26571604", "name": "@opam/menhir", "version": "opam:20200211", "source": { @@ -2273,11 +2272,17 @@ "path": "test.esy.lock/opam/menhir.20200211" } }, - "overrides": [], + "overrides": [ + { + "opamoverride": + "test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override" + } + ], "dependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", "@opam/menhirLib@opam:20200211@99279102", - "@opam/dune@opam:2.3.1@b10b59bf", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf", + "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9", "@opam/menhirSdk@opam:20200211@1b43927c", @@ -3203,7 +3208,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@90483d81", + "ocaml@4.8.1000@d41d8cd9", "@opam/menhir@opam:20200211@26571604", "@opam/jbuilder@opam:1.0+beta20.2@053ddcf2", "@opam/easy-format@opam:1.3.1@54402780", "@esy-ocaml/substs@0.0.1@d41d8cd9" @@ -3290,7 +3295,7 @@ "@opam/ocamlfind@opam:1.8.1@ff07b0f9", "@opam/ocaml-migrate-parsetree@opam:1.6.0@da2643e7", "@opam/merlin-extend@opam:0.4@64c45329", - "@opam/menhir@opam:20200211@90483d81", + "@opam/menhir@opam:20200211@26571604", "@opam/fix@opam:20200131@0ecd2f01", "@opam/dune@opam:2.3.1@b10b59bf" ], "devDependencies": [ "ocaml@4.8.1000@d41d8cd9" ] diff --git a/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json b/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json new file mode 100644 index 0000000000..6882a38539 --- /dev/null +++ b/test.esy.lock/overrides/opam__s__menhir_opam__c__20200211_opam_override/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "@opam/fix": "*" + } +}