Commit 3470647a authored by unknown's avatar unknown
Browse files

Makefile.am: 

  Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory


scripts/make_win_src_distribution.sh:
  Added copying of the include/mysql directory
client/Makefile.am:
  Add redundant CLIENT_THREAD_LIBS to LDADD, to make -lpthread go before
  -lc, required for the static linking with glibc 2.2.5 to work.
parent 8c62b871

client/Makefile.am

+7 −7
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ INCLUDES = -I$(top_builddir)/include \ 
				-I$(top_srcdir)/regex \

                                $(openssl_includes) $(yassl_includes) 

LIBS =				@CLIENT_LIBS@

LDADD=				@CLIENT_EXTRA_LDFLAGS@ \

LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \

                                $(top_builddir)/libmysql/libmysqlclient.la

bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \

				mysqldump mysqlimport mysqltest mysqlbinlog \
@@ -77,7 +77,7 @@ link_sources: 
          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \

        done; \

        rm -f $(srcdir)/my_user.c; \

         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;

        @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c





# Don't update the files from bitkeeper

scripts/make_win_src_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ copy_dir_dirs() { 
#



for i in client dbug extra storage/heap include storage/archive storage/example \

         libmysql libmysqld storage/myisam storage/example \

         include/mysql libmysql libmysqld storage/myisam storage/example \

         storage/myisammrg mysys regex sql strings sql-common sql/examples \

         tools vio zlib

do