summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2012-03-09 12:38:27 +0000
committerfhajny <fhajny@pkgsrc.org>2012-03-09 12:38:27 +0000
commitea4e0cd5a956a9b582c6e85868eee7cd4dcbde35 (patch)
treec2c8ad2d4500194758902fe512b09cee2068b53c
parent065ed09306571e151457c31df4d41488d5e286f5 (diff)
downloadpkgsrc-ea4e0cd5a956a9b582c6e85868eee7cd4dcbde35.tar.gz
Fix build on a mix of GNU/Sun tools.
-rw-r--r--databases/mysql51-server/distinfo3
-rw-r--r--databases/mysql51-server/patches/patch-sql_ha_ndbcluster.cc14
2 files changed, 16 insertions, 1 deletions
diff --git a/databases/mysql51-server/distinfo b/databases/mysql51-server/distinfo
index 69efc634c81..c6b737900e6 100644
--- a/databases/mysql51-server/distinfo
+++ b/databases/mysql51-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2012/01/12 17:41:21 adam Exp $
+$NetBSD: distinfo,v 1.23 2012/03/09 12:38:27 fhajny Exp $
SHA1 (mysql-5.1.61.tar.gz) = a528cf822af84601dd95d3e1cb3277815685ac65
RMD160 (mysql-5.1.61.tar.gz) = 392b7394a0f7821134f177a3ba4580a29d60e3f4
@@ -25,3 +25,4 @@ SHA1 (patch-as) = 8167416a083a011ded19d176bc488c94d9eb7abf
SHA1 (patch-at) = 307a0785190f8bc175226ce83288cc85f7da4631
SHA1 (patch-au) = 51291771b994d199fb6de6a17dd7809a7bf39b68
SHA1 (patch-ax) = dbf68af2d2ded85140aac3602d4f6ce5d68cc78a
+SHA1 (patch-sql_ha_ndbcluster.cc) = eb076bbce9d1d671331b41f50cf0be220cca7c6b
diff --git a/databases/mysql51-server/patches/patch-sql_ha_ndbcluster.cc b/databases/mysql51-server/patches/patch-sql_ha_ndbcluster.cc
new file mode 100644
index 00000000000..a446d53bf18
--- /dev/null
+++ b/databases/mysql51-server/patches/patch-sql_ha_ndbcluster.cc
@@ -0,0 +1,14 @@
+$NetBSD: patch-sql_ha_ndbcluster.cc,v 1.1 2012/03/09 12:38:27 fhajny Exp $
+
+Fix for ar/ld toolchain on SunOS, see:
+http://bugs.mysql.com/bug.php?id=34866
+--- sql/ha_ndbcluster.cc.orig 2011-10-29 18:09:49.000000000 +0000
++++ sql/ha_ndbcluster.cc
+@@ -10549,5 +10549,6 @@ mysql_declare_plugin(ndbcluster)
+ NULL /* config options */
+ }
+ mysql_declare_plugin_end;
+-
++#else
++int Sun_linker_needs_a_symbol_here= 0;
+ #endif