summaryrefslogtreecommitdiff
path: root/development
diff options
context:
space:
mode:
authorNiels Horn <niels.horn@gmail.com>2010-06-17 07:22:41 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-06-17 14:45:24 -0500
commit455b9d0bf8758c4c09b110c08aee32a9f9c32057 (patch)
tree7982986072e7b55e030be73a95b025910bd1a1ab /development
parent02fb87d8e6378588ba463f4d2ae83ae7cfe68f80 (diff)
downloadslackbuilds-455b9d0bf8758c4c09b110c08aee32a9f9c32057.tar.gz
development/mysqlcc: Patched build on recent gcc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/mysqlcc/gcc4.patch51
-rw-r--r--development/mysqlcc/mysqlcc.SlackBuild5
2 files changed, 55 insertions, 1 deletions
diff --git a/development/mysqlcc/gcc4.patch b/development/mysqlcc/gcc4.patch
new file mode 100644
index 0000000000..7b58ca0742
--- /dev/null
+++ b/development/mysqlcc/gcc4.patch
@@ -0,0 +1,51 @@
+--- mysqlcc-0.9.8-src/src/main.cpp 2006-08-11 17:29:12.000000000 -0300
++++ mysqlcc-0.9.8-src_patched/src/main.cpp 2010-06-17 08:49:29.000000000 -0300
+@@ -90,28 +90,28 @@
+
+ {"version", 'V', "Print version information and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+
+- {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (gptr*) &opt_connect_timeout,
+- (gptr*) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 3600*12, 0,
+- 0, 1},
++ {"connect_timeout", OPT_CONNECT_TIMEOUT, "", (uchar**) &opt_connect_timeout,
++ (uchar**) &opt_connect_timeout, 0, GET_ULONG, REQUIRED_ARG, 0, 0, 3600*12, 0,
++ 0, (void*)1},
+
+- {"select_limit", OPT_SELECT_LIMIT, "", (gptr*) &select_limit,
+- (gptr*) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
++ {"select_limit", OPT_SELECT_LIMIT, "", (uchar**) &select_limit,
++ (uchar**) &select_limit, 0, GET_ULONG, REQUIRED_ARG, 1000L, 1, ~0L, 0, 1, 0},
+
+ {"net_buffer_length", OPT_NET_BUFFER_LENGTH, "",
+- (gptr*) &my_net_buffer_length, (gptr*) &my_net_buffer_length, 0, GET_ULONG,
++ (uchar**) &my_net_buffer_length, (uchar**) &my_net_buffer_length, 0, GET_ULONG,
+ REQUIRED_ARG, 16384, 1024, 512*1024*1024L, 0, 1024, 0},
+
+ {"max_allowed_packet", OPT_MAX_ALLOWED_PACKET, "",
+- (gptr*) &my_max_allowed_packet, (gptr*) &my_max_allowed_packet, 0, GET_ULONG,
++ (uchar**) &my_max_allowed_packet, (uchar**) &my_max_allowed_packet, 0, GET_ULONG,
+ REQUIRED_ARG, 16 *1024L*1024L, 4096, 512*1024L*1024L, 0,
+ 1024, 0},
+
+ {"local-infile", OPT_LOCAL_INFILE, "Enable/disable LOAD DATA LOCAL INFILE.",
+- (gptr*) &opt_local_infile,
+- (gptr*) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
++ (uchar**) &opt_local_infile,
++ (uchar**) &opt_local_infile, 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
+
+- {"max_join_size", OPT_MAX_JOIN_SIZE, "", (gptr*) &max_join_size,
+- (gptr*) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,
++ {"max_join_size", OPT_MAX_JOIN_SIZE, "", (uchar**) &max_join_size,
++ (uchar**) &max_join_size, 0, GET_ULONG, REQUIRED_ARG, 1000000L, 1, ~0L, 0, 1,
+ 0},
+
+ { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+@@ -155,7 +155,7 @@
+ break;
+ }
+ if (opt->var_type == GET_NO_ARG && opt->arg_type == NO_ARG) //Boolean options
+- add_argument(id, "");
++ add_argument(id, (char*)"");
+ else
+ add_argument(id, argument);
+ }
diff --git a/development/mysqlcc/mysqlcc.SlackBuild b/development/mysqlcc/mysqlcc.SlackBuild
index dc6ea7904e..ab1ac3058b 100644
--- a/development/mysqlcc/mysqlcc.SlackBuild
+++ b/development/mysqlcc/mysqlcc.SlackBuild
@@ -6,7 +6,7 @@
PRGNAM=mysqlcc
VERSION=0.9.8
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
# Automatically determine the architecture we're building on:
@@ -49,6 +49,9 @@ cd $PRGNAM-$VERSION-src
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+# Fix build on recent gcc
+patch -p1 < $CWD/gcc4.patch
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \