From: Date: September 11 2006 4:49pm Subject: bk commit into 4.1 tree (knielsen:1.2535) BUG#16282 List-Archive: http://lists.mysql.com/commits/11695 X-Bug: 16282 Message-Id: Below is the list of changes that have just been committed into a local 4.1 repository of knielsen. When knielsen does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2006-09-11 16:49:44+02:00, knielsen@ymer.(none) +4 -0 BUG#16282 Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). This fix is for 4.1. In 5.0 and up a different fix is used. ndb/config/common.mk.am@stripped, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +1 -1 Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/config/type_ndbapitools.mk.am@stripped, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +1 -1 Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/src/common/portlib/Makefile.am@stripped, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +2 -1 Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). ndb/src/kernel/Makefile.am@stripped, 2006-09-11 16:49:41+02:00, knielsen@ymer.(none) +2 -1 Build gcc.o as a small library, instead of passing .cpp sources to the linker command (causes problems with parallel make on Solaris). # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: knielsen # Host: ymer.(none) # Root: /usr/local/mysql/mysql-4.1 --- 1.6/ndb/config/common.mk.am 2006-09-11 16:49:47 +02:00 +++ 1.7/ndb/config/common.mk.am 2006-09-11 16:49:47 +02:00 @@ -7,6 +7,6 @@ ndbapiincludedir = "$(pkgincludedir)/ndb mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi" INCLUDES = $(INCLUDES_LOC) -LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC) +LDADD = $(LDADD_LOC) -L$(top_srcdir)/ndb/src/common/portlib -lmygcc DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS) NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) --- 1.8/ndb/src/common/portlib/Makefile.am 2006-09-11 16:49:48 +02:00 +++ 1.9/ndb/src/common/portlib/Makefile.am 2006-09-11 16:49:48 +02:00 @@ -1,4 +1,5 @@ -noinst_HEADERS = gcc.cpp +noinst_LIBRARIES = libmygcc.a +libmygcc_a_SOURCES = gcc.cpp noinst_LTLIBRARIES = libportlib.la --- 1.11/ndb/src/kernel/Makefile.am 2006-09-11 16:49:48 +02:00 +++ 1.12/ndb/src/kernel/Makefile.am 2006-09-11 16:49:48 +02:00 @@ -53,7 +53,8 @@ LDADD += \ $(top_builddir)/ndb/src/common/util/libgeneral.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc + # Don't update the files from bitkeeper %::SCCS/s.% --- 1.8/ndb/config/type_ndbapitools.mk.am 2006-09-11 16:49:48 +02:00 +++ 1.9/ndb/config/type_ndbapitools.mk.am 2006-09-11 16:49:48 +02:00 @@ -3,7 +3,7 @@ LDADD += \ $(top_builddir)/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -lmygcc INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \ -I$(top_srcdir)/ndb/include \