Repository: incubator-hawq Updated Branches: refs/heads/master de4760bf2 -> 9a3f8b94d
HAWQ-1098. Fixed building error when "configure --prefix=" different directory without running "make distclean" Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/9a3f8b94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/9a3f8b94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/9a3f8b94 Branch: refs/heads/master Commit: 9a3f8b94d65855b498d5a6fb6690a9af2182528c Parents: de4760b Author: Ming LI <m...@apache.org> Authored: Thu Oct 13 13:37:46 2016 +0800 Committer: Ming LI <m...@apache.org> Committed: Thu Oct 13 17:17:20 2016 +0800 ---------------------------------------------------------------------- configure | 8 ++++++++ configure.in | 8 ++++++++ depends/libhdfs3/Makefile | 6 +++--- depends/libyarn/Makefile | 6 +++--- 4 files changed, 22 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9a3f8b94/configure ---------------------------------------------------------------------- diff --git a/configure b/configure index 93e23ad..69d68a6 100755 --- a/configure +++ b/configure @@ -16555,6 +16555,14 @@ ac_config_commands="$ac_config_commands check_win32_symlinks" fi +# Remove build_timestamp file to make sure rebuild depends lib: libhdfs & libyarn +rm -f depends/libhdfs3/build/libhdfs3_build_timestamp +rm -f depends/libyarn/build/libyarn_build_timestamp +rm -f depends/thirdparty/gporca_build_timestamp +rm -f depends/thirdparty/gpos_build_timestamp +rm -f depends/thirdparty/gp-xerces_build_timestamp +rm -f depends/thirdparty/gpos_build_timestamp + ac_config_headers="$ac_config_headers src/include/pg_config.h" http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9a3f8b94/configure.in ---------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 8560886..4f091e1 100644 --- a/configure.in +++ b/configure.in @@ -2163,6 +2163,14 @@ for FILE in $CONFIG_LINKS ]) fi +# Remove build_timestamp file to make sure rebuild depends lib: libhdfs & libyarn +rm -f depends/libhdfs3/build/libhdfs3_build_timestamp +rm -f depends/libyarn/build/libyarn_build_timestamp +rm -f depends/thirdparty/gporca_build_timestamp +rm -f depends/thirdparty/gpos_build_timestamp +rm -f depends/thirdparty/gp-xerces_build_timestamp +rm -f depends/thirdparty/gpos_build_timestamp + AC_CONFIG_HEADERS([src/include/pg_config.h], [ # Update timestamp for pg_config.h (see Makefile.global) http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9a3f8b94/depends/libhdfs3/Makefile ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/Makefile b/depends/libhdfs3/Makefile index 28d405d..a60d8a8 100644 --- a/depends/libhdfs3/Makefile +++ b/depends/libhdfs3/Makefile @@ -54,7 +54,7 @@ maintainer-clean: distclean clean: if [ -d $(top_builddir)/$(subdir)/build ]; then \ - cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ + cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f libhdfs3_build_timestamp; \ fi build: pre-config @@ -65,8 +65,8 @@ pre-config: cd $(top_builddir)/$(subdir)/; \ mkdir -p build; \ cd build; \ - if [ ! -f build.timestamp ]; then \ - $(abs_top_srcdir)/$(subdir)/bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) && touch build.timestamp; \ + if [ ! -f libhdfs3_build_timestamp ]; then \ + $(abs_top_srcdir)/$(subdir)/bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) && touch libhdfs3_build_timestamp; \ fi else http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/9a3f8b94/depends/libyarn/Makefile ---------------------------------------------------------------------- diff --git a/depends/libyarn/Makefile b/depends/libyarn/Makefile index 0a20476..c6754a5 100644 --- a/depends/libyarn/Makefile +++ b/depends/libyarn/Makefile @@ -54,7 +54,7 @@ maintainer-clean: distclean clean: if [ -d $(top_builddir)/$(subdir)/build ]; then \ - cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f build.timestamp; \ + cd $(top_builddir)/$(subdir)/build && $(MAKE) clean && rm -f libyarn_build_timestamp; \ fi build: pre-config @@ -65,8 +65,8 @@ pre-config: cd $(top_builddir)/$(subdir)/; \ mkdir -p build; \ cd build; \ - if [ ! -f build.timestamp ]; then \ - $(abs_top_srcdir)/$(subdir)/bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) && touch build.timestamp; \ + if [ ! -f libyarn_build_timestamp ]; then \ + $(abs_top_srcdir)/$(subdir)/bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) && touch libyarn_build_timestamp; \ fi else
