[146903] trunk/dports/devel/libdynd

[stromnov at macports.org]

Revision: 146903
          https://trac.macports.org/changeset/146903
Author:   stromnov at macports.org
Date:     2016-03-20 07:07:23 -0700 (Sun, 20 Mar 2016)
Log Message:
-----------
libdynd: update to version 0.7.2

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-03-20 08:40:17 UTC (rev 146902)
+++ trunk/dports/devel/libdynd/Portfile	2016-03-20 14:07:23 UTC (rev 146903)
@@ -4,11 +4,10 @@
 PortSystem          1.0
 PortGroup           github 1.0
 PortGroup           cmake 1.0
-PortGroup           conflicts_build 1.0
 
-set git_sha1        b69e466d9b69deec9d4cbd7a6ef868fd5d176a1a
+set git_sha1        341d6d91931fdb04ad657d27ed740cf533fc925b
 
-github.setup        libdynd libdynd 0.7.1 v
+github.setup        libdynd libdynd 0.7.2 v
 
 categories          devel math
 platforms           darwin
@@ -19,8 +18,8 @@
 description         LibDyND is a C++ library for dynamic, multidimensional arrays.
 long_description    ${description}
 
-checksums           rmd160  3662665dba75d899c4c37201a9ebb2138e87bff7 \
-                    sha256  fcddc6bfe7e85aba440e0fd8d4fe0bd264b56f54cdb47f6921dc156d304a4179
+checksums           rmd160  58a444d46d348fddc6f4cf04669d301dbb47981e \
+                    sha256  7bc14b26537a0b5c0e8ad9d8b0143b94eab38917ca42082be44cfa0fbb605e01
 
 patchfiles-append   patch-CMakeLists.txt.diff
 
@@ -29,8 +28,6 @@
     reinplace "s|@@DYND_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt
 }
 
-conflicts_build     ${name}
-
 cmake.out_of_source yes
 
 configure.args-append \

Modified: trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2016-03-20 08:40:17 UTC (rev 146902)
+++ trunk/dports/devel/libdynd/files/patch-CMakeLists.txt.diff	2016-03-20 14:07:23 UTC (rev 146903)
@@ -1,7 +1,7 @@
---- 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)
+--- CMakeLists.txt.orig	2016-03-20 16:56:09.000000000 +0300
++++ CMakeLists.txt	2016-03-20 16:58:36.000000000 +0300
+@@ -100,10 +100,8 @@
+ #llvm_map_components_to_libnames(LLVM_LINK_LIBS core option target bitreader support profiledata codegen irreader linker instrumentation objcarcopts lto)
  
  # Get the git revision
 -include(GetGitRevisionDescriptionDyND)
@@ -13,11 +13,11 @@
  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)
+@@ -483,26 +481,6 @@
+ configure_file("include/dynd/cmake_config.hpp.in"
+                "${CMAKE_CURRENT_BINARY_DIR}/include/dynd/cmake_config.hpp")
+ 
+-if(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,
@@ -25,11 +25,18 @@
 -    #
 -    # See http://stackoverflow.com/questions/22885207/opencv-and-pcl-builds-on-osx-result-in-malformed-object-load-command-cmdsize
 -    #
+-    set_target_properties(libdyndt
+-        PROPERTIES
+-        BUILD_WITH_INSTALL_RPATH ON
+-        INSTALL_NAME_DIR "@rpath"
+-    )
 -    set_target_properties(libdynd
 -        PROPERTIES
 -        BUILD_WITH_INSTALL_RPATH ON
 -        INSTALL_NAME_DIR "@rpath"
 -    )
- endif()
- 
+-endif()
+-
  if (DYND_SHARED_LIB OR (NOT DYND_INSTALL_LIB))
+     # If we're not making an installable static library,
+     # link the sublibraries normally
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160320/150f44c3/attachment.html>