Maria Haupt / gammalib

Commit 2fb709915280917c6884d018c646230a644a2c6a

Authored by Jürgen Knödlseder
1 parent 22be105e

Solve Anaconda compatability problem (fix #1607).

Inline Side-by-side
Showing 4 changed files with 13 additions and 10 deletions
ChangeLog
  View file @2fb7099
1 -2016-01-04 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu> 1 +2016-01-05 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
2 2
3 * Bug fix version 1.0.1 released 3 * Bug fix version 1.0.1 released
4 ================================ 4 ================================
5 5
6 Allow usage of numbers in FITS extension names (#1611) 6 Allow usage of numbers in FITS extension names (#1611)
  7 + Solve compatibility issues with Anaconda on Mac OS X (#1607)
7 8
8 9
9 2015-12-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu> 10 2015-12-18 Juergen Knoedlseder <jurgen.knodlseder@irap.omp.eu>
@@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 1.0.1 @@ -2,7 +2,7 @@ New Features and Important Changes in GammaLib 1.0.1
2 2
3 Author(s) : Juergen Knoedlseder 3 Author(s) : Juergen Knoedlseder
4 4
5 -4 January 2016 5 +5 January 2016
6 6
7 7
8 1. Introduction 8 1. Introduction
@@ -18,7 +18,11 @@ None @@ -18,7 +18,11 @@ None
18 18
19 3. Configuration 19 3. Configuration
20 ----------------- 20 -----------------
21 -None 21 +If GammaLib is compiled on Mavericks (Mac OS X 10.9) or newer but Python has been
  22 +compiled for an earlier deployment target, a compatibility issue arises due to the
  23 +way how class names are mangled by the compiler. This is now automatically detected
  24 +and fixed, which should solve some compatibility issues that have been encountered
  25 +by user using the Anaconda package on Mac OS X.
22 26
23 27
24 4. Application module 28 4. Application module
1 GammaLib information 1 GammaLib information
2 ==================== 2 ====================
3 -Version: 1.0.1 (4 January 2016) 3 +Version: 1.0.1 (5 January 2016)
4 Author: Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu) 4 Author: Juergen Knoedlseder (jurgen.knodlseder@irap.omp.eu)
5 5
6 6
configure.ac
  View file @2fb7099
@@ -918,12 +918,10 @@ else @@ -918,12 +918,10 @@ else
918 AC_MSG_RESULT(${python_target}) 918 AC_MSG_RESULT(${python_target})
919 if [ test $python_compact_target -le 108 ]; then 919 if [ test $python_compact_target -le 108 ]; then
920 CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target" 920 CONFIGURE_MACOSX_DEPLOYMENT_TARGET="$python_target"
921 - MACOSX_DEPLOYMENT_TARGET="$python_target"  
922 - export MACOSX_DEPLOYMENT_TARGET  
923 - EXPORT_MACOSX_DEPLOYMENT_TARGET=''  
924 - CPPFLAGS="-stdlib=libstdc++ -mmacosx-version-min=${python_target} ${CPPFLAGS}"  
925 - LDFLAGS="-stdlib=libstdc++ -mmacosx-version-min=${python_target} ${LDFLAGS}"  
926 - CXXFLAGS="-stdlib=libstdc++ -mmacosx-version-min=${python_target} ${CXXFLAGS}" 921 + MACOSX_DEPLOYMENT_TARGET="$python_target"
  922 + export MACOSX_DEPLOYMENT_TARGET
  923 + EXPORT_MACOSX_DEPLOYMENT_TARGET=''
  924 + LIBS="${LIBS} -lstdc++"
927 AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}]) 925 AC_MSG_NOTICE([set MACOSX_DEPLOYMENT_TARGET to ${python_target}])
928 fi 926 fi
929 ;; 927 ;;