|
 |
9a99763 |
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
|
|
|
9a99763 |
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake 2016-04-06 09:42:10.258085039 +0200
|
|
|
9a99763 |
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake 2016-04-06 10:07:33.109883779 +0200
|
|
|
9a99763 |
@@ -19,7 +19,7 @@
|
|
|
9a99763 |
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
|
|
|
9a99763 |
endif()
|
|
|
9a99763 |
elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
|
|
|
9a99763 |
- message(STATUS "Found a 64bit system")
|
|
|
9a99763 |
+ message(STATUS "Found a 64bit ARM system")
|
|
|
9a99763 |
set(SPECIAL_CINT_FLAGS "-DG__64BIT")
|
|
|
9a99763 |
if(CMAKE_COMPILER_IS_GNUCXX)
|
|
|
9a99763 |
message(STATUS "Found GNU compiler collection")
|
|
|
9a99763 |
@@ -42,6 +42,18 @@
|
|
|
9a99763 |
else()
|
|
|
9a99763 |
message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
|
|
|
9a99763 |
endif()
|
|
|
9a99763 |
+elseif(${SYSCTL_OUTPUT} MATCHES arm)
|
|
|
9a99763 |
+ message(STATUS "Found a 32bit ARM system")
|
|
|
9a99763 |
+ set(SPECIAL_CINT_FLAGS "")
|
|
|
9a99763 |
+ if(CMAKE_COMPILER_IS_GNUCXX)
|
|
|
9a99763 |
+ message(STATUS "Found GNU compiler collection")
|
|
|
9a99763 |
+ set(ROOT_ARCHITECTURE linuxarm)
|
|
|
9a99763 |
+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
|
|
|
9a99763 |
+ message(STATUS "Found CLANG compiler")
|
|
|
9a99763 |
+ set(ROOT_ARCHITECTURE linuxarm)
|
|
|
9a99763 |
+ else()
|
|
|
9a99763 |
+ message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
|
|
|
9a99763 |
+ endif()
|
|
|
9a99763 |
else()
|
|
|
9a99763 |
message(STATUS "Found a 32bit system")
|
|
|
9a99763 |
set(BIT_ENVIRONMENT "-m32")
|
|
|
9a99763 |
diff -ur root-6.06.02.orig/core/pcre/CMakeLists.txt root-6.06.02/core/pcre/CMakeLists.txt
|
|
|
9a99763 |
--- root-6.06.02.orig/core/pcre/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
|
|
|
9a99763 |
+++ root-6.06.02/core/pcre/CMakeLists.txt 2016-04-06 09:53:37.247748077 +0200
|
|
|
9a99763 |
@@ -52,6 +52,8 @@
|
|
|
9a99763 |
set(PCRE_CFLAGS "-m32 -O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
|
|
|
9a99763 |
set(PCRE_CFLAGS "-O")
|
|
|
9a99763 |
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
|
|
|
9a99763 |
+ set(PCRE_CFLAGS "-O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linux)
|
|
|
9a99763 |
set(PCRE_CFLAGS "-m32 -O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
|
|
|
9a99763 |
diff -ur root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake root-6.06.02/graf2d/asimage/BuildAfterImage.cmake
|
|
|
9a99763 |
--- root-6.06.02.orig/graf2d/asimage/BuildAfterImage.cmake 2016-03-03 10:36:03.000000000 +0100
|
|
|
9a99763 |
+++ root-6.06.02/graf2d/asimage/BuildAfterImage.cmake 2016-04-06 09:53:37.258748191 +0200
|
|
|
9a99763 |
@@ -47,6 +47,8 @@
|
|
|
9a99763 |
set(AFTER_CC "${AFTER_CC} -m64")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
|
|
|
9a99763 |
set(AFTER_CC "${AFTER_CC}")
|
|
|
9a99763 |
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
|
|
|
9a99763 |
+ set(AFTER_CC "${AFTER_CC}")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linux)
|
|
|
9a99763 |
set(AFTER_CC "${AFTER_CC} -m32")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
|
|
|
9a99763 |
diff -ur root-6.06.02.orig/graf2d/freetype/CMakeLists.txt root-6.06.02/graf2d/freetype/CMakeLists.txt
|
|
|
9a99763 |
--- root-6.06.02.orig/graf2d/freetype/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
|
|
|
9a99763 |
+++ root-6.06.02/graf2d/freetype/CMakeLists.txt 2016-04-06 09:59:35.237876779 +0200
|
|
|
9a99763 |
@@ -52,6 +52,10 @@
|
|
|
9a99763 |
set(FREETYPE_CFLAGS "-m64 -O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
|
|
|
9a99763 |
set(FREETYPE_CFLAGS "-m64 -O")
|
|
|
9a99763 |
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm64)
|
|
|
9a99763 |
+ set(FREETYPE_CFLAGS "-O")
|
|
|
9a99763 |
+ elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
|
|
|
9a99763 |
+ set(FREETYPE_CFLAGS "-O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linux)
|
|
|
9a99763 |
set(FREETYPE_CFLAGS "-m32 -O")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES macosx64)
|
|
|
9a99763 |
diff -ur root-6.06.02.orig/interpreter/CMakeLists.txt root-6.06.02/interpreter/CMakeLists.txt
|
|
|
9a99763 |
--- root-6.06.02.orig/interpreter/CMakeLists.txt 2016-03-03 10:36:03.000000000 +0100
|
|
|
9a99763 |
+++ root-6.06.02/interpreter/CMakeLists.txt 2016-04-06 09:53:37.270748316 +0200
|
|
|
9a99763 |
@@ -17,6 +17,8 @@
|
|
|
9a99763 |
|
|
|
9a99763 |
if(ROOT_ARCHITECTURE MATCHES linuxarm64)
|
|
|
9a99763 |
set(ROOT_CLING_TARGET "AArch64")
|
|
|
9a99763 |
+elseif(ROOT_ARCHITECTURE MATCHES linuxarm)
|
|
|
9a99763 |
+ set(ROOT_CLING_TARGET "ARM")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linuxppc64gcc)
|
|
|
9a99763 |
set(ROOT_CLING_TARGET "PowerPC")
|
|
|
9a99763 |
elseif(ROOT_ARCHITECTURE MATCHES linux)
|