blob: 72a1f75c26ad8d441f61e317f9858509f28f0276 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- mysql.old/scripts/mysql_config.sh 2013-05-02 20:30:14.000000000 -0400
+++ mysql.new/scripts/mysql_config.sh 2013-05-02 20:32:36.000000000 -0400
@@ -128,25 +128,29 @@
cflags="$include @CFLAGS@ " #note: end space!
# Remove some options that a client doesn't have to care about
-# FIXME until we have a --cxxflags, we need to remove -Xa
-# and -xstrconst to make --cflags usable for Sun Forte C++
-# FIXME until we have a --cxxflags, we need to remove -AC99
-# to make --cflags usable for HP C++ (aCC)
-for remove in DDBUG_OFF DSAFE_MUTEX DUNIV_MUST_NOT_INLINE DFORCE_INIT_OF_VARS \
- DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
- 'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
- Xa xstrconst "xc99=none" AC99 \
- unroll2 ip mp restrict
+tmpcflags=""
+for f in $cflags
do
- # The first option we might strip will always have a space before it because
- # we set -I$pkgincludedir as the first option
- cflags=`echo "$cflags"|sed -e "s/ -$remove */ /g"`
+ case "${f}" in
+ -DDBUG_OFF) f="" ;;
+ -DSAFE_MUTEX) f="" ;;
+ -DUNIV_MUST_NOT_INLINE) f="" ;;
+ -DFORCE_INIT_OF_VARS) f="" ;;
+ -DEXTRA_DEBUG) f="" ;;
+ -DHAVE_purify) f="" ;;
+ -[ID]*) tmpcflags="${tmpcflags} ${f}" ;;
+ -[Ll]*)
+ libs="${libs} ${f}"
+ libs_r="${libs_r} ${f}"
+ embedded_libs="${embedded_libs} ${f}"
+ ;;
+ esac
done
-cflags=`echo "$cflags"|sed -e 's/ *\$//'`
+cflags="${tmpcflags# }"
# Same for --libs(_r)
-for remove in lmtmalloc static-libcxa i-static static-intel
+for remove in lmtmalloc static-libcxa i-static static-intel lprobes_mysql
do
# We know the strings starts with a space
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`
|
GitWeb
