[145622] trunk/dports/devel/libdynd

stromnov at macports.org stromnov at macports.org
Thu Feb 11 04:53:00 PST 2016


Revision: 145622
          https://trac.macports.org/changeset/145622
Author:   stromnov at macports.org
Date:     2016-02-11 04:53:00 -0800 (Thu, 11 Feb 2016)
Log Message:
-----------
libdynd: update to version 0.7.1

Modified Paths:
--------------
    trunk/dports/devel/libdynd/Portfile
    trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/devel/libdynd/Portfile
===================================================================
--- trunk/dports/devel/libdynd/Portfile	2016-02-11 12:22:07 UTC (rev 145621)
+++ trunk/dports/devel/libdynd/Portfile	2016-02-11 12:53:00 UTC (rev 145622)
@@ -6,9 +6,9 @@
 PortGroup           cmake 1.0
 PortGroup           conflicts_build 1.0
 
-set git_sha1        09fb7e5eccadbe1ec49ff4b05fec724939331e6d
+set git_sha1        b69e466d9b69deec9d4cbd7a6ef868fd5d176a1a
 
-github.setup        ContinuumIO libdynd 0.6.6 v
+github.setup        libdynd libdynd 0.7.1 v
 
 categories          devel math
 platforms           darwin
@@ -19,10 +19,10 @@
 description         LibDyND is a C++ library for dynamic, multidimensional arrays.
 long_description    ${description}
 
-checksums           rmd160  27c236c4c9f63dd2739e6894b045201af8bbd159 \
-                    sha256  2851532af12dc77516284ed629869fd5f6d37d6f86725ae4255e7972800b22ff
+checksums           rmd160  3662665dba75d899c4c37201a9ebb2138e87bff7 \
+                    sha256  fcddc6bfe7e85aba440e0fd8d4fe0bd264b56f54cdb47f6921dc156d304a4179
 
-patchfiles          patch-CMakeLists.txt.diff
+patchfiles-append   patch-CMakeLists.txt.diff
 
 post-patch {
     reinplace "s|@@DYND_GIT_SHA1@@|${git_sha1}|g" ${worksrcpath}/CMakeLists.txt
@@ -31,16 +31,13 @@
 
 conflicts_build     ${name}
 
-configure.dir       ${worksrcpath}/build
-build.dir           ${configure.dir}
-pre-configure {
-    file mkdir ${configure.dir}
-}
+cmake.out_of_source yes
 
 configure.args-append \
-                    ../ \
-                    -DDYND_CUDA=OFF \
-                    -DDYND_SHARED_LIB=ON \
-                    -DDYND_INSTALL_LIB=ON \
-                    -DUSE_RELATIVE_RPATH=OFF \
-                    -DDYND_BUILD_TESTS=OFF
+                    -DDYND_SHARED_LIB:BOOL=ON \
+                    -DDYND_CUDA:BOOL=OFF \
+                    -DDYND_FFTW:BOOL=OFF \
+                    -DDYND_LLVM:BOOL=OFF \
+                    -DDYND_INSTALL_LIB:BOOL=ON \
+                    -DDYND_BUILD_TESTS:BOOL=OFF \
+                    -DDYND_BUILD_BENCHMARKS:BOOL=OFF

Modified: trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2016-02-11 12:22:07 UTC (rev 145621)
+++ trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2016-02-11 12:53:00 UTC (rev 145622)
@@ -1,16 +1,7 @@
---- CMakeLists.txt.orig	2014-07-10 18:55:30.000000000 +0400
-+++ CMakeLists.txt	2014-07-10 18:57:41.000000000 +0400
-@@ -88,7 +88,7 @@
-         endif ()
-     endif()
- else()
--    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Werror -Wno-missing-field-initializers")
-+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Wno-missing-field-initializers")
-     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-         # The '-fmax-errors' flag was first supported in gcc 4.6
-         if (NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.6")
-@@ -120,10 +120,9 @@
- endif()
+--- CMakeLists.txt.orig	2016-02-03 21:18:25.000000000 +0300
++++ CMakeLists.txt	2016-02-04 14:39:51.000000000 +0300
+@@ -115,10 +115,8 @@
+ set(DYND_LINK_LIBS cephes datetime)
  
  # Get the git revision
 -include(GetGitRevisionDescriptionDyND)
@@ -19,7 +10,26 @@
 -             --dirty --always --match "v*")
 +SET(DYND_GIT_SHA1 "@@DYND_GIT_SHA1@@")
 +SET(DYND_VERSION_STRING "@@DYND_VERSION_STRING@@")
-+
  message(STATUS "DyND version: ${DYND_VERSION_STRING}")
  configure_file(
      "${CMAKE_CURRENT_SOURCE_DIR}/src/dynd/git_version.cpp.in"
+@@ -621,19 +619,6 @@
+         PREFIX "lib"
+         IMPORT_PREFIX "lib"
+         )
+-elseif(APPLE)
+-    # The rpath stuff is confusing, and this is our attempt to get it right.
+-    # It's been complicated by a bug in certain versions of CMake that plays
+-    # particularly badly with CUDA. If anyone knows the "right" way to do this,
+-    # that would be great.
+-    #
+-    # See http://stackoverflow.com/questions/22885207/opencv-and-pcl-builds-on-osx-result-in-malformed-object-load-command-cmdsize
+-    #
+-    set_target_properties(libdynd
+-        PROPERTIES
+-        BUILD_WITH_INSTALL_RPATH ON
+-        INSTALL_NAME_DIR "@rpath"
+-    )
+ endif()
+ 
+ if (DYND_SHARED_LIB OR (NOT DYND_INSTALL_LIB))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160211/c9c7fee1/attachment.html>


More information about the macports-changes mailing list