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

CMake fixes for Cotie and GCC 4.4 compatibility #164

Merged
merged 10 commits into from Sep 2, 2016

Conversation

jdetter
Copy link
Contributor

@jdetter jdetter commented Aug 29, 2016

This will fix build issues on Follis which will fix most of the Jenkins issues right now. This also includes the make install fix #160 and also the nullptr compatibility issue #162.

This was referenced Aug 29, 2016
@jdetter jdetter changed the title CMake and fixes for Jenkins CMake fixes and build fixes for follis Aug 29, 2016
@jdetter jdetter added the bug label Aug 29, 2016
@jdetter jdetter added this to the Release 9.2.1 milestone Aug 29, 2016
@jdetter
Copy link
Contributor Author

jdetter commented Aug 29, 2016

Dyninst build finally passing again, test_pt_ls is still a work in progress. I didn't have any time to look at it last week because I was working on this. I will be looking at test_pt_ls the rest of today and tomorrow.

@wrwilliams and other admins, ok to merge?

@jdetter
Copy link
Contributor Author

jdetter commented Aug 29, 2016

I'm actually having weird CMake issues with this after a clean clone/build. I'm not sure why this isn't reflected in the jenkins.

@jdetter jdetter changed the title CMake fixes and build fixes for follis CMake fixes and build fixes for follis -- not ready for merge Aug 29, 2016
@cuviper
Copy link
Contributor

cuviper commented Aug 30, 2016

I appreciate the conditional cotire. Can we also guard this on CMake version? The cotire.cmake mandates 2.8.12, but RHEL7 has only 2.8.11 -- yet a new enough GCC to pass your test.

@jdetter
Copy link
Contributor Author

jdetter commented Aug 30, 2016

Yup I can add that as well!

@jdetter jdetter changed the title CMake fixes and build fixes for follis -- not ready for merge CMake fixes for Cotie and GCC 4.4 compatibility Aug 31, 2016
@jdetter
Copy link
Contributor Author

jdetter commented Aug 31, 2016

I have tested this on all versions of GCC that the CSL provides. It looks like we need to disable Cotire up to GCC version 4.5.0. Cotire is also disabled if the CMake version isn't at lease 2.8.12.

Cotire also only supports GNU, Intel and Clang compilers on Linux. I didn't mess with changing the Cotire configuration for Windows because it looks like the Cotire support for Windows is pretty good.

This is ready for a merge whenever someone thinks it's ready.

@jdetter
Copy link
Contributor Author

jdetter commented Sep 1, 2016

@wrwilliams can this be merged in?

@wrwilliams
Copy link
Member

Looks clean to me. Any objections/observed regressions from @cuviper?

@cuviper
Copy link
Contributor

cuviper commented Sep 1, 2016

Works for me.

@wrwilliams wrwilliams merged commit 69783ea into master Sep 2, 2016
@mxz297 mxz297 deleted the release9.2/fixes/jenkins-fix branch January 31, 2019 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make install not working on latest master
3 participants