Skip to content

M
mariadb
Commit 6c85ba39 authored by kent@mysql.com/kent-amd64.(none)'s avatar kent@mysql.com/kent-amd64.(none)
Browse files
Options

gen_rec.awk: 

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree
parent 34cedd8d
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 42 deletions
acinclude.m4
View file @ 6c85ba39
...@@ -1448,20 +1448,20 @@ bdb_version_ok=yes ...@@ -1448,20 +1448,20 @@ bdb_version_ok=yes
]) ])
AC_DEFUN([MYSQL_TOP_BUILDDIR], [ AC_DEFUN([MYSQL_TOP_BUILDDIR], [
# Remove trailing "./" if any
[$1]=`echo $[$1] | sed -e 's,^\./,,'`
case "$[$1]" in case "$[$1]" in
/* ) ;; # don't do anything with an absolute path "bdb" | "$srcdir/bdb" | "$top_srcdir/bdb" | "$abs_top_srcdir/bdb" )
"$srcdir"/* )
# If BDB is under the source directory, we need to look under the # If BDB is under the source directory, we need to look under the
# build directory for bdb/build_unix. # build directory for bdb/build_unix.
# NOTE: I'm being lazy, and assuming the user did not specify [$1]="\$(top_builddir)/bdb"
# something like --with-berkeley-db=bdb (it would be missing "./").
[$1]="\$(top_builddir)/"`echo "$[$1]" | sed -e "s,^$srcdir/,,"`
;; ;;
/* ) ;; # Other absolute path is assume to be external BDB directory
* ) * )
AC_MSG_ERROR([The BDB directory must be directly under the MySQL source directory, or be specified using the full path. ('$srcdir'; '$[$1]')]) AC_MSG_ERROR([The BDB directory must be directly under the MySQL source directory, or be specified using the full path. ('$srcdir'; '$[$1]')])
;; ;;
esac esac
if test X"$[$1]" != "/" if test X"$[$1]" != X"/"
then then
[$1]=`echo $[$1] | sed -e 's,/$,,'` [$1]=`echo $[$1] | sed -e 's,/$,,'`
fi fi
...@@ -1493,7 +1493,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [ ...@@ -1493,7 +1493,7 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
AC_MSG_RESULT([Using Innodb]) AC_MSG_RESULT([Using Innodb])
AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB]) AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
have_innodb="yes" have_innodb="yes"
innodb_includes="-I../innobase/include" innodb_includes="-I\$(top_builddir)/innobase/include -I\$(top_srcdir)/innobase/include"
innodb_system_libs="" innodb_system_libs=""
dnl Some libs are listed several times, in order for gcc to sort out dnl Some libs are listed several times, in order for gcc to sort out
dnl circular references. dnl circular references.
...@@ -1812,7 +1812,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [ ...@@ -1812,7 +1812,7 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
AC_MSG_RESULT([Using NDB Cluster]) AC_MSG_RESULT([Using NDB Cluster])
AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB]) AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
have_ndbcluster="yes" have_ndbcluster="yes"
ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi" ndbcluster_includes="-I\$(top_builddir)/ndb/include -I\$(top_srcdir)/ndb/include -I\$(top_srcdir)/ndb/include/ndbapi"
ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a" ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
ndbcluster_system_libs="" ndbcluster_system_libs=""
ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la" ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
......
bdb/dist/gen_rec.awk
View file @ 6c85ba39
...@@ -180,7 +180,7 @@ BEGIN { ...@@ -180,7 +180,7 @@ BEGIN {
t = types[i]; t = types[i];
if (modes[i] == "POINTER") { if (modes[i] == "POINTER") {
ndx = index(t, "*"); ndx = index(t, "*");
t = substr(types[i], 0, ndx - 2); t = substr(types[i], 1, ndx - 2);
} }
printf("\t%s\t%s;\n", t, vars[i]) >> HFILE printf("\t%s\t%s;\n", t, vars[i]) >> HFILE
} }
......
configure.in
View file @ 6c85ba39
...@@ -46,12 +46,14 @@ do ...@@ -46,12 +46,14 @@ do
case $host_os in case $host_os in
netware* | modesto*) netware* | modesto*)
echo "$i/errmsg.sys: $i/errmsg.txt echo "$i/errmsg.sys: $i/errmsg.txt
\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \ mkdir -p $i
\$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ \$(srcdir)/$i/errmsg.txt $i/errmsg.sys" \
>> $AVAILABLE_LANGUAGES_ERRORS_RULES >> $AVAILABLE_LANGUAGES_ERRORS_RULES
;; ;;
*) *)
echo "$i/errmsg.sys: $i/errmsg.txt echo "$i/errmsg.sys: $i/errmsg.txt
\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \ mkdir -p $i
\$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ \$(srcdir)/$i/errmsg.txt $i/errmsg.sys" \
>> $AVAILABLE_LANGUAGES_ERRORS_RULES >> $AVAILABLE_LANGUAGES_ERRORS_RULES
;; ;;
esac esac
......
libmysql_r/Makefile.am
View file @ 6c85ba39
...@@ -31,8 +31,6 @@ INCLUDES = @MT_INCLUDES@ \ ...@@ -31,8 +31,6 @@ INCLUDES = @MT_INCLUDES@ \
## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
include $(top_srcdir)/libmysql/Makefile.shared include $(top_srcdir)/libmysql/Makefile.shared
libmysql_dir = $(top_srcdir)/libmysql
libmysqlclient_r_la_SOURCES = $(target_sources) libmysqlclient_r_la_SOURCES = $(target_sources)
libmysqlclient_r_la_LIBADD = $(target_libadd) libmysqlclient_r_la_LIBADD = $(target_libadd)
libmysqlclient_r_la_LDFLAGS = $(target_ldflags) libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
...@@ -40,7 +38,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags) ...@@ -40,7 +38,9 @@ libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
# This is called from the toplevel makefile # This is called from the toplevel makefile
link_sources: link_sources:
set -x; \ set -x; \
for f in `cd $(libmysql_dir) && echo *.[ch]`; do \ for d in $(top_srcdir)/libmysql $(top_builddir)/libmysql; do \
rm -f $$f; \ for f in `cd $$d && echo *.[ch]`; do \
@LN_CP_F@ $(libmysql_dir)/$$f $$f; \ rm -f $$f; \
@LN_CP_F@ $$d/$$f $$f; \
done; \
done done
libmysqld/Makefile.am
View file @ 6c85ba39
...@@ -25,9 +25,11 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ ...@@ -25,9 +25,11 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" -DSHAREDIR="\"$(MYSQLSHAREdir)\""
INCLUDES= @MT_INCLUDES@ @bdb_includes@ \ INCLUDES= @MT_INCLUDES@ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
-I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_builddir)/include -I$(top_srcdir)/include \
-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \ -I$(top_builddir)/sql -I$(top_srcdir)/sql \
-I$(top_srcdir)/sql/examples \
-I$(top_srcdir)/regex \
$(openssl_includes) @ZLIB_INCLUDES@ $(openssl_includes) @ZLIB_INCLUDES@
noinst_LIBRARIES = libmysqld_int.a noinst_LIBRARIES = libmysqld_int.a
...@@ -118,16 +120,28 @@ endif ...@@ -118,16 +120,28 @@ endif
#libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@ #libmysqld_la_LDFLAGS = -version-info @SHARED_LIB_VERSION@
#CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la #CLEANFILES = $(libmysqld_la_LIBADD) libmysqld.la
# This is called from the toplevel makefile # This is called from the toplevel makefile. If we can link now
# to an existing file in source, we do that, else we assume it
# will show up in the build tree eventually (generated file).
link_sources: link_sources:
set -x; \ set -x; \
for f in $(sqlsources); do \ for f in $(sqlsources); do \
rm -f $$f; \ rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ if test -e $(top_srcdir)/sql/$$f ; \
then \
@LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
else \
@LN_CP_F@ $(top_builddir)/sql/$$f $$f; \
fi ; \
done; \ done; \
for f in $(libmysqlsources); do \ for f in $(libmysqlsources); do \
rm -f $$f; \ rm -f $$f; \
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \ if test -e $(top_srcdir)/libmysql/$$f ; \
then \
@LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \
else \
@LN_CP_F@ $(top_builddir)/libmysql/$$f $$f; \
fi ; \
done; \ done; \
for f in $(sqlexamplessources); do \ for f in $(sqlexamplessources); do \
rm -f $$f; \ rm -f $$f; \
......
ndb/config/common.mk.am
View file @ 6c85ba39
...@@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi" ...@@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi" mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
INCLUDES = $(INCLUDES_LOC) INCLUDES = $(INCLUDES_LOC)
LDADD = $(LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc LDADD = $(LDADD_LOC) -L$(top_builddir)/ndb/src/common/portlib -lmygcc
DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC)
ndb/config/type_kernel.mk.am
View file @ 6c85ba39
INCLUDES += \ INCLUDES += \
-I$(srcdir) -I$(top_srcdir)/include \ -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \ -I$(top_srcdir)/ndb/include \
-I$(top_srcdir)/ndb/src/kernel/vm \ -I$(top_srcdir)/ndb/src/kernel/vm \
-I$(top_srcdir)/ndb/src/kernel/error \ -I$(top_srcdir)/ndb/src/kernel/error \
......
ndb/config/type_ndbapi.mk.am
View file @ 6c85ba39
INCLUDES += \ INCLUDES += \
-I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \ -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \
-I$(top_srcdir)/ndb/include/kernel \ -I$(top_srcdir)/ndb/include/kernel \
-I$(top_srcdir)/ndb/include/transporter \ -I$(top_srcdir)/ndb/include/transporter \
-I$(top_srcdir)/ndb/include/debugger \ -I$(top_srcdir)/ndb/include/debugger \
......
ndb/config/type_ndbapitest.mk.am
View file @ 6c85ba39
...@@ -5,7 +5,10 @@ LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \ ...@@ -5,7 +5,10 @@ LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \ INCLUDES += -I$(top_srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \ -I$(top_srcdir)/ndb/include \
-I$(top_srcdir)/ndb/include/ndbapi \ -I$(top_srcdir)/ndb/include/ndbapi \
-I$(top_srcdir)/ndb/include/util \ -I$(top_srcdir)/ndb/include/util \
......
ndb/config/type_ndbapitools.mk.am
View file @ 6c85ba39
...@@ -5,7 +5,10 @@ LDADD += \ ...@@ -5,7 +5,10 @@ LDADD += \
$(top_builddir)/mysys/libmysys.a \ $(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \ -I$(top_srcdir)/ndb/include \
-I$(top_srcdir)/ndb/include/ndbapi \ -I$(top_srcdir)/ndb/include/ndbapi \
-I$(top_srcdir)/ndb/include/util \ -I$(top_srcdir)/ndb/include/util \
......
ndb/config/type_util.mk.am
View file @ 6c85ba39
INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ INCLUDES += -I$(srcdir) \
-I$(top_builddir)/include \
-I$(top_builddir)/ndb/include \
-I$(top_srcdir)/include \
-I$(top_srcdir)/ndb/include \ -I$(top_srcdir)/ndb/include \
-I$(top_srcdir)/ndb/include/util \ -I$(top_srcdir)/ndb/include/util \
-I$(top_srcdir)/ndb/include/portlib \ -I$(top_srcdir)/ndb/include/portlib \
......
ndb/src/kernel/Makefile.am
View file @ 6c85ba39
...@@ -9,21 +9,21 @@ ndbd_SOURCES = main.cpp SimBlockList.cpp ...@@ -9,21 +9,21 @@ ndbd_SOURCES = main.cpp SimBlockList.cpp
include $(top_srcdir)/ndb/config/type_kernel.mk.am include $(top_srcdir)/ndb/config/type_kernel.mk.am
INCLUDES += \ INCLUDES += \
-Iblocks/cmvmi \ -I$(srcdir)/blocks/cmvmi \
-Iblocks/dbacc \ -I$(srcdir)/blocks/dbacc \
-Iblocks/dbdict \ -I$(srcdir)/blocks/dbdict \
-Iblocks/dbdih \ -I$(srcdir)/blocks/dbdih \
-Iblocks/dblqh \ -I$(srcdir)/blocks/dblqh \
-Iblocks/dbtc \ -I$(srcdir)/blocks/dbtc \
-Iblocks/dbtup \ -I$(srcdir)/blocks/dbtup \
-Iblocks/ndbfs \ -I$(srcdir)/blocks/ndbfs \
-Iblocks/ndbcntr \ -I$(srcdir)/blocks/ndbcntr \
-Iblocks/qmgr \ -I$(srcdir)/blocks/qmgr \
-Iblocks/trix \ -I$(srcdir)/blocks/trix \
-Iblocks/backup \ -I$(srcdir)/blocks/backup \
-Iblocks/dbutil \ -I$(srcdir)/blocks/dbutil \
-Iblocks/suma \ -I$(srcdir)/blocks/suma \
-Iblocks/dbtux -I$(srcdir)/blocks/dbtux
LDADD += \ LDADD += \
blocks/cmvmi/libcmvmi.a \ blocks/cmvmi/libcmvmi.a \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7