Skip to content

Commit baba194

Browse files
committed
mariadb: fix DEFAULT_MACHINE on mips
Signed-off-by: Mathieu Malaterre <malat@debian.org>
1 parent caae0c4 commit baba194

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
--- a/cmake/package_name.cmake
14+
+++ b/cmake/package_name.cmake
15+
@@ -34,6 +34,10 @@ IF(NOT VERSION)
16+
SET(DEFAULT_MACHINE "mips")
17+
ENDIF()
18+
19+
+ IF(NOT 64BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
20+
+ SET(DEFAULT_MACHINE "mips")
21+
+ ENDIF()
22+
+
23+
IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
24+
SET(NEED_DASH_BETWEEN_PLATFORM_AND_MACHINE 0)
25+
SET(DEFAULT_PLATFORM "win")

0 commit comments

Comments
 (0)