You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by ml...@apache.org on 2015/10/26 03:19:44 UTC
incubator-hawq git commit: HAWQ-78. Fixed parallel build error(using
"make -j8")
Repository: incubator-hawq
Updated Branches:
refs/heads/master e9fe5f331 -> bda243e83
HAWQ-78. Fixed parallel build error(using "make -j8")
Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/bda243e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/bda243e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/bda243e8
Branch: refs/heads/master
Commit: bda243e838231499ed45ad31ac4d82a33e613823
Parents: e9fe5f3
Author: Ming LI <ml...@pivotal.io>
Authored: Fri Oct 23 20:02:12 2015 +0800
Committer: Ming LI <ml...@pivotal.io>
Committed: Mon Oct 26 10:13:25 2015 +0800
----------------------------------------------------------------------
src/backend/catalog/Makefile | 3 ++-
src/backend/common.mk | 2 +-
src/backend/gpopt/Makefile | 9 +++------
3 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bda243e8/src/backend/catalog/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 015a3ab..e066cff 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -26,9 +26,10 @@ SUBDIRS = caql core hcatalog
BKIFILES = postgres.bki postgres.description postgres.shdescription
+OTHER_TASK = cdb_init.sql cdb_util.sql cdb_schema.sql gp_toolkit.sql gp_toolkit_test.sql $(BKIFILES)
+
include $(top_srcdir)/src/backend/common.mk
-all: cdb_init.sql cdb_util.sql cdb_schema.sql gp_toolkit.sql gp_toolkit_test.sql $(BKIFILES)
cdb_init.sql: cdb_schema.sql filesystem.sql
cat $(call vpathsearch,cdb_schema.sql) $(call vpathsearch,cdb_external_extensions.sql) $(call vpathsearch,filesystem.sql) $(call vpathsearch,madlib.sql) > cdb_init.sql
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bda243e8/src/backend/common.mk
----------------------------------------------------------------------
diff --git a/src/backend/common.mk b/src/backend/common.mk
index dc94507..37ffea8 100644
--- a/src/backend/common.mk
+++ b/src/backend/common.mk
@@ -22,7 +22,7 @@ SUBDIROBJS = $(SUBDIRS:%=%/$(subsysfilename))
# top-level backend directory obviously has its own "all" target
ifneq ($(subdir), src/backend)
-all: $(subsysfilename)
+all: $(subsysfilename) $(OTHER_TASK)
endif
SUBSYS.o: $(SUBDIROBJS) $(OBJS)
http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bda243e8/src/backend/gpopt/Makefile
----------------------------------------------------------------------
diff --git a/src/backend/gpopt/Makefile b/src/backend/gpopt/Makefile
index f80e363..eb58017 100644
--- a/src/backend/gpopt/Makefile
+++ b/src/backend/gpopt/Makefile
@@ -18,7 +18,7 @@ SUBDIRS = config translate relcache utils
OBJS = Allocators.o CGPOptimizer.o gpdbwrappers.o
-include $(top_srcdir)/src/backend/common.mk
+OTHER_TASK = libdxltranslators.$(LDSFX) libgpoptudf.$(LDSFX)
ifeq (Darwin, $(UNAME))
LDLIBFLAGS = -dynamiclib -flat_namespace -undefined dynamic_lookup -Wl,-unexported_symbols_list -Wl,unexported_symbols_list.txt
@@ -44,10 +44,7 @@ LIBNAUCRATES_DIR = $(ORCA_DEPENDS_DIR_INTER)/libnaucrates
LIBGPDBCOST_DIR = $(ORCA_DEPENDS_DIR_INTER)/libgpdbcost
LIBGPOPT_DIR = $(ORCA_DEPENDS_DIR_INTER)/libgpopt
-all: $(SUBDIRS) libdxltranslators.$(LDSFX) libgpoptudf.$(LDSFX)
-
-$(SUBDIRS):
- $(MAKE) -C $@
+include $(top_srcdir)/src/backend/common.mk
libdxltranslators.$(LDSFX): $(SUBDIROBJS) $(OBJS)
$(CXX) $(CXXFLAGS) $(LDLIBFLAGS) \
@@ -71,4 +68,4 @@ install:
$(INSTALL_DATA) libdxltranslators.$(LDSFX) '$(DESTDIR)$(libdir)/libdxltranslators.$(LDSFX)'
$(INSTALL_DATA) libgpoptudf.$(LDSFX) '$(DESTDIR)$(libdir)/libgpoptudf.$(LDSFX)'
-.PHONY: all install $(SUBDIRS)
+.PHONY: install