[145624] trunk/dports/python/py-dynd
stromnov at macports.org
stromnov at macports.org
Thu Feb 11 04:55:16 PST 2016
Revision: 145624
https://trac.macports.org/changeset/145624
Author: stromnov at macports.org
Date: 2016-02-11 04:55:16 -0800 (Thu, 11 Feb 2016)
Log Message:
-----------
py-dynd: update to version 0.7.1
Modified Paths:
--------------
trunk/dports/python/py-dynd/Portfile
trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff
Added Paths:
-----------
trunk/dports/python/py-dynd/files/patch-setup.py.diff
Modified: trunk/dports/python/py-dynd/Portfile
===================================================================
--- trunk/dports/python/py-dynd/Portfile 2016-02-11 12:55:13 UTC (rev 145623)
+++ trunk/dports/python/py-dynd/Portfile 2016-02-11 12:55:16 UTC (rev 145624)
@@ -4,17 +4,17 @@
PortSystem 1.0
PortGroup github 1.0
PortGroup python 1.0
-PortGroup cmake 1.0
-set git_sha1 d7ec36c6f1beb0621d6037ab0953db7e4c1b9150
-github.setup ContinuumIO dynd-python 0.6.6 v
+set git_sha1 f64124857edaacbbdfb76c48f3410e277ee1475c
+github.setup libdynd dynd-python 0.7.1 v
+
name py-dynd
categories-append devel
platforms darwin
license BSD
-python.versions 27 34
+python.versions 27 34 35
maintainers stromnov openmaintainer
@@ -24,33 +24,26 @@
Python exposure of the DyND dynamic multi-dimensional \
array library.
-checksums rmd160 490f6540ae67ab98430e4e433b9278b8f63e9237 \
- sha256 edf9206ee883cbc2251b9be7e305a0f805731d145a00c4220ab1a959b7f15a3a
+checksums rmd160 f666bf5df98cfd0850521b2639cab78a47df0692 \
+ sha256 4e1dc70235cd0382f083e68aeaa544d4dde4739b66b7af5963599cdefffa8b5e
if {${name} ne ${subport}} {
+ depends_build-append \
+ port:py${python.version}-setuptools \
+ port:cmake
+
depends_lib-append port:libdynd \
port:py${python.version}-numpy \
port:py${python.version}-cython
- patchfiles-append patch-CMakeLists.txt.diff
+ patchfiles-append patch-CMakeLists.txt.diff \
+ patch-setup.py.diff
post-patch {
reinplace "s|@@DYND_PYTHON_GIT_SHA1@@|${git_sha1}|g" ${worksrcpath}/CMakeLists.txt
- reinplace "s|@@DYND_PYTHON_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt
+ reinplace "s|@@DYND_PYTHON_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt ${worksrcpath}/setup.py
+ reinplace "s|@@EXTRA_CMAKE_ARGS@@|-DCYTHON_EXECUTABLE=${prefix}/bin/cython-${python.branch}|g" ${worksrcpath}/setup.py
}
- use_configure yes
- configure.args-append \
- -DUSE_SEPARATE_LIBDYND=ON \
- -DUSE_RELATIVE_RPATH=OFF \
- -DPYTHON_EXECUTABLE=${prefix}/bin/python${python.branch} \
- -DCYTHON_EXECUTABLE=${prefix}/bin/cython-${python.branch}
-
- build.cmd make
- build.target all
-
- destroot.cmd make
- destroot.destdir DESTDIR=${destroot}
-
livecheck.type none
}
Modified: trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff 2016-02-11 12:55:13 UTC (rev 145623)
+++ trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff 2016-02-11 12:55:16 UTC (rev 145624)
@@ -1,6 +1,14 @@
---- CMakeLists.txt.orig 2014-05-12 14:00:52.000000000 +0400
-+++ CMakeLists.txt 2014-05-12 14:03:39.000000000 +0400
-@@ -86,8 +86,9 @@
+--- CMakeLists.txt.orig 2016-02-03 22:54:24.000000000 +0300
++++ CMakeLists.txt 2016-02-11 13:18:07.000000000 +0300
+@@ -32,7 +31,6 @@
+ # For the Git SHA1/version code
+ list(APPEND CMAKE_MODULE_PATH
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+-include(GetGitRevisionDescriptionDyND)
+
+ find_package(CUDA 6.5)
+ find_package(PythonInterp REQUIRED)
+@@ -91,8 +89,8 @@
endif()
# Get the git revision
@@ -8,16 +16,6 @@
-git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --always --match "v*")
+SET(DYND_PYTHON_GIT_SHA1 "@@DYND_PYTHON_GIT_SHA1@@")
+SET(DYND_PYTHON_VERSION_STRING "@@DYND_PYTHON_VERSION_STRING@@")
-+
message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
-@@ -102,7 +103,7 @@
- # Treat warnings as errors (-WX does this)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -WX -EHsc")
- else()
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Werror")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra")
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- # The '-fmax-errors' flag was first supported in gcc 4.6
- # Use the c++0x flag only in 4.6 and later
+ "${CMAKE_CURRENT_SOURCE_DIR}/dynd/src/git_version.cpp.in"
Added: trunk/dports/python/py-dynd/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-dynd/files/patch-setup.py.diff (rev 0)
+++ trunk/dports/python/py-dynd/files/patch-setup.py.diff 2016-02-11 12:55:16 UTC (rev 145624)
@@ -0,0 +1,32 @@
+--- setup.py.orig 2016-02-11 10:11:17.000000000 +0300
++++ setup.py 2016-02-11 14:46:18.000000000 +0300
+@@ -40,7 +40,7 @@
+
+ def initialize_options(self):
+ build_ext.initialize_options(self)
+- self.extra_cmake_args = ''
++ self.extra_cmake_args = '@@EXTRA_CMAKE_ARGS@@'
+
+ def run(self):
+ # We don't call the origin build_ext, instead ignore that
+@@ -82,7 +82,8 @@
+ build_tests_option = '-DDYND_BUILD_TESTS=OFF'
+
+ if sys.platform != 'win32':
+- cmake_command = ['cmake', self.extra_cmake_args, pyexe_option,
++ extra_cmake_args = shlex.split(self.extra_cmake_args)
++ cmake_command = ['cmake'] + extra_cmake_args + [pyexe_option,
+ install_lib_option, build_tests_option,
+ static_lib_option, source]
+
+@@ -166,9 +167,7 @@
+ import subprocess
+ return subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
+
+-# Get the version number to use from git
+-ver = check_output(['git', 'describe', '--dirty',
+- '--always', '--match', 'v*']).decode('ascii').strip('\n')
++ver = "@@DYND_PYTHON_VERSION_STRING@@"
+
+ # Same processing as in __init__.py
+ if '.' in ver:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160211/3f87e9cb/attachment.html>
More information about the macports-changes
mailing list