database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0:

Browse Source 
1) Ensure "init_db.sql" and "test_db-sql" really get built.

2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.


netware/BUILD/compile-netware-END:
  Ensure the "*.def" files are built for NetWare.
  
  This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
  the general "link_sources" step might fall victim to a cleanup which would be fatal
  just for NetWare, because of problems in the ordering of SUBDIR entries.
netware/Makefile.am:
  1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
  
  2) Use "basename", not sed.
This commit is contained in:
unknown
2007-08-24 23:07:59 +02:00
parent 46d5ebb120
commit 4a801dde7e
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netware/BUILD/compile-netware-END
View File

@@ -29,8 +29,15 @@ fi
# configure # configure
./configure $base_configs $extra_configs ./configure $base_configs $extra_configs
# make # Ensure a clean tree
make clean bin-dist make clean
# Link NetWare specific .def files into their proper locations
# in the source tree
( cd netware && make link_sources )
# Now, do the real build
make bin-dist
# mark the build # mark the build
for file in *.tar.gz *.zip for file in *.tar.gz *.zip

14
netware/Makefile.am
View File

@@ -40,13 +40,19 @@ netware_build_files = client/mysql.def client/mysqladmin.def \
sql/mysqld.def extra/mysql_waitpid.def \ sql/mysqld.def extra/mysql_waitpid.def \
extra/resolve_stack_dump.def myisam/myisam_ftdump.def extra/resolve_stack_dump.def myisam/myisam_ftdump.def
BUILT_SOURCES = link_sources init_db.sql test_db.sql
CLEANFILES = $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
link_sources: link_sources:
set -x; \ set -x; \
for f in $(netware_build_files); do \ for f in $(netware_build_files); do \
rm -f ../$$f; \ rm -f ../$$f; \
org=`echo $$f | sed -e 's/.*\/\(.*\)/\1/g'`; \ org=`basename $$f`; \
@LN_CP_F@ $(srcdir)/$$org ../$$f; \ @LN_CP_F@ $(srcdir)/$$org ../$$f; \
done done
else else
BUILT_SOURCES = libmysql.imp init_db.sql test_db.sql BUILT_SOURCES = libmysql.imp init_db.sql test_db.sql
@@ -86,6 +92,8 @@ EXTRA_DIST= $(BUILT_SOURCES) comp_err.def install_test_db.ncf \
BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \ BUILD/mwasmnlm BUILD/mwccnlm BUILD/mwenv BUILD/mwldnlm \
BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch BUILD/nwbootstrap BUILD/openssl.imp BUILD/save-patch
endif
# Build init_db.sql from the files that contain # Build init_db.sql from the files that contain
# the system tables for this version of MySQL plus any commands # the system tables for this version of MySQL plus any commands
@@ -103,9 +111,7 @@ init_db.sql: $(top_srcdir)/scripts/mysql_system_tables.sql \
test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql test_db.sql: init_db.sql $(top_srcdir)/scripts/mysql_test_data_timezone.sql
@echo "Building $@"; @echo "Building $@";
@cat init_db.sql \ @cat init_db.sql \
$(top_srcdir)/scripts/mysql_test_data_timezone.sql >> $@; $(top_srcdir)/scripts/mysql_test_data_timezone.sql > $@;
endif
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%