Use cargo provided icu_capi #596
Merged
Conversation
This file contains hidden or 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
jschwe
force-pushed
the
jschwender/icu_capi_testing
branch
from
35fb8f0 to
fc81aeb
Compare
jschwe
force-pushed
the
jschwender/icu_capi_testing
branch
from
fc81aeb to
72a603d
Compare
Merged
Use the headers provided by cargo, instead of our local checkout. This also revealed that we had been using version 1.5, when we wanted to use 1.4, to be in sync with upstream. Signed-off-by: Jonathan Schwender <[email protected]>
Signed-off-by: Jonathan Schwender <[email protected]>
jschwe
force-pushed
the
jschwender/icu_capi_testing
branch
from
72a603d to
84996cb
Compare
Signed-off-by: Jonathan Schwender <[email protected]>
|
@sagudev @jdm Does either of you know if I can set includes in moz.build, that point to somewhere in |
|
I think you can use env vars in moz.build. EDIT: Or maybe not and you need to write wrapper to get it available in https://firefox-source-docs.mozilla.org/build/buildsystem/mozbuild-symbols.html#config |
Signed-off-by: Jonathan Schwender <[email protected]>
I think that part worked (but now I'm not sure anymore). What caused me problems is that |
jschwe
changed the title
|
I believe this PR would also allow publishing mozjs via crates.io (unless there were other blockers besides the vendored rust crates) |
sagudev
approved these changes
Aug 20, 2025
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Aug 21, 2025
Instead of vendoring a copy of icu_capi, mozjs now instead determines the location of the provided c header files by parsing the cargo metadata output. This will allow vendoring mozjs and is a step towards publishing mozjs and thus servo again. Corresponding mozjs PR: servo/mozjs#596 Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <[email protected]>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Aug 21, 2025
Instead of vendoring a copy of icu_capi, mozjs now instead determines the location of the provided c header files by parsing the cargo metadata output. This will allow vendoring mozjs and is a step towards publishing mozjs and thus servo again. Corresponding mozjs PR: servo/mozjs#596 Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <[email protected]>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Aug 21, 2025
Instead of vendoring a copy of icu_capi, mozjs now instead determines the location of the provided c header files by parsing the cargo metadata output. This will allow vendoring mozjs and is a step towards publishing mozjs and thus servo again. Corresponding mozjs PR: servo/mozjs#596 Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <[email protected]>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Aug 21, 2025
Instead of vendoring a copy of icu_capi, mozjs now instead determines the location of the provided c header files by parsing the cargo metadata output. This will allow vendoring mozjs and is a step towards publishing mozjs and thus servo again. Corresponding mozjs PR: servo/mozjs#596 Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <[email protected]>
github-merge-queue bot
pushed a commit
to servo/servo
that referenced
this pull request
Aug 21, 2025
Instead of vendoring a copy of icu_capi, mozjs now instead determines the location of the provided c header files by parsing the cargo metadata output. This will allow vendoring mozjs and is a step towards publishing mozjs and thus servo again. Corresponding mozjs PR: servo/mozjs#596 Testing: Covered by existing tests Signed-off-by: Jonathan Schwender <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using vendored rust crates causes problems with
cargo vendorand offline builds as well as cargo publish.Using
cargo metadatais currently the officially recommended solution to get the location of the c header files, but ideally we add a patch upstream to support reading the location from aDEP_environment variable, that cargo could set for us (posted unicode-org/icu4x#6769).For ease of reviewing the changes to the build system and removing the now unnecessary vendored code are separate commits.