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

fix llvm patch repeat application issue #17592

Merged
merged 1 commit into from
Jul 26, 2016
Merged

fix llvm patch repeat application issue #17592

merged 1 commit into from
Jul 26, 2016

Conversation

tkelman
Copy link
Contributor

@tkelman tkelman commented Jul 24, 2016

dependency on configure should be order-only (after the |)
since a patch modifies the file. also use CMakeLists.txt since
llvm's configure will be going away

cc @ViralBShah

dependency on configure should be order-only (after the `|`)
since a patch modifies the file. also use CMakeLists.txt since
llvm's configure will be going away
@tkelman tkelman added the building Build system, or building Julia or its dependencies label Jul 24, 2016
@tkelman tkelman merged commit fe193b5 into master Jul 26, 2016
@tkelman tkelman deleted the tk/llvmpatchbug branch July 26, 2016 05:25
tkelman added a commit that referenced this pull request Jul 26, 2016
No rule to make target CMakeLists.txt in a clean build, my bad
@tkelman
Copy link
Contributor Author

tkelman commented Jul 26, 2016

Oops, this breaks from-scratch builds. fix in c31c5f6

@vtjnash
Copy link
Member

vtjnash commented Jul 29, 2016

sigh, this is going to cause a lot of bad builds :(

The problem being that CMakeFiles.txt was older than the tgz archive, so we're going to re-extract it on top of the existing files. Then we're mostly not going to patch them, because we think we already did...

@tkelman
Copy link
Contributor Author

tkelman commented Jul 29, 2016

Ah, crap, that's what it was. Makes sense now. Sure would've been nice if you'd reviewed this. I also should have done more extensive local tests.

@vtjnash
Copy link
Member

vtjnash commented Jul 29, 2016

Sorry, I had looked at this but missed that. I'll push a hotfix shortly.

@tkelman
Copy link
Contributor Author

tkelman commented Jul 29, 2016

c31c5f6 seems okay but needs people to do make -C deps distclean-llvm. What are you planning?

vtjnash added a commit that referenced this pull request Jul 29, 2016
re-extraction of a tarball doesn't properly re-apply patches for llvm
this patch will force everyone to get a rebuild of a properly patched llvm
mfasi pushed a commit to mfasi/julia that referenced this pull request Sep 5, 2016
dependency on configure should be order-only (after the `|`)
since a patch modifies the file. also use CMakeLists.txt since
llvm's configure will be going away
mfasi pushed a commit to mfasi/julia that referenced this pull request Sep 5, 2016
No rule to make target CMakeLists.txt in a clean build, my bad
mfasi pushed a commit to mfasi/julia that referenced this pull request Sep 5, 2016
re-extraction of a tarball doesn't properly re-apply patches for llvm
this patch will force everyone to get a rebuild of a properly patched llvm
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
building Build system, or building Julia or its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants