Package: mysql-dfsg-5.1
Version: 5.1.37-1
Severity: important
Tags: patch
User: [email protected]
Usertags: kfreebsd

Hi,

testsuite in the current version fails on GNU/kFreeBSD:


   Failed 6/608 tests, 99.01% were successful.
   Failing test(s): main.plugin_load main.plugin main.udf main.merge
                    rpl.rpl_plugin_load rpl.rpl_udf


The problem for all but main.merge is missing special linking flag,
the GNU/kFreeBSD needs the same as Linux.
Please use the attached patch for configure.in/configure,
it fixes 5 failing tests. The remaining failing test is main.merge,
it timeouts.

It would also be nice if you can ask upstream
to include this change.

Thanks in advance

                         Petr
diff -u mysql-dfsg-5.1-5.1.37/configure.in mysql-dfsg-5.1-5.1.37/configure.in
--- mysql-dfsg-5.1-5.1.37/configure.in
+++ mysql-dfsg-5.1-5.1.37/configure.in
@@ -1834,24 +1834,29 @@
 AC_SUBST(COMPILATION_COMMENT)
 
 AC_MSG_CHECKING("need of special linking flags")
-if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
-then
-  LDFLAGS="$LDFLAGS -rdynamic"
-  AC_MSG_RESULT("-rdynamic")
-else
-  case "$SYSTEM_TYPE$with_mysqld_ldflags " in
-  *freebsd*"-all-static "*|*dragonfly*"-all-static "*)
-    AC_MSG_RESULT("none")
+case "$SYSTEM_TYPE" in
+  *linux*|*kfreebsd*-gnu*)
+    if test "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
+    then 
+	LDFLAGS="$LDFLAGS -rdynamic"
+	AC_MSG_RESULT("-rdynamic")
+    else
+	AC_MSG_RESULT("none")
+    fi
     ;;
   *freebsd*|*dragonfly*)
-    MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
-    AC_MSG_RESULT("-export-dynamic")
+    if test "$with_mysqld_ldflags" != "-all-static"
+    then
+	MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
+        AC_MSG_RESULT("-export-dynamic")
+    else
+	AC_MSG_RESULT("none")
+    fi
     ;;
   *)
-    AC_MSG_RESULT("none")
+	AC_MSG_RESULT("none")
     ;;
-  esac
-fi
+esac
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
diff -u mysql-dfsg-5.1-5.1.37/configure mysql-dfsg-5.1-5.1.37/configure
--- mysql-dfsg-5.1-5.1.37/configure
+++ mysql-dfsg-5.1-5.1.37/configure
@@ -25853,28 +25853,34 @@
 
 { $as_echo "$as_me:$LINENO: checking \"need of special linking flags\"" >&5
 $as_echo_n "checking \"need of special linking flags\"... " >&6; }
-if test "$TARGET_LINUX" = "true" -a "$ac_cv_c_compiler_gnu" = "yes" -a "$all_is_static" != "yes"
-then
-  LDFLAGS="$LDFLAGS -rdynamic"
-  { $as_echo "$as_me:$LINENO: result: \"-rdynamic\"" >&5
+case "$SYSTEM_TYPE" in
+  *linux*|*kfreebsd*-gnu*)
+    if test "$ac_cv_c_compiler_gnu" = "yes" -a "$all_is_static" != "yes"
+    then
+	LDFLAGS="$LDFLAGS -rdynamic"
+	{ $as_echo "$as_me:$LINENO: result: \"-rdynamic\"" >&5
 $as_echo "\"-rdynamic\"" >&6; }
-else
-  case "$SYSTEM_TYPE$with_mysqld_ldflags " in
-  *freebsd*"-all-static "*|*dragonfly*"-all-static "*)
-    { $as_echo "$as_me:$LINENO: result: \"none\"" >&5
+    else
+	{ $as_echo "$as_me:$LINENO: result: \"none\"" >&5
 $as_echo "\"none\"" >&6; }
+    fi
     ;;
   *freebsd*|*dragonfly*)
-    MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
-    { $as_echo "$as_me:$LINENO: result: \"-export-dynamic\"" >&5
+    if test "$with_mysqld_ldflags" != "-all-static"
+    then
+	MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
+        { $as_echo "$as_me:$LINENO: result: \"-export-dynamic\"" >&5
 $as_echo "\"-export-dynamic\"" >&6; }
+    else
+	{ $as_echo "$as_me:$LINENO: result: \"none\"" >&5
+$as_echo "\"none\"" >&6; }
+    fi
     ;;
   *)
-    { $as_echo "$as_me:$LINENO: result: \"none\"" >&5
+	{ $as_echo "$as_me:$LINENO: result: \"none\"" >&5
 $as_echo "\"none\"" >&6; }
     ;;
-  esac
-fi
+esac
 
 { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }

Reply via email to