tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
2--- a/build/unix/compiledata.sh
3+++ b/build/unix/compiledata.sh
4@@ -49,7 +49,7 @@ fi
5
6 if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
7 [ "$ARCH" = "macosxicc" ]; then
8- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
9+ macosx_minor=7
10 SOEXT="so"
11 if [ $macosx_minor -ge 5 ]; then
12 if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
13diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
14--- a/cmake/modules/SetUpMacOS.cmake
15+++ b/cmake/modules/SetUpMacOS.cmake
16@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
17 #---------------------------------------------------------------------------------------------------------
18
19 if (CMAKE_SYSTEM_NAME MATCHES Darwin)
20- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
21- COMMAND cut -d . -f 1-2
22- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
23- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
24- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
25- COMMAND cut -d . -f 2
26- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
27-
28- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
29 set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
30- endif()
31
32- if(${MACOSX_MINOR} GREATER 4)
33 #TODO: check haveconfig and rpath -> set rpath true
34 #TODO: check Thread, define link command
35 #TODO: more stuff check configure script
36- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
37- if(${SYSCTL_OUTPUT} MATCHES 64)
38- MESSAGE(STATUS "Found a 64bit system")
39 set(ROOT_ARCHITECTURE macosx64)
40 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
41 SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
42@@ -38,28 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
43 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
44 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
45 SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64")
46- else(${SYSCTL_OUTPUT} MATCHES 64)
47- MESSAGE(STATUS "Found a 32bit system")
48- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
49- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
50- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32")
51- endif(${SYSCTL_OUTPUT} MATCHES 64)
52- endif()
53-
54- if(MACOSX_VERSION VERSION_GREATER 10.6)
55- set(MACOSX_SSL_DEPRECATED ON)
56- endif()
57- if(MACOSX_VERSION VERSION_GREATER 10.7)
58- set(MACOSX_ODBC_DEPRECATED ON)
59- endif()
60- if(MACOSX_VERSION VERSION_GREATER 10.8)
61- set(MACOSX_GLU_DEPRECATED ON)
62- set(MACOSX_KRB5_DEPRECATED ON)
63- set(MACOSX_TMPNAM_DEPRECATED ON)
64- endif()
65- if(MACOSX_VERSION VERSION_GREATER 10.9)
66- set(MACOSX_LDAP_DEPRECATED ON)
67- endif()
68
69 if (CMAKE_COMPILER_IS_GNUCXX)
70 message(STATUS "Found GNU compiler collection")
71@@ -132,7 +96,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
72 endif()
73
74 #---Set Linker flags----------------------------------------------------------------------
75- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
76+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
77
78
79 else (CMAKE_SYSTEM_NAME MATCHES Darwin)
80diff --git a/config/root-config.in b/config/root-config.in
81--- a/config/root-config.in
82+++ b/config/root-config.in
83@@ -391,7 +391,7 @@ macosxicc)
84 ;;
85 macosx64)
86 # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
87- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
88+ macosx_minor=7
89 # cannot find the one linked to libGraf if relocated after built
90 if [ $macosx_minor -le 4 ]; then
91 rootlibs="$rootlibs -lfreetype"
92diff --git a/cint/ROOT/CMakeLists.txt b/cint/ROOT/CMakeLists.txt
93--- a/cint/ROOT/CMakeLists.txt
94+++ b/cint/ROOT/CMakeLists.txt
95@@ -232,9 +232,7 @@ foreach(_name ${CINTINCDLLNAMES})
96 DEPENDS ${HEADER_OUTPUT_PATH}/systypes.h
97 )
98
99- if(MACOSX_MINOR GREATER 4)
100 set(_ExtraFlag "-D__DARWIN_UNIX03")
101- endif()
102
103 add_custom_command(OUTPUT ${OutFileName}
104 COMMAND cint_tmp -K -w1 -z${_name} -n${OutFileName} -D__MAKECINT__ -DG__MAKECINT ${_ExtraFlag} -c-2 -Z0 ${InFileName} ${AdditionalHeaderFiles} ${CMAKE_BINARY_DIR}/cint/cint/include/sys/types.h ${CMAKE_SOURCE_DIR}/cint/cint/lib/posix/posix.h