summaryrefslogtreecommitdiff
path: root/package/mysql
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-17 20:55:49 (GMT)
commit15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch)
tree727d3fd768a1abe75521190b90833b3a68cce4c6 /package/mysql
parent0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff)
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking, but this is required to successfully link libraries or executables with SSP - pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/mysql')
-rw-r--r--package/mysql/patches/patch-configure24
-rw-r--r--package/mysql/patches/patch-include_config_h_in4
-rw-r--r--package/mysql/patches/patch-ltmain_sh11
3 files changed, 33 insertions, 6 deletions
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index aad04ff..853c31f 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,6 +1,22 @@
--- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200
-+++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200
-@@ -19825,45 +19825,7 @@ fi
++++ mysql-5.1.48/configure 2011-01-15 12:58:47.000000000 +0100
+@@ -19764,15 +19764,6 @@ fi
+
+
+
+-# Enable the abi_check rule only if gcc is available
+-
+-if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
+-then
+- ABI_CHECK=""
+-else
+- ABI_CHECK="abi_check"
+-fi
+-
+
+
+ # Look for PS usage. We use double dollar-signs in FIND_PROC because this
+@@ -19825,45 +19816,7 @@ fi
$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
PS=$ac_cv_path_PS
# Linux style
@@ -47,7 +63,7 @@
{ $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
$as_echo "\"$FIND_PROC\"" >&6; }
-@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann
+@@ -48273,197 +48226,14 @@ $as_echo "$as_me: error: unknown endiann
esac
@@ -245,7 +261,7 @@
{ $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
$as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
-@@ -48581,101 +48360,6 @@ fi
+@@ -48581,101 +48351,6 @@ fi
done
diff --git a/package/mysql/patches/patch-include_config_h_in b/package/mysql/patches/patch-include_config_h_in
index 8c39a7c..361a8b6 100644
--- a/package/mysql/patches/patch-include_config_h_in
+++ b/package/mysql/patches/patch-include_config_h_in
@@ -1,11 +1,11 @@
--- mysql-5.1.48.orig/include/config.h.in 2010-06-03 17:54:04.000000000 +0200
-+++ mysql-5.1.48/include/config.h.in 2010-07-12 22:52:37.985862985 +0200
++++ mysql-5.1.48/include/config.h.in 2011-01-15 13:01:30.000000000 +0100
@@ -856,7 +856,7 @@
/* Define to 1 if you have the `strtoull' function. */
#undef HAVE_STRTOULL
-/* Define to 1 if `st_rdev' is member of `struct stat'. */
-+/* Define to 1 if `struct stat' is a member of `st_rdev'. */
++/* Define to 1 if `st_rdev' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_RDEV
/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use
diff --git a/package/mysql/patches/patch-ltmain_sh b/package/mysql/patches/patch-ltmain_sh
new file mode 100644
index 0000000..c5cb790
--- /dev/null
+++ b/package/mysql/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- mysql-5.1.48.orig/ltmain.sh 2010-06-03 17:54:04.000000000 +0200
++++ mysql-5.1.48/ltmain.sh 2011-01-15 13:03:34.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"