Attachment 177179 Details for Bug 238487 – Update to MySQL build system to enable a shared libmysqld

Update to MySQL build system to enable a shared libmysqld

203_all_embedded-library-shared.5.0.72.patch (text/plain), 23.27 KB, created by Jorge Manuel B. S. Vicetto on 2009-01-03 02:45:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jorge Manuel B. S. Vicetto

Created: 2009-01-03 02:45:51 UTC

Size: 23.27 KB

patch

obsolete

>diff -u -r mysql-5.0.72-old/client/Makefile.am mysql-5.0.72/client/Makefile.am
>--- mysql-5.0.72-old/client/Makefile.am	2008-12-15 03:22:01.000000000 -0100
>+++ mysql-5.0.72/client/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -37,7 +37,7 @@
> 				$(top_srcdir)/mysys/my_copy.c \
> 				$(top_srcdir)/mysys/my_mkdir.c
> 
>-mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)
>+mysqltest_LDADD =		$(top_builddir)/regex/libregex.la $(LDADD)
> mysqlbinlog_SOURCES =   	mysqlbinlog.cc \
> 				$(top_srcdir)/mysys/mf_tempdir.c \
> 				$(top_srcdir)/mysys/my_new.cc
>diff -u -r mysql-5.0.72-old/configure.in mysql-5.0.72/configure.in
>--- mysql-5.0.72-old/configure.in	2008-12-15 03:22:01.000000000 -0100
>+++ mysql-5.0.72/configure.in	2008-12-26 12:49:46.000000000 -0100
>@@ -7,7 +7,7 @@
> AC_CANONICAL_SYSTEM
> # The Docs Makefile.am parses this line!
> # remember to also change ndb version below and update version.c in ndb
>-AM_INIT_AUTOMAKE(mysql, 5.0.72)
>+AM_INIT_AUTOMAKE([mysql], [5.0.72])
> AM_CONFIG_HEADER([include/config.h:config.h.in])
> 
> PROTOCOL_VERSION=10
>@@ -572,6 +572,9 @@
> # We need an ANSI C compiler
> AM_PROG_CC_STDC
> 
>+# Testing as sugggested by Diego
>+AM_PROG_CC_C_O
>+
> # We need an assembler, too
> AM_PROG_AS
> CCASFLAGS="$CCASFLAGS $ASFLAGS"
>@@ -2719,13 +2722,11 @@
> export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR
> ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'"
> 
>+AM_CONDITIONAL([NEED_THREADS], [test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"])
> if test "$with_server" != "no" -o "$THREAD_SAFE_CLIENT" != "no"
> then
>   AC_DEFINE([THREAD], [1],
>             [Define if you want to have threaded code. This may be undef on client code])
>-  # Avoid _PROGRAMS names
>-  THREAD_LOBJECTS="thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my_pthread.o my_thr_init.o mf_keycache.o"
>-  AC_SUBST(THREAD_LOBJECTS)
> fi
> 
> if test "$with_server" = "no"
>diff -u -r mysql-5.0.72-old/dbug/Makefile.am mysql-5.0.72/dbug/Makefile.am
>--- mysql-5.0.72-old/dbug/Makefile.am	2008-12-15 03:22:19.000000000 -0100
>+++ mysql-5.0.72/dbug/Makefile.am	2008-12-27 16:52:13.000000000 -0100
>@@ -16,10 +16,11 @@
> # MA 02111-1307, USA
> 
> INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
>-LDADD =                 libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a
>-pkglib_LIBRARIES =      libdbug.a
>+LDADD =                 ../mysys/libmysys.la
>+noinst_LTLIBRARIES =    libdbug.la
> noinst_HEADERS =        dbug_long.h
>-libdbug_a_SOURCES =     dbug.c sanity.c
>+libdbug_la_SOURCES =    dbug.c sanity.c
>+libdbug_la_LIBADD =		$(top_builddir)/mysys/libmythr.la
> 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 \
>@@ -34,6 +35,7 @@
> noinst_PROGRAMS =       factorial dbug_analyze
> factorial_SOURCES =     my_main.c factorial.c
> dbug_analyze_SOURCES =  dbug_analyze.c
>+dbug_analyze_LDADD =	$(top_builddir)/mysys/libmythr.la
> 
> all:            user.t user.ps
> 
>diff -u -r mysql-5.0.72-old/extra/Makefile.am mysql-5.0.72/extra/Makefile.am
>--- mysql-5.0.72-old/extra/Makefile.am	2008-12-15 03:22:13.000000000 -0100
>+++ mysql-5.0.72/extra/Makefile.am	2008-12-27 16:35:01.000000000 -0100
>@@ -15,8 +15,7 @@
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
> 			@ndbcluster_includes@ -I$(top_srcdir)/sql
>-LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
>-			../dbug/libdbug.a ../strings/libmystrings.a \
>+LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \
> 			$(ZLIB_LIBS)
> BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
>                         $(top_builddir)/include/sql_state.h \
>diff -u -r mysql-5.0.72-old/heap/Makefile.am mysql-5.0.72/heap/Makefile.am
>--- mysql-5.0.72-old/heap/Makefile.am	2008-12-15 03:22:00.000000000 -0100
>+++ mysql-5.0.72/heap/Makefile.am	2008-12-27 16:35:26.000000000 -0100
>@@ -14,14 +14,13 @@
> # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
>-LDADD =			libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
>-			../strings/libmystrings.a
>-pkglib_LIBRARIES =	libheap.a
>+LDADD =			libheap.la ../mysys/libmysys.la
>+pkglib_LTLIBRARIES =	libheap.la
> noinst_PROGRAMS	=	hp_test1 hp_test2
> hp_test1_LDFLAGS = @NOINST_LDFLAGS@
> hp_test2_LDFLAGS = @NOINST_LDFLAGS@
> noinst_HEADERS =	heapdef.h
>-libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
>+libheap_la_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
> 			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 -u -r mysql-5.0.72-old/libmysql/Makefile.am mysql-5.0.72/libmysql/Makefile.am
>--- mysql-5.0.72-old/libmysql/Makefile.am	2008-12-15 03:22:02.000000000 -0100
>+++ mysql-5.0.72/libmysql/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -106,8 +106,8 @@
> 	echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile; \
> 	echo 'CFLAGS=	-I. -DUNDEF_THREADS_HACK' >>$$dir/Makefile; \
> 	echo "obj=$$objs"  >>$$dir/Makefile; \
>-	echo 'all: libmysql.a'  >>$$dir/Makefile; \
>-	echo 'libmysql.a: $$(obj)'  >>$$dir/Makefile; \
>+	echo 'all: libmysql.la'  >>$$dir/Makefile; \
>+	echo 'libmysql.la: $$(obj)'  >>$$dir/Makefile; \
> 	echo '	$$(AR) r $$@ $$?'  >>$$dir/Makefile; \
> 	gtar cvzf $$dir.tar.gz $$dir; \
> 	cd $$dir; gmake
>diff -u -r mysql-5.0.72-old/libmysqld/Makefile.am mysql-5.0.72/libmysqld/Makefile.am
>--- mysql-5.0.72-old/libmysqld/Makefile.am	2008-12-15 03:22:14.000000000 -0100
>+++ mysql-5.0.72/libmysqld/Makefile.am	2008-12-27 16:35:45.000000000 -0100
>@@ -32,8 +32,8 @@
> 			-I$(top_srcdir)/regex \
> 			$(openssl_includes) @ZLIB_INCLUDES@
> 
>-noinst_LIBRARIES =	libmysqld_int.a
>-pkglib_LIBRARIES =	libmysqld.a
>+noinst_LTLIBRARIES =	libmysqld_int.la
>+pkglib_LTLIBRARIES =	libmysqld.la
> SUBDIRS =		. examples
> libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc
> libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \
>@@ -66,50 +66,21 @@
> 	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
> 	ha_blackhole.cc ha_archive.cc my_user.c
> 
>-libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
>-libmysqld_a_SOURCES=
>+libmysqld_int_la_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
>+libmysqld_la_SOURCES=
> 
> # automake misses these
> sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
> 
>-# The following libraries should be included in libmysqld.a
>-INC_LIB=	$(top_builddir)/regex/libregex.a \
>-		$(top_builddir)/myisam/libmyisam.a \
>-		$(top_builddir)/myisammrg/libmyisammrg.a \
>-		$(top_builddir)/heap/libheap.a \
>+# The following libraries should be included in libmysqld.la
>+libmysqld_la_LIBADD=	$(top_builddir)/regex/libregex.la \
>+		$(top_builddir)/myisam/libmyisam.la \
>+		$(top_builddir)/myisammrg/libmyisammrg.la \
>+		$(top_builddir)/heap/libheap.la \
> 		@innodb_libs@ @bdb_libs_with_path@ \
>-		$(top_builddir)/mysys/libmysys.a \
>-		$(top_builddir)/strings/libmystrings.a \
>-		$(top_builddir)/dbug/libdbug.a \
>-		$(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@
>-
>-
>-#
>-# To make it easy for the end user to use the embedded library we
>-# generate a total libmysqld.a from all library files,
>-
>-# note - InnoDB libraries have circular dependencies, so in INC_LIB
>-# few libraries are present two times. Metrowerks linker doesn't like
>-# it at all. Traditional ar has no problems with it, but still there's no
>-# need to add the same file twice to the library, so 'sort -u' save us
>-# some time and spares unnecessary work.
>-
>-libmysqld.a:	libmysqld_int.a $(INC_LIB)
>-if DARWIN_MWCC
>-	mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u`
>-else
>-		-rm -f libmysqld.a
>-		if test "$(host_os)" = "netware" ; \
>-		then \
>-		  $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \
>-		else \
>-		  for arc in ./libmysqld_int.a $(INC_LIB); do \
>-		    arpath=`echo $$arc|sed 's|[^/]*$$||'`; \
>-		    $(AR) t $$arc|sed "s|^|$$arpath|"; \
>-		  done | sort -u | xargs $(AR) cq libmysqld.a ; \
>-		  $(RANLIB) libmysqld.a	; \
>-		fi
>-endif
>+		$(top_builddir)/mysys/libmysys.la \
>+		$(top_builddir)/vio/libvio.la @NDB_SCI_LIBS@ \
>+		libmysqld_int.la
> 
> ## XXX: any time the client interface changes, we'll need to bump
> ## the version info for libmysqld; however, it's possible for the
>diff -u -r mysql-5.0.72-old/myisam/Makefile.am mysql-5.0.72/myisam/Makefile.am
>--- mysql-5.0.72-old/myisam/Makefile.am	2008-12-15 03:22:00.000000000 -0100
>+++ mysql-5.0.72/myisam/Makefile.am	2008-12-27 16:39:24.000000000 -0100
>@@ -17,26 +17,25 @@
> pkgdata_DATA =		mi_test_all mi_test_all.res
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
>-LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
>-			$(top_builddir)/mysys/libmysys.a \
>-			$(top_builddir)/dbug/libdbug.a \
>-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@
>-pkglib_LIBRARIES =	libmyisam.a
>+LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.la \
>+			$(top_builddir)/mysys/libmysys.la \
>+			@ZLIB_LIBS@
>+pkglib_LTLIBRARIES =	libmyisam.la
> bin_PROGRAMS =		myisamchk myisamlog myisampack myisam_ftdump
>-myisamchk_DEPENDENCIES=	$(LIBRARIES)
>-myisamlog_DEPENDENCIES=	$(LIBRARIES)
>-myisampack_DEPENDENCIES=$(LIBRARIES)
>+myisamchk_DEPENDENCIES=	$(LTLIBRARIES)
>+myisamlog_DEPENDENCIES=	$(LTLIBRARIES)
>+myisampack_DEPENDENCIES=$(LTLIBRARIES)
> noinst_PROGRAMS =	mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval
> noinst_HEADERS =	myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h fulltext.h ftdefs.h ft_test1.h ft_eval.h
>-mi_test1_DEPENDENCIES=	$(LIBRARIES)
>-mi_test2_DEPENDENCIES=	$(LIBRARIES)
>-mi_test3_DEPENDENCIES=	$(LIBRARIES)
>-#ft_test1_DEPENDENCIES=	$(LIBRARIES)
>-#ft_eval_DEPENDENCIES=	$(LIBRARIES)
>-myisam_ftdump_DEPENDENCIES=	$(LIBRARIES)
>-rt_test_DEPENDENCIES=	$(LIBRARIES)
>-sp_test_DEPENDENCIES=	$(LIBRARIES)
>-libmyisam_a_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
>+mi_test1_DEPENDENCIES=	$(LTLIBRARIES)
>+mi_test2_DEPENDENCIES=	$(LTLIBRARIES)
>+mi_test3_DEPENDENCIES=	$(LTLIBRARIES)
>+#ft_test1_DEPENDENCIES=	$(LTLIBRARIES)
>+#ft_eval_DEPENDENCIES=	$(LTLIBRARIES)
>+myisam_ftdump_DEPENDENCIES=	$(LTLIBRARIES)
>+rt_test_DEPENDENCIES=	$(LTLIBRARIES)
>+sp_test_DEPENDENCIES=	$(LTLIBRARIES)
>+libmyisam_la_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \
> 			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 -u -r mysql-5.0.72-old/myisammrg/Makefile.am mysql-5.0.72/myisammrg/Makefile.am
>--- mysql-5.0.72-old/myisammrg/Makefile.am	2008-12-15 03:22:19.000000000 -0100
>+++ mysql-5.0.72/myisammrg/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -14,9 +14,9 @@
> # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
>-pkglib_LIBRARIES =	libmyisammrg.a
>+pkglib_LTLIBRARIES =	libmyisammrg.la
> noinst_HEADERS =	myrg_def.h
>-libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
>+libmyisammrg_la_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
> 			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 -u -r mysql-5.0.72-old/mysys/Makefile.am mysql-5.0.72/mysys/Makefile.am
>--- mysql-5.0.72-old/mysys/Makefile.am	2008-12-15 03:22:12.000000000 -0100
>+++ mysql-5.0.72/mysys/Makefile.am	2008-12-29 02:35:46.000000000 -0100
>@@ -18,14 +18,12 @@
> MYSQLBASEdir=		$(prefix)
> INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
> 			-I$(top_srcdir)/include -I$(srcdir)
>-pkglib_LIBRARIES =	libmysys.a
>-LDADD =			libmysys.a ../dbug/libdbug.a \
>-			../strings/libmystrings.a
>+pkglib_LTLIBRARIES =	libmysys.la
> noinst_HEADERS =	mysys_priv.h my_static.h \
> 			my_os2cond.c my_os2dirsrch.c my_os2dirsrch.h \
> 			my_os2dlfcn.c my_os2file64.c my_os2mutex.c \
> 			my_os2thread.c my_os2tls.c
>-libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
>+libmysys_la_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
> 			mf_path.c mf_loadpath.c my_file.c \
> 			my_open.c my_create.c my_dup.c my_seek.c my_read.c \
> 			my_pread.c my_write.c my_getpagesize.c \
>@@ -49,21 +47,27 @@
> 			my_quick.c my_lockmem.c my_static.c \
> 			my_sync.c my_getopt.c my_mkdir.c \
> 			default_modify.c default.c \
>-                        my_compress.c checksum.c raid.cc \
>+			my_compress.c checksum.c raid.cc \
> 			my_net.c my_port.c my_sleep.c \
> 			charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
> 			my_gethostbyname.c rijndael.c my_aes.c sha1.c \
> 			my_handler.c my_netware.c my_largepage.c \
>-			my_memmem.c \
>-			my_windac.c my_access.c base64.c my_libwrap.c
>+			my_memmem.c my_windac.c my_access.c base64.c \
>+			my_libwrap.c
>+libmysys_LIBADD = $(top_builddir)/dbug/libdbug.la $(top_builddir)/strings/libmystrings.la
>+if NEED_THREADS
>+	libmythr_la_SOURCES = thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.c my_pthread.c my_thr_init.c mf_keycache.c
>+	libmysys_LIBADD += libmythr.la
>+endif
>+
> EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
> 			thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
> 			my_wincond.c my_winthread.c CMakeLists.txt
>-libmysys_a_LIBADD =	@THREAD_LOBJECTS@
>-# test_dir_DEPENDENCIES=	$(LIBRARIES)
>-# testhash_DEPENDENCIES=	$(LIBRARIES)
>-# test_charset_DEPENDENCIES=	$(LIBRARIES)
>-# charset2html_DEPENDENCIES=	$(LIBRARIES)
>+libmysys_la_LIBADD=
>+# test_dir_DEPENDENCIES=	$(LTLIBRARIES)
>+# testhash_DEPENDENCIES=	$(LTLIBRARIES)
>+# test_charset_DEPENDENCIES=	$(LTLIBRARIES)
>+# charset2html_DEPENDENCIES=	$(LTLIBRARIES)
> EXTRA_PROGRAMS =	
> DEFS =			-DDEFAULT_BASEDIR=\"$(prefix)\" \
> 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
>@@ -74,7 +78,7 @@
> 			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
>                         @DEFS@
> 
>-libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@
>+libmysys_la_DEPENDENCIES=
> 
> # I hope this always does the right thing. Otherwise this is only test programs
> FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
>@@ -84,41 +88,41 @@
> # which automaticly removes the object files you use to compile a final program
> #
> 
>-test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
>+test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
> 	$(LINK) $(FLAGS) -DMAIN  ./test_thr_alarm.c $(LDADD) $(LIBS)
> 	$(RM) -f ./test_thr_alarm.c
> 
>-test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES)
>+test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/thr_lock.c test_thr_lock.c
> 	$(LINK) $(FLAGS) -DMAIN  ./test_thr_lock.c $(LDADD) $(LIBS)
> 	$(RM) -f ./test_thr_lock.c
> 
>-test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES)
>+test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c
> 	$(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS)
> 	$(RM) -f test_vsnprintf.c
> 
>-test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES)
>+test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/mf_iocache.c test_io_cache.c
> 	$(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS)
> 	$(RM) -f test_io_cache.c
> 
>-test_dir$(EXEEXT): test_dir.c $(LIBRARIES)
>+test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES)
> 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS)
> 
>-test_charset$(EXEEXT): test_charset.c $(LIBRARIES)
>+test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES)
> 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS)
> 
>-testhash$(EXEEXT): testhash.c $(LIBRARIES)
>+testhash$(EXEEXT): testhash.c $(LTLIBRARIES)
> 	$(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS)
> 
>-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES)
>+test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c
> 	$(LINK) $(FLAGS) -DMAIN  ./test_gethwaddr.c $(LDADD) $(LIBS)
> 	$(RM) -f ./test_gethwaddr.c
> 
>-test_base64$(EXEEXT): base64.c $(LIBRARIES)
>+test_base64$(EXEEXT): base64.c $(LTLIBRARIES)
> 	$(CP) $(srcdir)/base64.c ./test_base64.c
> 	$(LINK) $(FLAGS) -DMAIN  ./test_base64.c $(LDADD) $(LIBS)
> 	$(RM) -f ./test_base64.c
>diff -u -r mysql-5.0.72-old/netware/Makefile.am mysql-5.0.72/netware/Makefile.am
>--- mysql-5.0.72-old/netware/Makefile.am	2008-12-15 03:21:57.000000000 -0100
>+++ mysql-5.0.72/netware/Makefile.am	2008-12-27 16:38:16.000000000 -0100
>@@ -16,14 +16,13 @@
> 
> if HAVE_NETWARE
> INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include -I..
>-LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
>-				../dbug/libdbug.a ../strings/libmystrings.a
>+LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la
> bin_PROGRAMS =			mysqld_safe mysql_install_db mysql_test_run libmysql
> mysqld_safe_SOURCES=		mysqld_safe.c my_manage.c
> mysql_install_db_SOURCES=	mysql_install_db.c my_manage.c
> mysql_test_run_SOURCES=		mysql_test_run.c my_manage.c
> libmysql_SOURCES=		libmysqlmain.c
>-libmysql_LDADD =		../libmysql/.libs/libmysqlclient.a \
>+libmysql_LDADD =		../libmysql/.libs/libmysqlclient.la \
> 				@openssl_libs@ @yassl_libs@
> 
> netware_build_files =           client/mysql.def client/mysqladmin.def \
>Only in mysql-5.0.72/netware: Makefile.am.save
>diff -u -r mysql-5.0.72-old/pstack/Makefile.am mysql-5.0.72/pstack/Makefile.am
>--- mysql-5.0.72-old/pstack/Makefile.am	2008-12-15 03:21:54.000000000 -0100
>+++ mysql-5.0.72/pstack/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -27,8 +27,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_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 -u -r mysql-5.0.72-old/regex/Makefile.am mysql-5.0.72/regex/Makefile.am
>--- mysql-5.0.72-old/regex/Makefile.am	2008-12-15 03:21:57.000000000 -0100
>+++ mysql-5.0.72/regex/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -16,10 +16,10 @@
> # MA 02111-1307, USA
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
>-noinst_LIBRARIES =	libregex.a
>-LDADD=			libregex.a $(top_builddir)/strings/libmystrings.a
>+noinst_LTLIBRARIES =	libregex.la
>+LDADD=			libregex.la $(top_builddir)/strings/libmystrings.la
> noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c my_regex.h
>-libregex_a_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
>+libregex_la_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
> noinst_PROGRAMS =	re
> re_SOURCES =		split.c debug.c main.c
> re_LDFLAGS= @NOINST_LDFLAGS@
>diff -u -r mysql-5.0.72-old/sql/Makefile.am mysql-5.0.72/sql/Makefile.am
>--- mysql-5.0.72-old/sql/Makefile.am	2008-12-15 03:21:54.000000000 -0100
>+++ mysql-5.0.72/sql/Makefile.am	2008-12-27 16:38:49.000000000 -0100
>@@ -29,14 +29,13 @@
> EXTRA_PROGRAMS =	gen_lex_hash
> bin_PROGRAMS =		mysql_tzinfo_to_sql
> gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
>-LDADD =			$(top_builddir)/myisam/libmyisam.a \
>-			$(top_builddir)/myisammrg/libmyisammrg.a \
>-			$(top_builddir)/heap/libheap.a \
>-			$(top_builddir)/vio/libvio.a \
>-			$(top_builddir)/mysys/libmysys.a \
>-			$(top_builddir)/dbug/libdbug.a \
>-			$(top_builddir)/regex/libregex.a \
>-			$(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@
>+LDADD =			$(top_builddir)/myisam/libmyisam.la \
>+			$(top_builddir)/myisammrg/libmyisammrg.la \
>+			$(top_builddir)/heap/libheap.la \
>+			$(top_builddir)/vio/libvio.la \
>+			$(top_builddir)/mysys/libmysys.la \
>+			$(top_builddir)/regex/libregex.la \
>+			@ZLIB_LIBS@ @NDB_SCI_LIBS@
> 
> mysqld_LDADD =		@MYSQLD_EXTRA_LDFLAGS@ \
> 			@bdb_libs@ @innodb_libs@ @pstack_libs@ \
>diff -u -r mysql-5.0.72-old/strings/Makefile.am mysql-5.0.72/strings/Makefile.am
>--- mysql-5.0.72-old/strings/Makefile.am	2008-12-15 03:21:51.000000000 -0100
>+++ mysql-5.0.72/strings/Makefile.am	2008-12-26 22:22:05.000000000 -0100
>@@ -16,7 +16,7 @@
> # This file is public domain and comes with NO WARRANTY of any kind
> 
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
>-pkglib_LIBRARIES =	libmystrings.a
>+noinst_LTLIBRARIES =	libmystrings.la
> 
> # Exact one of ASSEMBLER_X
> if ASSEMBLER_x86
>@@ -37,7 +37,7 @@
> endif
> endif
> 
>-libmystrings_a_SOURCES = $(ASRCS) $(CSRCS)
>+libmystrings_la_SOURCES = $(ASRCS) $(CSRCS)
> noinst_PROGRAMS = conf_to_src
> # Default charset definitions
> EXTRA_DIST =		ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc_kr.c ctype-win1250ch.c \
>@@ -54,25 +54,25 @@
> 			strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
> 			t_ctype.h CMakeLists.txt
> 
>-libmystrings_a_LIBADD=
>-conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
>-conf_to_src_LDADD=
>+libmystrings_la_LIBADD=
>+conf_to_src_SOURCES = conf_to_src.c
>+conf_to_src_LDADD = libmystrings.la
> #force static linking of conf_to_src - essential when linking against
> #custom installation of libc
>-conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
>+#conf_to_src_LDFLAGS= @NOINST_LDFLAGS@
> 
> # This is because the dependency tracking misses @FOO@ vars in sources.
> #strtoull.o:		@CHARSET_OBJS@
> 
> 
>-FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
>+FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
> 
>-str_test: str_test.c $(pkglib_LIBRARIES)
>-	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES)
>+str_test: str_test.c $(pkglib_LTLIBRARIES)
>+	$(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LTLIBRARIES)
> 
>-test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES)
>+test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES)
> 	$(CP) $(srcdir)/decimal.c ./test_decimal.c
>-	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES)
>+	$(LINK) $(FLAGS) -DMAIN  ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIES)
> 	$(RM) -f ./test_decimal.c
> 
> # Don't update the files from bitkeeper
>diff -u -r mysql-5.0.72-old/tests/Makefile.am mysql-5.0.72/tests/Makefile.am
>--- mysql-5.0.72-old/tests/Makefile.am	2008-12-15 03:22:14.000000000 -0100
>+++ mysql-5.0.72/tests/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -42,11 +42,11 @@
> 
> insert_test_SOURCES=       insert_test.c
> select_test_SOURCES=       select_test.c
>-insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
>-select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
>+insert_test_DEPENDENCIES=	$(LTLIBRARIES) $(pkglib_LTLIBRARIES)
>+select_test_DEPENDENCIES=	$(LTLIBRARIES) $(pkglib_LTLIBRARIES)
> 
> bug25714_SOURCES=          bug25714.c
>-bug25714_DEPENDENCIES=     $(LIBRARIES) $(pkglib_LTLIBRARIES)
>+bug25714_DEPENDENCIES=     $(LTLIBRARIES) $(pkglib_LTLIBRARIES)
> 
> # Fix for mit-threads
> DEFS =			-DUNDEF_THREADS_HACK
>diff -u -r mysql-5.0.72-old/tools/Makefile.am mysql-5.0.72/tools/Makefile.am
>--- mysql-5.0.72-old/tools/Makefile.am	2008-12-15 03:22:00.000000000 -0100
>+++ mysql-5.0.72/tools/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -23,7 +23,7 @@
> 
> bin_PROGRAMS=		mysqltestmanager
> mysqltestmanager_SOURCES=	mysqlmanager.c
>-mysqltestmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
>+mysqltestmanager_DEPENDENCIES=	$(LTLIBRARIES) $(pkglib_LTLIBRARIES)
> DEF=			-DUNDEF_THREADS_HACK
> 
> # Don't update the files from bitkeeper
>diff -u -r mysql-5.0.72-old/vio/Makefile.am mysql-5.0.72/vio/Makefile.am
>--- mysql-5.0.72-old/vio/Makefile.am	2008-12-15 03:22:02.000000000 -0100
>+++ mysql-5.0.72/vio/Makefile.am	2008-12-18 03:52:56.000000000 -0100
>@@ -16,11 +16,11 @@
> INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
> 			$(openssl_includes)
> LDADD =			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs)
>-pkglib_LIBRARIES =	libvio.a
>+pkglib_LTLIBRARIES =	libvio.la
> 
> noinst_HEADERS =	vio_priv.h
> 
>-libvio_a_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
>+libvio_la_SOURCES =	vio.c viosocket.c viossl.c viosslfactories.c
> 
> EXTRA_DIST=	CMakeLists.txt
>

Actions: View

Attachments on bug 238487: 168288 | 170337 | 177179 | 185083 | 185098 | 185133 | 186606 | 186704 | 187558 | 188019 | 188025 | 188057