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

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

caffe: update to 20150418

File size: 1.6 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##############################
     
    232232# clang++ instead of g++
    233233# libstdc++ for NVCC compatibility on OS X >= 10.9 with CUDA < 7.0
    234234ifeq ($(OSX), 1)
    235         CXX := /usr/bin/clang++
     235        CXX ?= /usr/bin/clang++
    236236        ifneq ($(CPU_ONLY), 1)
    237237                CUDA_VERSION := $(shell $(CUDA_DIR)/bin/nvcc -V | grep -o 'release \d' | grep -o '\d')
    238238                ifeq ($(shell echo $(CUDA_VERSION) \< 7.0 | bc), 1)
     
    341341
    342342# Complete build flags.
    343343COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir))
    344 CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS)
     344CXXFLAGS += $(_CXXFLAGS) $(COMMON_FLAGS) $(WARNINGS)
    345345NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS)
    346346# mex may invoke an older gcc that is too liberal with -Wuninitalized
    347347MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized
     
    540540# Target for extension-less symlinks to tool binaries with extension '*.bin'.
    541541$(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
    542542        @ $(RM) $@
    543         @ ln -s $(abspath $<) $@
     543        @ cd $(TOOL_BUILD_DIR); ln -s $(notdir $<) $(notdir $@)
    544544
    545545$(TOOL_BINS): %.bin : %.o | $(DYNAMIC_NAME)
    546546        @ echo CXX/LD -o $@
Note: See TracBrowser for help on using the repository browser.