SOURCES: mysql-shared.patch - updated, still NFY

glen glen at pld-linux.org
Sun Apr 23 13:20:24 CEST 2006 

Author: glen                         Date: Sun Apr 23 11:20:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated, still NFY

---- Files affected:
SOURCES:
   mysql-shared.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/mysql-shared.patch
diff -u SOURCES/mysql-shared.patch:1.1 SOURCES/mysql-shared.patch:1.2
--- SOURCES/mysql-shared.patch:1.1	Sat Apr 22 21:34:04 2006
+++ SOURCES/mysql-shared.patch	Sun Apr 23 13:20:18 2006
@@ -1,4 +1,3 @@
-diff -ur mysql-5.0.20a/client/Makefile.am mysql-5.0.20a-shared/client/Makefile.am
 --- mysql-5.0.20a/client/Makefile.am	2006-04-18 14:46:08.000000000 +0300
 +++ mysql-5.0.20a-shared/client/Makefile.am	2006-04-22 18:11:15.407051553 +0300
 @@ -39,7 +39,7 @@
@@ -10,7 +9,6 @@
  mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc
  mysqlbinlog_LDADD =		$(LDADD) $(CXXLDFLAGS)
  mysqltestmanager_pwgen_SOURCES =   mysqlmanager-pwgen.c 
-diff -ur mysql-5.0.20a/configure.in mysql-5.0.20a-shared/configure.in
 --- mysql-5.0.20a/configure.in	2006-04-22 22:25:50.208166045 +0300
 +++ mysql-5.0.20a-shared/configure.in	2006-04-22 18:02:23.665203044 +0300
 @@ -2502,7 +2502,7 @@
@@ -22,7 +20,6 @@
    AC_SUBST(THREAD_LOBJECTS)
    server_scripts="mysqld_safe mysql_install_db"
    sql_server_dirs="strings mysys dbug extra regex"
-diff -ur mysql-5.0.20a/dbug/Makefile.am mysql-5.0.20a-shared/dbug/Makefile.am
 --- mysql-5.0.20a/dbug/Makefile.am	2006-04-18 14:46:00.000000000 +0300
 +++ mysql-5.0.20a-shared/dbug/Makefile.am	2006-04-22 17:52:40.052199264 +0300
 @@ -16,10 +16,10 @@
@@ -39,7 +36,6 @@
  EXTRA_DIST =            example1.c example2.c example3.c \
                          user.r monty.doc readme.prof dbug_add_tags.pl \
                          my_main.c main.c factorial.c dbug_analyze.c
-diff -ur mysql-5.0.20a/extra/Makefile.am mysql-5.0.20a-shared/extra/Makefile.am
 --- mysql-5.0.20a/extra/Makefile.am	2006-04-18 14:46:14.000000000 +0300
 +++ mysql-5.0.20a-shared/extra/Makefile.am	2006-04-22 18:18:36.186875302 +0300
 @@ -16,8 +16,8 @@
@@ -53,7 +49,6 @@
  BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                          $(top_builddir)/include/sql_state.h \
                          $(top_builddir)/include/mysqld_ername.h
-diff -ur mysql-5.0.20a/heap/Makefile.am mysql-5.0.20a-shared/heap/Makefile.am
 --- mysql-5.0.20a/heap/Makefile.am	2006-04-18 14:46:01.000000000 +0300
 +++ mysql-5.0.20a-shared/heap/Makefile.am	2006-04-22 18:21:16.460447313 +0300
 @@ -15,14 +15,14 @@
@@ -75,7 +70,6 @@
  			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
  			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
  			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
-diff -ur mysql-5.0.20a/libmysqld/Makefile.am mysql-5.0.20a-shared/libmysqld/Makefile.am
 --- mysql-5.0.20a/libmysqld/Makefile.am	2006-04-18 14:46:26.000000000 +0300
 +++ mysql-5.0.20a-shared/libmysqld/Makefile.am	2006-04-22 22:20:48.241409609 +0300
 @@ -31,8 +31,7 @@
@@ -133,7 +127,6 @@
  if DARWIN_MWCC
  	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
  else
-diff -ur mysql-5.0.20a/libmysqld/examples/Makefile.am mysql-5.0.20a-shared/libmysqld/examples/Makefile.am
 --- mysql-5.0.20a/libmysqld/examples/Makefile.am	2006-04-18 14:46:13.000000000 +0300
 +++ mysql-5.0.20a-shared/libmysqld/examples/Makefile.am	2006-04-22 22:15:07.623787021 +0300
 @@ -36,11 +36,11 @@
@@ -150,7 +143,6 @@
  
  mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
                  my_readline.h sql_string.h completion_hash.h
-diff -ur mysql-5.0.20a/myisam/Makefile.am mysql-5.0.20a-shared/myisam/Makefile.am
 --- mysql-5.0.20a/myisam/Makefile.am	2006-04-22 22:25:49.988161123 +0300
 +++ mysql-5.0.20a-shared/myisam/Makefile.am	2006-04-22 19:39:28.315192339 +0300
 @@ -18,11 +18,11 @@
@@ -179,7 +171,6 @@
  			mi_rnext.c mi_rnext_same.c \
  			mi_search.c mi_page.c mi_key.c mi_locking.c \
  			mi_rrnd.c mi_scan.c mi_cache.c \
-diff -ur mysql-5.0.20a/myisammrg/Makefile.am mysql-5.0.20a-shared/myisammrg/Makefile.am
 --- mysql-5.0.20a/myisammrg/Makefile.am	2006-04-18 14:46:13.000000000 +0300
 +++ mysql-5.0.20a-shared/myisammrg/Makefile.am	2006-04-22 19:42:18.899002980 +0300
 @@ -15,9 +15,9 @@
@@ -194,7 +185,6 @@
  			myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \
  			myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \
  			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
-diff -ur mysql-5.0.20a/mysys/Makefile.am mysql-5.0.20a-shared/mysys/Makefile.am
 --- mysql-5.0.20a/mysys/Makefile.am	2006-04-18 14:46:10.000000000 +0300
 +++ mysql-5.0.20a-shared/mysys/Makefile.am	2006-04-22 19:32:57.206455033 +0300
 @@ -19,18 +19,18 @@
@@ -241,21 +231,20 @@
  
  # I hope this always does the right thing. Otherwise this is only test programs
  FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
-diff -ur mysql-5.0.20a/pstack/Makefile.am mysql-5.0.20a-shared/pstack/Makefile.am
---- mysql-5.0.20a/pstack/Makefile.am	2006-04-18 14:46:07.000000000 +0300
-+++ mysql-5.0.20a-shared/pstack/Makefile.am	2006-04-22 20:51:22.071525524 +0300
+diff -u mysql-5.0.20a-shared/pstack/Makefile.am mysql-5.0.20a.shared/pstack/Makefile.am
+--- mysql-5.0.20a-shared/pstack/Makefile.am	2006-04-22 20:51:22.071525524 +0300
++++ mysql-5.0.20a.shared/pstack/Makefile.am	2006-04-23 01:05:56.962885473 +0300
 @@ -28,8 +28,8 @@
  EXTRA_DIST=		$(SRC)
  
  if COMPILE_PSTACK
 -pkglib_LIBRARIES =	libpstack.a
 -libpstack_a_SOURCES =	bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c
-+pkglib_LIBRARIES =	libpstack.la
++pkglib_LTLIBRARIES =	libpstack.la
 +libpstack_la_SOURCES =	bucomm.c filemode.c linuxthreads.c rddbg.c debug.c ieee.c pstack.c stabs.c
  endif
  
  # Don't update the files from bitkeeper
-diff -ur mysql-5.0.20a/regex/Makefile.am mysql-5.0.20a-shared/regex/Makefile.am
 --- mysql-5.0.20a/regex/Makefile.am	2006-04-18 14:46:09.000000000 +0300
 +++ mysql-5.0.20a-shared/regex/Makefile.am	2006-04-22 18:14:35.951520907 +0300
 @@ -16,10 +16,12 @@
@@ -274,7 +263,6 @@
  noinst_PROGRAMS =	re
  re_SOURCES =		split.c debug.c main.c
  re_LDFLAGS= @NOINST_LDFLAGS@
-diff -ur mysql-5.0.20a/sql/Makefile.am mysql-5.0.20a-shared/sql/Makefile.am
 --- mysql-5.0.20a/sql/Makefile.am	2006-04-22 22:25:49.988161123 +0300
 +++ mysql-5.0.20a-shared/sql/Makefile.am	2006-04-22 20:49:53.919557294 +0300
 @@ -30,14 +30,14 @@
@@ -300,7 +288,6 @@
  
  mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
  			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
-diff -ur mysql-5.0.20a/strings/Makefile.am mysql-5.0.20a-shared/strings/Makefile.am
 --- mysql-5.0.20a/strings/Makefile.am	2006-04-18 14:46:12.000000000 +0300
 +++ mysql-5.0.20a-shared/strings/Makefile.am	2006-04-22 17:50:54.709852437 +0300
 @@ -17,7 +17,7 @@
@@ -334,7 +321,6 @@
  #force static linking of conf_to_src - essential when linking against
  #custom installation of libc
  conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
-diff -ur mysql-5.0.20a/vio/Makefile.am mysql-5.0.20a-shared/vio/Makefile.am
 --- mysql-5.0.20a/vio/Makefile.am	2006-04-18 14:46:25.000000000 +0300
 +++ mysql-5.0.20a-shared/vio/Makefile.am	2006-04-22 19:44:58.072557193 +0300
 @@ -22,22 +22,22 @@
@@ -368,3 +354,30 @@
  
  # Don't update the files from bitkeeper
  %::SCCS/s.%
+--- mysql-5.0.20a/innobase/btr/Makefile.am	2006-04-18 14:46:06.000000000 +0300
++++ mysql-5.0.20a.shared/innobase/btr/Makefile.am	2006-04-23 01:07:08.564483247 +0300
+@@ -17,8 +17,8 @@
+ 
+ include ../include/Makefile.i
+ 
+-noinst_LIBRARIES =	libbtr.a
++noinst_LTLIBRARIES =	libbtr.la
+ 
+-libbtr_a_SOURCES =	btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
++libbtr_la_SOURCES =	btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
+ 
+ EXTRA_PROGRAMS =	
+--- mysql-5.0.20a/innobase/os/Makefile.am	2006-04-18 14:46:13.000000000 +0300
++++ mysql-5.0.20a.shared/innobase/os/Makefile.am	2006-04-23 01:07:32.765023279 +0300
+@@ -17,9 +17,9 @@
+ 
+ include ../include/Makefile.i
+ 
+-noinst_LIBRARIES =	libos.a
++noinst_LTLIBRARIES =	libos.la
+ 
+-libos_a_SOURCES =	os0proc.c os0sync.c os0thread.c os0file.c
++libos_la_SOURCES =	os0proc.c os0sync.c os0thread.c os0file.c
+ 
+ EXTRA_PROGRAMS =	
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mysql-shared.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list