Commit 61d9dfd3 authored by unknown's avatar unknown

Link errors in 5.1.6 on Solaris in debug builds, overcome by not building two NDB test programs.


storage/ndb/src/kernel/blocks/Makefile.am:
  Fix proposed by Jonas Oreland: Stop building "ndb_print_file", it is just for testing.
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Fix proposed by Jonas Oreland: Stop building "test_varpage", it is just for testing.
parent 0a614e7b
...@@ -20,7 +20,7 @@ noinst_LIBRARIES = libblocks.a ...@@ -20,7 +20,7 @@ noinst_LIBRARIES = libblocks.a
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dblqh
libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp libblocks_a_SOURCES = tsman.cpp lgman.cpp pgman.cpp diskpage.cpp restore.cpp
ndbtools_PROGRAMS = ndb_print_file EXTRA_PROGRAMS = ndb_print_file
ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp ndb_print_file_SOURCES = print_file.cpp diskpage.cpp dbtup/tuppage.cpp
ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \ ndb_print_file_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \ $(top_builddir)/storage/ndb/src/libndbclient.la \
......
...@@ -42,7 +42,7 @@ libdbtup.dsp: Makefile \ ...@@ -42,7 +42,7 @@ libdbtup.dsp: Makefile \
@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES) @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
ndbtest_PROGRAMS = test_varpage EXTRA_PROGRAMS = test_varpage
test_varpage_SOURCES = test_varpage.cpp tuppage.cpp test_varpage_SOURCES = test_varpage.cpp tuppage.cpp
test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \ test_varpage_LDFLAGS = @ndb_bin_am_ldflags@ \
$(top_builddir)/storage/ndb/src/libndbclient.la \ $(top_builddir)/storage/ndb/src/libndbclient.la \
......
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