database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Makefile.am:

Browse Source 
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.
This commit is contained in:
unknown
2006-02-18 04:23:24 +01:00
parent 8c62b87143
commit 3470647a6d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/Makefile.am
View File

@@ -27,7 +27,7 @@ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
$(openssl_includes) $(yassl_includes) $(openssl_includes) $(yassl_includes)
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
$(top_builddir)/libmysql/libmysqlclient.la $(top_builddir)/libmysql/libmysqlclient.la
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
mysqldump mysqlimport mysqltest mysqlbinlog \ mysqldump mysqlimport mysqltest mysqlbinlog \
@@ -77,7 +77,7 @@ link_sources:
@LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
done; \ done; \
rm -f $(srcdir)/my_user.c; \ 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 # Don't update the files from bitkeeper

2
scripts/make_win_src_distribution.sh
View File

@@ -250,7 +250,7 @@ copy_dir_dirs() {
# #
for i in client dbug extra storage/heap include storage/archive storage/example \ 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 \ storage/myisammrg mysys regex sql strings sql-common sql/examples \
tools vio zlib tools vio zlib
do do