[135284] trunk/dports/math/caffe

[hum at macports.org]

Revision: 135284
          https://trac.macports.org/changeset/135284
Author:   hum at macports.org
Date:     2015-04-22 05:12:53 -0700 (Wed, 22 Apr 2015)
Log Message:
-----------
caffe: update to 20150418

Modified Paths:
--------------
    trunk/dports/math/caffe/Portfile
    trunk/dports/math/caffe/files/patch-Makefile.diff

Modified: trunk/dports/math/caffe/Portfile
===================================================================
--- trunk/dports/math/caffe/Portfile	2015-04-22 11:13:53 UTC (rev 135283)
+++ trunk/dports/math/caffe/Portfile	2015-04-22 12:12:53 UTC (rev 135284)
@@ -4,8 +4,8 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        BVLC caffe 4fba3daed38b70ef6b913db2546c8d26268279d3
-version             20150228
+github.setup        BVLC caffe c6414ea7cab5917c904729c87f786e0a5909475c
+version             20150418
 categories          math science
 maintainers         hum openmaintainer
 
@@ -16,8 +16,8 @@
 platforms           darwin
 license             BSD
 
-checksums           rmd160  811178e2b0ff3d7ded1197d203552fda3ae15f25 \
-                    sha256  26b4e30a398bf7d6d076108187d02e1536be1737061b47389897f8c932d3a7c6
+checksums           rmd160  1bc95d11cbc8ccbf3d4752895331e77e323b728c \
+                    sha256  a25ed9a4685b1dee010f24b9fc958d9f787c9c42d04bfc6882449c8085ca9435
 
 depends_lib-append  port:google-glog \
                     port:gflags \

Modified: trunk/dports/math/caffe/files/patch-Makefile.diff
===================================================================
--- trunk/dports/math/caffe/files/patch-Makefile.diff	2015-04-22 11:13:53 UTC (rev 135283)
+++ trunk/dports/math/caffe/files/patch-Makefile.diff	2015-04-22 12:12:53 UTC (rev 135284)
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-02-21 05:20:23.000000000 +0900
-+++ Makefile	2015-02-22 14:29:16.000000000 +0900
+--- Makefile.orig	2015-04-18 04:26:48.000000000 +0900
++++ Makefile	2015-04-18 21:21:56.000000000 +0900
 @@ -162,9 +162,9 @@
  	LIBRARIES := cudart cublas curand
  endif
@@ -12,26 +12,16 @@
  WARNINGS := -Wall -Wno-sign-compare
  
  ##############################
-@@ -231,12 +231,12 @@
+@@ -232,7 +232,7 @@
  # clang++ instead of g++
  # libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
  ifeq ($(OSX), 1)
 -	CXX := /usr/bin/clang++
--	CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
--	ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
--		CXXFLAGS += -stdlib=libstdc++
--		LINKFLAGS += -stdlib=libstdc++
--	endif
 +	CXX ?= /usr/bin/clang++
-+#	CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
-+#	ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
-+#		CXXFLAGS += -stdlib=libstdc++
-+#		LINKFLAGS += -stdlib=libstdc++
-+#	endif
- 	# clang throws this warning for cuda headers
- 	WARNINGS += -Wno-unneeded-internal-declaration
- 	# gtest needs to use its own tuple to not conflict with clang
-@@ -338,7 +338,7 @@
+ 	ifneq ($(CPU_ONLY), 1)
+ 		CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
+ 		ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
+@@ -341,7 +341,7 @@
  
  # Complete build flags.
  COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
@@ -40,7 +30,7 @@
  NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
  # mex may invoke an older gcc that is too liberal with -Wuninitalized
  MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
-@@ -537,7 +537,7 @@
+@@ -540,7 +540,7 @@
  # Target for extension-less symlinks to tool binaries with extension '*.bin'.
  $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
  	@ $(RM) $@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150422/d6f6fee5/attachment.html>