[incubator-age] branch master updated: fix: Fix errors that occur during parallel builds (#86)

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dehowef pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-age.git


The following commit(s) were added to refs/heads/master by this push:
     new e30ca32  fix: Fix errors that occur during parallel builds (#86)
e30ca32 is described below

commit e30ca329e61dd494820bd1b582743cba22eced50
Author: Alex Kwak <ta...@kakao.com>
AuthorDate: Wed Aug 4 06:29:22 2021 +0900

    fix: Fix errors that occur during parallel builds (#86)
    
    When trying to build `cypher_keywords.c` and `cypher_keywords.c`, `cypher_gram.y` must have been prebuilt, but it does not.
    thus, by adding dependencies on this, we correct the problem encountered in Parallel make.
    also, including fixes for include header without directory.
---
 .travis.yml |  2 +-
 Makefile    | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2ad44c2..97ca1da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ jobs:
         - postgresql-11
         - postgresql-server-dev-11
     script:
-    - sudo make install
+    - sudo make install -j$(nproc)
     - make installcheck
     after_failure: cat regress/regression.diffs
   - name: documentation
diff --git a/Makefile b/Makefile
index ab26abd..acb835b 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ REGRESS = scan \
           cypher_match \
           cypher_set \
           cypher_remove \
-	  cypher_delete \
+          cypher_delete \
           cypher_with \
           drop
 
@@ -79,15 +79,20 @@ ag_regress_dir = $(srcdir)/regress
 REGRESS_OPTS = --load-extension=age --inputdir=$(ag_regress_dir) --outputdir=$(ag_regress_dir) --temp-instance=$(ag_regress_dir)/instance --port=61958
 
 ag_regress_out = instance/ log/ results/ regression.*
-EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out))
+EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out)) src/backend/parser/cypher_gram.c src/include/parser/cypher_gram_def.h
 
 ag_include_dir = $(srcdir)/src/include
-PG_CPPFLAGS = -I$(ag_include_dir)
+PG_CPPFLAGS = -I$(ag_include_dir) -I$(ag_include_dir)/parser
 
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-src/backend/parser/cypher_gram.c: BISONFLAGS += --defines=$(ag_include_dir)/parser/$(basename $(notdir $@))_def.h
+src/include/parser/cypher_gram_def.h: src/backend/parser/cypher_gram.c
+
+src/backend/parser/cypher_gram.c: BISONFLAGS += --defines=src/include/parser/cypher_gram_def.h
+
+src/backend/parser/cypher_parser.o: src/backend/parser/cypher_gram.c
+src/backend/parser/cypher_keywords.o: src/backend/parser/cypher_gram.c
 
 src/backend/parser/ag_scanner.c: FLEX_NO_BACKUP=yes