• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/mysql/0000-ac_cache_check.patch
Yann E. MORINYann E. MORIN committed c705bacd3f922 Dec 2014
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
Patch borrowed from
2
http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493.
3
​
4
It allows to override through ac_cv_* variables various checks that
5
cannot be performed when cross-compiling.
6
​
7
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
8
​
9
---
10
 storage/innodb_plugin/plug.in |   59 ++++++++++++++++++++++++++++--------------
11
 1 file changed, 40 insertions(+), 19 deletions(-)
12
​
13
Index: mysql-5.1.53/storage/innodb_plugin/plug.in
14
===================================================================
15
--- mysql-5.1.53.orig/storage/innodb_plugin/plug.in
16
+++ mysql-5.1.53/storage/innodb_plugin/plug.in
17
@@ -53,9 +53,10 @@
18
   esac
19
   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
20
 
21
-  AC_MSG_CHECKING(whether GCC atomic builtins are available)
22
+  AC_CACHE_CHECK([whether GCC atomic builtins are available],
23
+                 [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS],
24
   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
25
-  AC_TRY_RUN(
26
+  [AC_TRY_RUN(
27
     [
28
       int main()
29
       {
30
@@ -95,18 +96,23 @@
31
       }
32
     ],
33
     [
34
-      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
35
-                [GCC atomic builtins are available])
36
       AC_MSG_RESULT(yes)
37
+      ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes
38
     ],
39
     [
40
       AC_MSG_RESULT(no)
41
+      ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no
42
     ]
43
-  )
44
+  )])
45
+  if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then
46
+    AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
47
+              [GCC atomic builtins are available])
48
+  fi
49
 
50
-  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
51
+  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
52
+                 [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC],
53
   # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
54
-  AC_TRY_RUN(
55
+  [AC_TRY_RUN(
56
     [
57
       #include <pthread.h>
58
       #include <string.h>
59
@@ -126,14 +132,18 @@
60
       }
61
     ],
62
     [
63
-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
64
-                [pthread_t can be used by GCC atomic builtins])
65
       AC_MSG_RESULT(yes)
66
+      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes
67
     ],
68
     [
69
       AC_MSG_RESULT(no)
70
+      ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no
71
     ]
72
-  )
73
+  )])
74
+  if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then
75
+    AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
76
+              [pthread_t can be used by GCC atomic builtins])
77
+  fi
78
 
79
   AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
80
   # either define HAVE_IB_SOLARIS_ATOMICS or not
81
@@ -148,9 +158,10 @@
82
                are available])
83
   )
84
 
85
-  AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions)
86
+  AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions],
87
+                 [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS],
88
   # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
89
-  AC_TRY_RUN(
90
+  [AC_TRY_RUN(
91
     [
92
       #include <pthread.h>
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.