Re: [macports-ports] branch master updated: htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: [macports-ports] branch master updated: htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports

Ryan Schmidt-24

On Apr 8, 2018, at 20:51, Leo Singer wrote:

> Leo Singer (lpsinger) pushed a commit to branch master
> in repository macports-ports.
>
>
> https://github.com/macports/macports-ports/commit/6883f8674bafaadcbd8e0fa1dffaa385652da16d
>
> The following commit(s) were added to refs/heads/master by this push:
>
>      new 6883f86  htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports
>
> 6883f86 is described below
>
>
> commit 6883f8674bafaadcbd8e0fa1dffaa385652da16d
>
> Author: Leo Singer <leo.singer@[...]>
> AuthorDate: Sun Apr 8 21:51:19 2018 -0400

Remember to configure your git client to use your MacPorts project email address to identify your commits:

https://trac.macports.org/wiki/WorkingWithGit#setup


>     htcondor: update to 8.7.7, add Python 3.5 and 3.6 subports
>
> ---
>  science/htcondor/Portfile                          | 23 +++++++++++++---------
>  ...atch-build-cmake-CondorPackageConfig.cmake.diff | 11 +++++++++++
>  ...tch-src-condor_scripts-macosx_rewrite_libs.diff | 10 +++++-----
>  .../patch-src-python-bindings-CMakeLists.txt.diff  | 10 +++++-----
>  4 files changed, 35 insertions(+), 19 deletions(-)

>          post-patch {
>              reinplace \"s|@prefix@|${prefix}|g\" ${worksrcpath}/src/condor_utils/condor_config.cpp
> -            reinplace \"s|@python@|${f}/bin/python${v}|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
> +            reinplace \"s|@c_pythonarchlib@|Library/Frameworks/Python.framework/Versions/${v}/lib/python${v}/site-packages|g\" ${worksrcpath}/build/cmake/CondorPackageConfig.cmake
>          }

> +--- build/cmake/CondorPackageConfig.cmake.orig 2018-04-08 15:08:04.000000000 -0400
> ++++ build/cmake/CondorPackageConfig.cmake 2018-04-08 15:08:19.000000000 -0400
> +@@ -125,7 +125,7 @@
> + set( C_LIBEXEC libexec )
> + set( C_SBIN sbin)
> +
> +-set( C_PYTHONARCHLIB lib/python)
> ++set( C_PYTHONARCHLIB @c_pythonarchlib@)


You shouldn't assume frameworks are in Library/Frameworks; the user is allowed to change that. You should use the ${frameworks_dir} variable instead, except that ${frameworks_dir} is an absolute path (default value /opt/local/Library/Frameworks) whereas in this reinplace you're currently using a relative path. I'm not sure if C_PYTHONARCHLIB can accommodate an absolute path here without some modification. Specifically, it looks like in src/python-bindings/CMakeLists.txt

\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${C_PYTHONARCHLIB}

will need to be changed to

\$ENV{DESTDIR}${C_PYTHONARCHLIB}