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

DM-23835: Support conda compilers and conda third parties #76

Merged
merged 27 commits into from Apr 30, 2020

Conversation

brianv0
Copy link
Contributor

@brianv0 brianv0 commented Apr 24, 2020

This PR adds cfg files for third parties in the config directory.

It also contains logic to support those config files.

In addition, it has additional support for CONDA_BUILD_SYSROOT for the conda compilers, especially on macOS, and it will prefer using conda compilers if it encounters CONDA_BUILD_SYSROOT

(cherry picked from commit bbb8eb2)
@brianv0 brianv0 requested review from timj and gcomoretto April 24, 2020 22:04
Copy link
Member

@timj timj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configurePython method has no explanation as to why it exists or what it does or how it's doing it. It needs some tidying up.

python/lsst/sconsUtils/dependencies.py Outdated Show resolved Hide resolved
python/lsst/sconsUtils/dependencies.py Outdated Show resolved Hide resolved
python/lsst/sconsUtils/dependencies.py Outdated Show resolved Hide resolved
python/lsst/sconsUtils/dependencies.py Outdated Show resolved Hide resolved
python/lsst/sconsUtils/dependencies.py Outdated Show resolved Hide resolved
ups/sconsUtils.table Outdated Show resolved Hide resolved
gcomoretto and others added 20 commits April 27, 2020 10:26
Added RPATH and _RPATH
Added platform check for rpath
Added /usr/lib to LIBPATH
Cleanup config strategy in dependencies.py
(cherry picked from commit 8ea99a0)
(cherry picked from commit b27c020)
(cherry picked from commit fd53b11)
(cherry picked from commit 26c5f50)
(cherry picked from commit 8d76b84)
(cherry picked from commit 6c60b75)
(cherry picked from commit 04681ed)
(cherry picked from commit acb9aca)
(cherry picked from commit 74ec0aa)
(cherry picked from commit e182b37)
(cherry picked from commit 445f6cc)
(cherry picked from commit b2fd8de8f052360cb9f3438233c1f6f11ae4c413)
(cherry picked from commit a1efdfc1ee09e99b489540974ce68710ed8a87ef)
(cherry picked from commit 3f81ead68fc693be95842f42c85e4ec0e803cadd)
(cherry picked from commit 713be2950d6e2712fc5c7d88de9becac4d6290c0)
(cherry picked from commit 3a59533)
(cherry picked from commit 8ae2a03)
(cherry picked from commit 485cc9d)
(cherry picked from commit c7eabe1)

(cherry picked from commit f7712cb)
(cherry picked from commit df93a7e76a60aedc6636b56a0c7e1b78bffc927e)
(cherry picked from commit 0ba9545)
(cherry picked from commit 6a77d6c36921e9ec87168017d81b527f288579dc)
(cherry picked from commit fd14d50)
(cherry picked from commit d2c0397e815c3c712af3cf3d9684629ee782bc09)
(cherry picked from commit 4c0cbb4)
(cherry picked from commit 53d5a01a8c543b1006175a0d381cebb51c42770e)
(cherry picked from commit a4651ca)
(cherry picked from commit c58a830ce48fa7395a76492626b384c38fa12522)
(cherry picked from commit 0c1fbb6)
(cherry picked from commit 68f1aad)
(cherry picked from commit fda53de)
(cherry picked from commit adb43fa)
(cherry picked from commit 830a15d)
(cherry picked from commit 2a6b0f2)
(cherry picked from commit 762f18a)
(cherry picked from commit b629a20)
(cherry picked from commit 17aee87)
(cherry picked from commit 0bc8c03)
(cherry picked from commit df93a7e76a60aedc6636b56a0c7e1b78bffc927e)
(cherry picked from commit 0ba9545)
@brianv0 brianv0 force-pushed the tickets/DM-23835 branch 2 times, most recently from 55884f0 to b064bf9 Compare April 27, 2020 18:08
@brianv0 brianv0 merged commit 1fb10ab into master Apr 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants