ferdnyc / rpms / root

Forked from rpms/root 4 years ago
Clone
16e38e1
diff -ur root-6.06.02.orig/cmake/modules/SetUpLinux.cmake root-6.06.02/cmake/modules/SetUpLinux.cmake
16e38e1
--- root-6.06.02.orig/cmake/modules/SetUpLinux.cmake	2016-03-03 10:36:03.000000000 +0100
16e38e1
+++ root-6.06.02/cmake/modules/SetUpLinux.cmake	2016-04-06 09:42:10.258085039 +0200
16e38e1
@@ -30,8 +30,8 @@
16e38e1
   else()
16e38e1
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
16e38e1
   endif()
16e38e1
-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
16e38e1
-  message(STATUS "Found a 64bit ppc64 little endian system")
16e38e1
+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
16e38e1
+  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
16e38e1
   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
16e38e1
   if(CMAKE_COMPILER_IS_GNUCXX)
16e38e1
     message(STATUS "Found GNU compiler collection")
16e38e1
diff -ur root-6.06.02.orig/config/root-config.in root-6.06.02/config/root-config.in
16e38e1
--- root-6.06.02.orig/config/root-config.in	2016-03-03 10:36:03.000000000 +0100
16e38e1
+++ root-6.06.02/config/root-config.in	2016-04-06 09:48:35.837025323 +0200
16e38e1
@@ -205,17 +205,12 @@
16e38e1
    ;;
16e38e1
 linuxppcgcc)
16e38e1
    # PPC Linux with gcc
16e38e1
-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -fsigned-char -I/usr/X11/include"
16e38e1
+   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m32 -fsigned-char"
16e38e1
+   auxldflags="-m32"
16e38e1
    auxlibs="-lm -ldl -rdynamic"
16e38e1
    ;;
16e38e1
 linuxppc64gcc)
16e38e1
-   # PPC64 (64 bit mode) Linux with gcc 3.x
16e38e1
-   auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
16e38e1
-   auxldflags="-m64"
16e38e1
-   auxlibs="-lm -ldl -rdynamic"
16e38e1
-   ;;
16e38e1
-ppc64le)
16e38e1
-   # PPC64 (64 bit mode) little endian
16e38e1
+   # PPC64/PPC64LE (64 bit mode) Linux with gcc
16e38e1
    auxcflags="${cxxversionflag} -Wno-deprecated-declarations -m64 -fsigned-char"
16e38e1
    auxldflags="-m64"
16e38e1
    auxlibs="-lm -ldl -rdynamic"