Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid source changes during static build #147

Merged
merged 1 commit into from Apr 17, 2019
Merged

Conversation

@spl
Copy link
Contributor

spl commented Apr 17, 2019

cargo package sporadically complains about file modifications outside OUT_DIR. See #142 for an experiment with chasing down that issue, which can involve different files changed at different times.

The build script is written to build out-of-tree in OUT_DIR, but configure and/or make still modify the source tree.

This change involves creating a temporary BUILD_DIR in OUT_DIR, copying the source files there, building, installing into OUT_DIR, and, finally, removing BUILD_DIR.


This change is Reviewable

`cargo package` sporadically complains about file modifications outside
`OUT_DIR`. See #142 for an
experiment with chasing down that issue, which can involve different
files changed at different times.

The build script is written to build out-of-tree in `OUT_DIR`, but
`configure` and/or `make` still modify the source tree.

This change involves creating a temporary `BUILD_DIR` in `OUT_DIR`,
copying the source files there, building, installing into `OUT_DIR`,
and, finally, removing `BUILD_DIR`.
@jdm
Copy link
Member

jdm commented Apr 17, 2019

@bors-servo r+
Seems like a reasonable solution.

@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2019

📌 Commit 3cad8c3 has been approved by jdm

bors-servo added a commit that referenced this pull request Apr 17, 2019
Avoid source changes during static build

`cargo package` sporadically complains about file modifications outside `OUT_DIR`. See #142 for an experiment with chasing down that issue, which can involve different files changed at different times.

The build script is written to build out-of-tree in `OUT_DIR`, but `configure` and/or `make` still modify the source tree.

This change involves creating a temporary `BUILD_DIR` in `OUT_DIR`, copying the source files there, building, installing into `OUT_DIR`, and, finally, removing `BUILD_DIR`.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-harfbuzz/147)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2019

Testing commit 3cad8c3 with merge 484fa70...

@bors-servo
Copy link
Contributor

bors-servo commented Apr 17, 2019

☀️ Test successful - checks-travis
Approved by: jdm
Pushing 484fa70 to master...

@bors-servo bors-servo merged commit 3cad8c3 into servo:master Apr 17, 2019
3 checks passed
3 checks passed
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@spl spl deleted the spl:fix-build branch Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.