You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

25 lines
1.0 KiB

  1. Description: Fix DEFAULT_MACHINE on mips
  2. The DEFAULT_MACHINE constant is calculated from the CMAKE_SYSTEM_PROCESSOR
  3. variable which contains the processor which built mariadb. Since most Debian
  4. buildds run on 64-bit hardware even though they build 32-bit binaries,
  5. DEFAULT_MACHINE previously contained "mips64" on 32-bit builds. This confuses
  6. some mroonga tests which rely on DEFAULT_MACHINE to detect 64-bitness.
  7. .
  8. This patch fixes the value of DEFAULT_MACHINE so it always contains just "mips"
  9. on 32-bit mips builds.
  10. Author: James Cowgill <jcowgill@debian.org>
  11. ---
  12. This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  13. --- mariadb-10.1.orig/cmake/package_name.cmake
  14. +++ mariadb-10.1/cmake/package_name.cmake
  15. @@ -34,6 +34,10 @@ IF(NOT VERSION)
  16. SET(DEFAULT_MACHINE "mips")
  17. ENDIF()
  18. + IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
  19. + SET(DEFAULT_MACHINE "mips")
  20. + ENDIF()
  21. +
  22. IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
  23. SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
  24. SET(DEFAULT_PLATFORM "win")