source: trunk/dports/math/caffe/files/patch-Makefile.diff @ 133390

Last change on this file since 133390 was 133390, checked in by hum@…, 5 years ago

caffe: update to 20150228

File size: 2.0 KB
  • Makefile

    old new  
    162162        LIBRARIES := cudart cublas curand
    163163endif
    164164LIBRARIES += glog gflags protobuf leveldb snappy \
    165         lmdb boost_system hdf5_hl hdf5 m \
     165        lmdb boost_system-mt hdf5_hl hdf5 m \
    166166        opencv_core opencv_highgui opencv_imgproc
    167 PYTHON_LIBRARIES := boost_python python2.7
     167PYTHON_LIBRARIES := boost_python-mt python2.7
    168168WARNINGS := -Wall -Wno-sign-compare
    169169
    170170##############################
     
    231231# clang++ instead of g++
    232232# libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
    233233ifeq ($(OSX), 1)
    234         CXX := /usr/bin/clang++
    235         CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
    236         ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
    237                 CXXFLAGS += -stdlib=libstdc++
    238                 LINKFLAGS += -stdlib=libstdc++
    239         endif
     234        CXX ?= /usr/bin/clang++
     235#       CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
     236#       ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
     237#               CXXFLAGS += -stdlib=libstdc++
     238#               LINKFLAGS += -stdlib=libstdc++
     239#       endif
    240240        # clang throws this warning for cuda headers
    241241        WARNINGS += -Wno-unneeded-internal-declaration
    242242        # gtest needs to use its own tuple to not conflict with clang
     
    338338
    339339# Complete build flags.
    340340COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
    341 CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
     341CXXFLAGS += $(_CXXFLAGS) $(COMMON_FLAGS) $(WARNINGS)
    342342NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
    343343# mex may invoke an older gcc that is too liberal with -Wuninitalized
    344344MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
     
    537537# Target for extension-less symlinks to tool binaries with extension '*.bin'.
    538538$(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
    539539        @ $(RM) $@
    540         @ ln -s $(abspath $<) $@
     540        @ cd $(TOOL_BUILD_DIR); ln -s $(notdir $<) $(notdir $@)
    541541
    542542$(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
    543543        @ echo CXX/LD -o $@
Note: See TracBrowser for help on using the repository browser.