packages (MYSQL_5_0): mysql/mysql-userstatv2.patch - no patching of configure

glen glen at pld-linux.org
Wed Aug 26 11:29:57 CEST 2009


Author: glen                         Date: Wed Aug 26 09:29:57 2009 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- no patching of configure

---- Files affected:
packages/mysql:
   mysql-userstatv2.patch (1.1.2.9 -> 1.1.2.10) 

---- Diffs:

================================================================
Index: packages/mysql/mysql-userstatv2.patch
diff -u packages/mysql/mysql-userstatv2.patch:1.1.2.9 packages/mysql/mysql-userstatv2.patch:1.1.2.10
--- packages/mysql/mysql-userstatv2.patch:1.1.2.9	Thu Jul 16 15:01:56 2009
+++ packages/mysql/mysql-userstatv2.patch	Wed Aug 26 11:29:51 2009
@@ -86,111 +86,6 @@
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
  LIB_EXTRA_CCFLAGS = @LIB_EXTRA_CCFLAGS@
-diff -r 1ac0113deff5 configure
---- a/configure	Mon Jun 01 00:35:44 2009 -0700
-+++ b/configure	Mon Jun 01 00:36:01 2009 -0700
-@@ -35333,7 +35333,91 @@
- 	# We also disable for SCO for the time being, the headers for the
- 	# thread library we use conflicts with other headers.
-     ;;
-- *)
-+*)
-+   # most systems require the program be linked with librt library to use
-+   # the function clock_gettime
-+   my_save_LIBS="$LIBS"
-+   LIBS=""
-+
-+echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
-+echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6
-+if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char clock_gettime ();
-+int
-+main ()
-+{
-+clock_gettime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_rt_clock_gettime=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_rt_clock_gettime=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6
-+if test $ac_cv_lib_rt_clock_gettime = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBRT 1
-+_ACEOF
-+
-+  LIBS="-lrt $LIBS"
-+
-+fi
-+
-+   LIBRT=$LIBS
-+   LIBS="$my_save_LIBS"
-+
-+
-+   LIBS="$LIBS $LIBRT"
-+
- for ac_func in clock_gettime
- do
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-@@ -38777,7 +38861,7 @@
- 
- fi
- 
--CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"
-+CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS $LIBRT"
- 
- 
- 
 diff -r 1ac0113deff5 configure.in
 --- a/configure.in	Mon Jun 01 00:35:44 2009 -0700
 +++ b/configure.in	Mon Jun 01 00:36:01 2009 -0700
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-userstatv2.patch?r1=1.1.2.9&r2=1.1.2.10&f=u



More information about the pld-cvs-commit mailing list