# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/10/04 11:57:07+02:00 smurf@smurf.noris.de # exports for mysqlmanager # # libmysql/libmysqlclient.vers # 2004/10/04 11:57:04+02:00 smurf@smurf.noris.de +4 -0 # more exports # # ChangeSet # 2004/10/03 23:25:19+02:00 smurf@smurf.noris.de # symbols for mysqlbinlog # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 23:25:15+02:00 smurf@smurf.noris.de +11 -0 # more symbols # # ChangeSet # 2004/10/03 19:56:54+02:00 smurf@smurf.noris.de # symbols for mysqltest # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 19:56:51+02:00 smurf@smurf.noris.de +8 -0 # more symbols # # ChangeSet # 2004/10/03 18:58:55+02:00 smurf@smurf.noris.de # more for mysqldump # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 18:58:52+02:00 smurf@smurf.noris.de +1 -0 # another one # # ChangeSet # 2004/10/03 17:13:36+02:00 smurf@smurf.noris.de # symbols for mysqldump # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 17:13:33+02:00 smurf@smurf.noris.de +7 -0 # more symbols # # ChangeSet # 2004/10/03 15:42:42+02:00 smurf@smurf.noris.de # more exports: mysqlcheck # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 15:42:39+02:00 smurf@smurf.noris.de +3 -0 # mysqlcheck exports # # ChangeSet # 2004/10/03 11:13:34+02:00 smurf@smurf.noris.de # more exports for mysqladmin # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/03 11:13:31+02:00 smurf@smurf.noris.de +7 -1 # more exports # # ChangeSet # 2004/10/02 22:43:37+02:00 smurf@smurf.noris.de # more exports for mysql # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/02 22:43:25+02:00 smurf@smurf.noris.de +27 -6 # more exports for mysql # # ChangeSet # 2004/10/02 17:53:48+02:00 smurf@smurf.noris.de # libmysqlclient.vers: # Add a bunch of need-to-export functions: mysql # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/02 17:53:39+02:00 smurf@smurf.noris.de +9 -1 # Add a bunch of need-to-export functions: mysql # # ChangeSet # 2004/10/02 15:13:23+02:00 smurf@smurf.noris.de # syntax error in version script # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/02 15:13:20+02:00 smurf@smurf.noris.de +2 -1 # syntax error # # ChangeSet # 2004/10/02 12:59:52+02:00 smurf@smurf.noris.de # Fix syntax error in version script # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/02 12:59:49+02:00 smurf@smurf.noris.de +1 -1 # Fix syntax error # # ChangeSet # 2004/10/02 11:34:20+02:00 smurf@smurf.noris.de # add versioning # TAG: DEBIAN-4.1.5+bk20040930-2 # # libmysql/libmysqlclient.vers # 2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +5 -0 # # libmysql_r/Makefile.am # 2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +8 -2 # add versioning # # libmysql/libmysqlclient.vers # 2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +0 -0 # BitKeeper file /daten/src/mysql/mysql41/libmysql/libmysqlclient.vers # # libmysql/Makefile.am # 2004/10/02 11:34:16+02:00 smurf@smurf.noris.de +9 -2 # add versioning # # debian/changelog # 2004/10/02 11:34:15+02:00 smurf@smurf.noris.de +6 -0 # add versioning # # configure.ac # 2004/10/02 11:34:15+02:00 smurf@smurf.noris.de +21 -0 # add versioning # diff -Nru a/configure.ac b/configure.ac --- a/configure.ac 2004-10-05 13:15:25 +02:00 +++ b/configure.ac 2004-10-05 13:15:25 +02:00 @@ -382,6 +382,27 @@ export CC CXX CFLAGS LD LDFLAGS AR + +dnl This is after AC_PROG_LIBTOOL so that the LD variable +dnl has been set. + +AC_MSG_CHECKING([whether we have GNU ld or compatible]) + +GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script` +if test "$GLD"; then + have_ld_version_script=yes + AC_MSG_RESULT(yes) +else + have_ld_version_script=no + AC_MSG_RESULT(no) + AC_MSG_WARN(*** +*** You may want to rerun configure using --with-gnu-ld to enable versioned symbols. +) +fi + +AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") + + ndb_cxxflags_fix= if test "$GXX" = "yes" then diff -Nru a/debian/changelog b/debian/changelog --- a/debian/changelog 2004-10-05 13:15:25 +02:00 +++ b/debian/changelog 2004-10-05 13:15:25 +02:00 @@ -1,3 +1,9 @@ +mysql-dfsg (4.1.5+bk20040930-2) unstable; urgency=low + + * Add versioning to the client libraries. + + -- Matthias Urlichs Sat, 2 Oct 2004 11:32:28 +0200 + mysql-dfsg (4.1.5+bk20040930-1) unstable; urgency=low * Merged Upstream diff -Nru a/libmysql/Makefile.am b/libmysql/Makefile.am --- a/libmysql/Makefile.am 2004-10-05 13:15:25 +02:00 +++ b/libmysql/Makefile.am 2004-10-05 13:15:25 +02:00 @@ -27,10 +27,17 @@ include $(srcdir)/Makefile.shared +if HAVE_LD_VERSION_SCRIPT + libmysql_version_script_cmd = -Wl,--version-script=$(srcdir)/libmysqlclient.vers +else + libmysql_version_script_cmd = +endif + libmysqlclient_la_SOURCES = $(target_sources) libmysqlclient_la_LIBADD = $(target_libadd) -libmysqlclient_la_LDFLAGS = $(target_ldflags) -EXTRA_DIST = Makefile.shared +libmysqlclient_la_LDFLAGS = $(target_ldflags) $(libmysql_version_script_cmd) + +EXTRA_DIST = Makefile.shared libmysqlclient.vers noinst_HEADERS = client_settings.h # This is called from the toplevel makefile diff -Nru a/libmysql/libmysqlclient.vers b/libmysql/libmysqlclient.vers --- /dev/null Wed Dec 31 16:00:00 196900 +++ b/libmysql/libmysqlclient.vers 2004-10-05 13:15:25 +02:00 @@ -0,0 +1,75 @@ +MYSQL_14 +{ + global: + mysql_*; + my_*; + alloc_root; + bmove_upp; + charsets_dir; + convert_dirname; + create_temp_file; + delete_dynamic; + _dig_vec_upper; + dirname_length; + disabled_my_option; + dynstr_append; + dynstr_append_mem; + dynstr_free; + dynstr_realloc; + dynstr_set; + end_io_cache; + find_type; + fn_format; + free_defaults; + free_root; + freeze_size; + get_charset; + get_charset_by_csname; + get_dynamic; + get_tty_password; + handle_options; + hash_delete; + hash_element; + hash_free; + _hash_init; + hash_search; + hash_search; + init_alloc_root; + init_dynamic_array; + init_dynamic_string; + init_io_cache; + init_time; + insert_dynamic; + int10_to_str; + is_prefix; + llstr; + load_defaults; + longlong10_to_str; + make_scrambled_password; + make_scrambled_password_323; + net_end; + net_flush; + net_safe_read; + print_defaults; + randominit; + set_dynamic; + sql_protocol_typelib; + str2int; + strcend; + strcont; + strdup_root; + strend; + strfill; + strmake; + strnmov; + str_to_datetime; + strxmov; + strxnmov; + system_filename; + test_if_hard_path; + to_unix_path; + unpack_filename; + vio_new; + local: *; +}; + diff -Nru a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am --- a/libmysql_r/Makefile.am 2004-10-05 13:15:25 +02:00 +++ b/libmysql_r/Makefile.am 2004-10-05 13:15:25 +02:00 @@ -32,14 +32,20 @@ libmysql_dir = $(top_srcdir)/libmysql +if HAVE_LD_VERSION_SCRIPT + libmysql_version_script_cmd = -Wl,--version-script=$(srcdir)/libmysqlclient.vers +else + libmysql_version_script_cmd = +endif + libmysqlclient_r_la_SOURCES = $(target_sources) libmysqlclient_r_la_LIBADD = $(target_libadd) -libmysqlclient_r_la_LDFLAGS = $(target_ldflags) +libmysqlclient_r_la_LDFLAGS = $(target_ldflags) $(libmysql_version_script_cmd) # This is called from the toplevel makefile link_sources: set -x; \ - for f in `cd $(libmysql_dir) && echo *.[ch]`; do \ + for f in `cd $(libmysql_dir) && echo *.[ch] *.vers`; do \ rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(libmysql_dir)/$$f $(srcdir)/$$f; \ done