Commit 967a0d72 authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Few tweaks to support MacOS 10.15

parent 7825a67f
Pipeline #1271824 passed with stage
in 4 minutes and 49 seconds
......@@ -34,7 +34,9 @@ else:
rcPATH = os.path.join(os.environ['HOME'],'.lcgcmake')
contrib_suffix = ''
gtar_version = '1.30-a85f4'
gtar_osvers = 'mac1014'
gfor_version = '6.3.0'
gfor_osvers = 'mac1014'
cmake_version = '3.11.1'
config = {}
......@@ -88,17 +90,17 @@ def lcgcmake_bootstrap(compiler, arch, osvers, prefix) :
set_env_variable(environment, 'COMPILER',compiler)
if platform.system() == 'Darwin':
gtarpath = os.path.join(prefix, 'gtar', gtar_version, "-".join([arch,osvers]) + '-clang91-opt')
gtarpath = os.path.join(prefix, 'gtar', gtar_version, "-".join([arch,gtar_osvers]) + '-clang91-opt')
if not os.path.exists(gtarpath) :
print('Installing gnu-tar version %s' % gtar_version)
install_tarfile('gtar' + '-' + gtar_version, arch, osvers,'-clang91-opt', prefix)
install_tarfile('gtar' + '-' + gtar_version, arch, gtar_osvers,'-clang91-opt', prefix)
set_env_variable(environment, 'PATH', os.path.join(gtarpath,'bin'))
if shutil.which('gfortran') is None:
fcpath = os.path.join(prefix, 'gfortran', gfor_version, "-".join([arch,osvers]))
fcpath = os.path.join(prefix, 'gfortran', gfor_version, "-".join([arch,gfor_osvers]))
if not os.path.exists(fcpath) :
print('Installing gfortran version %s' % gfor_version)
install_tarfile('gfortran' + '-' + gfor_version, arch, osvers, contrib_suffix, prefix)
install_tarfile('gfortran' + '-' + gfor_version, arch, gfor_osvers, contrib_suffix, prefix)
set_env_variable(environment, 'PATH', os.path.join(fcpath,'bin'))
return environment
......
......@@ -19,4 +19,8 @@ elseif(${LCG_OS}${LCG_OSVERS} STREQUAL mac1014)
set(LCG_system_packages curl)
elseif(${LCG_OS}${LCG_OSVERS} STREQUAL mac1015)
set(LCG_system_packages curl)
endif()
......@@ -1463,10 +1463,6 @@ LCGPackage_Add(
CONFIGURE_COMMAND <VOID>
BUILD_COMMAND <VOID>
INSTALL_COMMAND ${MAKE} install PREFIX=<INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/usr/bin <INSTALL_DIR>/bin
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/usr/share/man <INSTALL_DIR>/man
COMMAND ${CMAKE_COMMAND} -E remove_directory <INSTALL_DIR>/usr/share
COMMAND ${CMAKE_COMMAND} -E remove_directory <INSTALL_DIR>/usr/
BUILD_IN_SOURCE 1
)
......@@ -2114,9 +2110,6 @@ install.packages('tidyverse',repos='http://cran.univ-paris1.fr/',lib='${R_lib}')
install.packages('rgdal',repos='http://cran.univ-paris1.fr/',lib='${R_lib}')
install.packages(c('crayon', 'pbdZMQ', 'devtools'), repos = 'http://cran.univ-paris1.fr/', type = 'source', lib='${R_lib}')
if ( Sys.info()['sysname'] != 'Darwin') { devtools::install_github(paste0('IRkernel/', c('repr', 'IRdisplay', 'IRkernel'))) }
#install.packages(c('rzmq','repr','IRkernel','IRdisplay'),
# repos = 'https://irkernel.github.io/', type = 'source', lib='${R_lib}')
#IRkernel::installspec(user = FALSE) # to register the kernel in the current R installation
")
......@@ -2140,7 +2133,9 @@ LCGPackage_Add(
COMMAND ${EXEC} -u MAKEFLAGS <INSTALL_DIR>/bin/Rscript --vanilla --verbose ${CMAKE_CURRENT_BINARY_DIR}/install-packages.R
COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/${_LIBDIR} find R/lib -type f -exec ln -s {} \\\\SEMICOLON
COMMAND ${CMAKE_COMMAND} -E chdir <INSTALL_DIR>/${_LIBDIR} find R/library/RInside/lib -type f -exec ln -s {} \\\\SEMICOLON
IF NOT APPLE THEN
COMMAND ${CMAKE_COMMAND} -E copy_directory <INSTALL_DIR>/${_LIBDIR}/R/library/IRkernel/kernelspec <INSTALL_DIR>/share/jupyter/kernels/ir
ENDIF
LIST_SEPARATOR SEMICOLON
BUILD_IN_SOURCE 1
DEPENDS ${R_DEPS} IF LCG_OS STREQUAL mac THEN openssl ELSE cairo ENDIF
......@@ -2352,7 +2347,8 @@ LCGPackage_Add(
LCGPackage_Add(
motif
URL ${GenURL}/motif-${motif_native_version}.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix <INSTALL_DIR>
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix <INSTALL_DIR>
IF APPLE THEN CPPFLAGS=-I/opt/X11/include LDFLAGS=-L/opt/X11/lib ENDIF
BUILD_COMMAND ${MAKE}
INSTALL_COMMAND ${MAKE} install
PACKAGE_FINDER Motif
......@@ -2502,6 +2498,7 @@ LCGPackage_Add(
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DJSON_MultipleHeaders=ON
-DJSON_BuildTests=OFF
)
#---double_conversion----------------------------------------------------------
......
......@@ -1451,15 +1451,8 @@ endif()
LCGPackage_Add(
qd
URL ${gen_url}/qd-${qd_native_version}.tar.gz
IF NOT LCG_ARCH MATCHES "aarch64" THEN
UPDATE_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/qd-<NATIVE_VERSION> <SOURCE_DIR>
COMMAND ${CMAKE_COMMAND} -E remove_directory <SOURCE_DIR>/<NATIVE_VERSION>
ENDIF
CONFIGURE_COMMAND ./configure --prefix=<INSTALL_DIR> --enable-shared
INSTALL_COMMAND make install
BUILD_IN_SOURCE 1
DEPENDS Python
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment