mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Gerard SoleandZero King
3624e5135a
Port for caffe was old (2015), so this commit upgrades its source to current master stable. It updates required patches so library will install successfuly. Dynamic libraries are amended, so they will point to the correct libcaffe. Current Port, has an issue with python and caffe, that requires manual recolocation of affected library. Also, tests are added for both library and python module.
44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
--- Makefile.config.orig 2017-08-24 10:43:43.000000000 +0900
|
|
+++ Makefile.config 2017-08-24 10:43:54.000000000 +0900
|
|
@@ -18,7 +18,7 @@
|
|
# ALLOW_LMDB_NOLOCK := 1
|
|
|
|
# Uncomment if you're using OpenCV 3
|
|
-# OPENCV_VERSION := 3
|
|
+OPENCV_VERSION := 3
|
|
|
|
# To customize your choice of compiler, uncomment and set the following.
|
|
# N.B. the default for Linux is g++ and the default for OSX is clang++
|
|
@@ -65,8 +65,9 @@
|
|
|
|
# NOTE: this is required only if you will compile the python interface.
|
|
# We need to be able to find Python.h and numpy/arrayobject.h.
|
|
-PYTHON_INCLUDE := /usr/include/python2.7 \
|
|
- /usr/lib/python2.7/dist-packages/numpy/core/include
|
|
+_PYTHON_ROOT := $(_PREFIX)/Library/Frameworks/Python.framework/Versions/2.7
|
|
+PYTHON_INCLUDE := $(_PYTHON_ROOT)/include/python2.7 \
|
|
+ $(_PYTHON_ROOT)/lib/python2.7/site-packages/numpy/core/include
|
|
# Anaconda Python distribution is quite popular. Include path:
|
|
# Verify anaconda location, sometimes it's in root.
|
|
# ANACONDA_HOME := $(HOME)/anaconda
|
|
@@ -80,7 +81,7 @@
|
|
# /usr/lib/python3.5/dist-packages/numpy/core/include
|
|
|
|
# We need to be able to find libpythonX.X.so or .dylib.
|
|
-PYTHON_LIB := /usr/lib
|
|
+PYTHON_LIB := $(_PREFIX)/lib
|
|
# PYTHON_LIB := $(ANACONDA_HOME)/lib
|
|
|
|
# Homebrew installs numpy in a non standard path (keg only)
|
|
@@ -91,8 +92,8 @@
|
|
# WITH_PYTHON_LAYER := 1
|
|
|
|
# Whatever else you find you need goes here.
|
|
-INCLUDE_DIRS := $(PYTHON_INCLUDE) /usr/local/include
|
|
-LIBRARY_DIRS := $(PYTHON_LIB) /usr/local/lib /usr/lib
|
|
+INCLUDE_DIRS := $(PYTHON_INCLUDE) $(_PREFIX)/include /usr/include
|
|
+LIBRARY_DIRS := $(PYTHON_LIB) /usr/lib
|
|
|
|
# If Homebrew is installed at a non standard location (for example your home directory) and you use it for general dependencies
|
|
# INCLUDE_DIRS += $(shell brew --prefix)/include
|