nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-24 14:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
5dd731b801
nixpkgs/pkgs/applications/science/misc/root/sw_vers.patch

91 lines
3.8 KiB
Diff
Raw Normal View History

root: add support for x86_64-darwin 1) add pcre dependency (for some reason builtin_pcre doesn't work) 2) Disable dependencies that are currently not supported by the expression. Most users should not need those. These are disabled to prevent cmake from picking them up from system and causing impurities. Once there is a user who needs these they will have to update the expression. 3) disable some OSX detection code that relies on /usr/bin/sw_vers that chooses c++ library, silences warnings and sets macosx-version-min. macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET environment variable.
2016-08-20 08:32:09 +00:00
diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
--- a/build/unix/compiledata.sh
+++ b/build/unix/compiledata.sh
@@ -49,7 +49,7 @@ fi
if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
[ "$ARCH" = "macosxicc" ]; then
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+ macosx_minor=7
SOEXT="so"
if [ $macosx_minor -ge 5 ]; then
if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
--- a/cmake/modules/SetUpMacOS.cmake
+++ b/cmake/modules/SetUpMacOS.cmake
@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
#---------------------------------------------------------------------------------------------------------
if (CMAKE_SYSTEM_NAME MATCHES Darwin)
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
- COMMAND cut -d . -f 1-2
- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
- COMMAND cut -d . -f 2
- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
- endif()
- if(${MACOSX_MINOR} GREATER 4)
#TODO: check haveconfig and rpath -> set rpath true
#TODO: check Thread, define link command
#TODO: more stuff check configure script
- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
- if(${SYSCTL_OUTPUT} MATCHES 64)
- MESSAGE(STATUS "Found a 64bit system")
set(ROOT_ARCHITECTURE macosx64)
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
root: 6.04.18 -> 6.08.02 This relies on e9d60c56 ('libc++3.7: fix to use with modern compilers')
2016-12-31 03:02:50 +00:00
SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
root: add support for x86_64-darwin 1) add pcre dependency (for some reason builtin_pcre doesn't work) 2) Disable dependencies that are currently not supported by the expression. Most users should not need those. These are disabled to prevent cmake from picking them up from system and causing impurities. Once there is a user who needs these they will have to update the expression. 3) disable some OSX detection code that relies on /usr/bin/sw_vers that chooses c++ library, silences warnings and sets macosx-version-min. macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET environment variable.
2016-08-20 08:32:09 +00:00
- else(${SYSCTL_OUTPUT} MATCHES 64)
- MESSAGE(STATUS "Found a 32bit system")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
root: 6.04.18 -> 6.08.02 This relies on e9d60c56 ('libc++3.7: fix to use with modern compilers')
2016-12-31 03:02:50 +00:00
- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
root: add support for x86_64-darwin 1) add pcre dependency (for some reason builtin_pcre doesn't work) 2) Disable dependencies that are currently not supported by the expression. Most users should not need those. These are disabled to prevent cmake from picking them up from system and causing impurities. Once there is a user who needs these they will have to update the expression. 3) disable some OSX detection code that relies on /usr/bin/sw_vers that chooses c++ library, silences warnings and sets macosx-version-min. macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET environment variable.
2016-08-20 08:32:09 +00:00
- endif(${SYSCTL_OUTPUT} MATCHES 64)
- endif()
-
- if(MACOSX_VERSION VERSION_GREATER 10.6)
- set(MACOSX_SSL_DEPRECATED ON)
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.7)
- set(MACOSX_ODBC_DEPRECATED ON)
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.8)
- set(MACOSX_GLU_DEPRECATED ON)
- set(MACOSX_KRB5_DEPRECATED ON)
- endif()
- if(MACOSX_VERSION VERSION_GREATER 10.9)
- set(MACOSX_LDAP_DEPRECATED ON)
- endif()
if (CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "Found GNU compiler collection")
@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
endif()
#---Set Linker flags----------------------------------------------------------------------
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
else (CMAKE_SYSTEM_NAME MATCHES Darwin)
diff --git a/config/root-config.in b/config/root-config.in
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -304,7 +304,7 @@ macosxicc)
;;
macosx64)
# MacOS X with gcc (GNU cc v4.x) in 64 bit mode
- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
+ macosx_minor=7
# cannot find the one linked to libGraf if relocated after built
if [ $macosx_minor -le 4 ]; then
rootlibs="$rootlibs -lfreetype"
Reference in New Issue Copy Permalink