Commit 85083a195c82a04c3c3a9569d6b3078334a3bb81
1 parent
2fbb3e3a
Ignore errors in El Capitan post procssing (#1605)
Showing
3 changed files
with
4 additions
and
2 deletions
ChangeLog
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | ======================== | 4 | ======================== |
| 5 | 5 | ||
| 6 | Update end-user documentation | 6 | Update end-user documentation |
| 7 | + Ignore errors in El Capitan post processing (#1605) | ||
| 7 | Change GException to RuntimeError in cscripts (#1604) | 8 | Change GException to RuntimeError in cscripts (#1604) |
| 8 | Adapt to GammaLib interface changs (#1603) | 9 | Adapt to GammaLib interface changs (#1603) |
| 9 | Implement handling of stacked data in csspec (#1566) | 10 | Implement handling of stacked data in csspec (#1566) |
NEWS
| @@ -17,7 +17,8 @@ version 1.0.0 or above. | @@ -17,7 +17,8 @@ version 1.0.0 or above. | ||
| 17 | A special post processing of the Python module libraries has been added for | 17 | A special post processing of the Python module libraries has been added for |
| 18 | Mac OS X 10.11 and higher (El Capitan). This post processing is a replacement for | 18 | Mac OS X 10.11 and higher (El Capitan). This post processing is a replacement for |
| 19 | setting DYLD_LIBRARY_PATH during unit testing since the environment variable is | 19 | setting DYLD_LIBRARY_PATH during unit testing since the environment variable is |
| 20 | -ignored in certain circumstances by El Capitan. | 20 | +ignored in certain circumstances by El Capitan. Any errors that occur in the |
| 21 | +post-processing will be ignored. | ||
| 21 | 22 | ||
| 22 | 23 | ||
| 23 | 3. Python interface | 24 | 3. Python interface |
pyext/Makefile.am
| @@ -95,7 +95,7 @@ all-local: build | @@ -95,7 +95,7 @@ all-local: build | ||
| 95 | build: ctools/tools_wrap.cpp ctools/tools.py | 95 | build: ctools/tools_wrap.cpp ctools/tools.py |
| 96 | $(PYTHON) setup.py build | 96 | $(PYTHON) setup.py build |
| 97 | if IS_ELCAPITAN | 97 | if IS_ELCAPITAN |
| 98 | - for f in build/ctools/ctools/_*.so; do \ | 98 | + -for f in build/ctools/ctools/_*.so; do \ |
| 99 | echo "Post process module "$$f; \ | 99 | echo "Post process module "$$f; \ |
| 100 | install_name_tool -change $(libdir)/libctools.0.dylib @rpath/libctools.0.dylib $$f; \ | 100 | install_name_tool -change $(libdir)/libctools.0.dylib @rpath/libctools.0.dylib $$f; \ |
| 101 | install_name_tool -change $(libdir)/libgamma.0.dylib @rpath/libgamma.0.dylib $$f; \ | 101 | install_name_tool -change $(libdir)/libgamma.0.dylib @rpath/libgamma.0.dylib $$f; \ |