aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/patches
diff options
context:
space:
mode:
authorRaul Infante-Sainz <infantesainz@gmail.com>2020-04-06 09:12:47 +0100
committerRaul Infante-Sainz <infantesainz@gmail.com>2020-04-06 09:13:59 +0100
commitd0a51f78d4705c2496c42a02c49b0bc70e931cf7 (patch)
tree83def4052a9d09f2353188def28653313ea6c4c0 /reproduce/software/patches
parent647ce436871b5b692fa07ff166b731f72dff8bf8 (diff)
Astropy now depending on the Expat library to fix internal conflict
Until now, Astropy was instructed to build its own internal copy of the Expat library. However, with the recent commits before, Maneage now includes an installation of Expat and Astropy can't keep the two (its internal version and the project's version) separate, so they conflict and don't let Astropy get built. With this commit, the problem is fixed by setting the Expat library as an explicit dependency of Astropy and asking Astropy to ignore its internal copy. While doing this, I recognized that it is much easier and elegant to add steps in various stages of the `pybuild' function through hooks instead of variables. So the fifth argument of the `pybuild' function was removed and now it actually checks if hooks are defined as functions and if so, they will be called. The `pyhook_after' function was also implemented in the installation of `pybind11' (which needed it, given that the 5th argument of `pybuild' was removed) and after doing a test-build, I noticed that two lines were not ending with a `\' in `boost' (a dependency of `pybind11'). Commit written originally by Mohammad Akghlaghi
Diffstat (limited to 'reproduce/software/patches')
0 files changed, 0 insertions, 0 deletions