Repository: incubator-hawq Updated Branches: refs/heads/master 395d790a8 -> 1b0e6e2d7
HAWQ-711. Integrate libhdfs3 and libyarn makefile into hawq Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/1b0e6e2d Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/1b0e6e2d Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/1b0e6e2d Branch: refs/heads/master Commit: 1b0e6e2d728b5f4f9da09ecc19dc32c87a9fdc81 Parents: 395d790 Author: Ming LI <[email protected]> Authored: Fri Apr 22 16:44:53 2016 -0700 Committer: Ming LI <[email protected]> Committed: Wed Apr 27 17:52:07 2016 +0800 ---------------------------------------------------------------------- GNUmakefile.in | 8 ++++ configure | 66 ++++++++------------------------ configure.in | 5 ++- depends/libhdfs3/.gitignore | 2 + depends/libhdfs3/Makefile | 33 ++++++++++++++++ depends/libhdfs3/Makefile.global.in | 21 ++++++++++ depends/libyarn/.gitignore | 2 + depends/libyarn/Makefile | 33 ++++++++++++++++ depends/libyarn/Makefile.global.in | 21 ++++++++++ 9 files changed, 140 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/GNUmakefile.in ---------------------------------------------------------------------- diff --git a/GNUmakefile.in b/GNUmakefile.in index f20ee2c..5523967 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -10,6 +10,8 @@ include $(top_builddir)/src/Makefile.global all: # $(MAKE) -C doc all + $(MAKE) -C depends/libhdfs3 all + $(MAKE) -C depends/libyarn all $(MAKE) -C src all $(MAKE) -C config all $(MAKE) -C contrib/formatter_fixedwidth all @@ -22,6 +24,8 @@ all: install: # $(MAKE) -C doc $@ + $(MAKE) -C depends/libhdfs3 $@ + $(MAKE) -C depends/libyarn $@ $(MAKE) -C src $@ $(MAKE) -C config $@ $(MAKE) -C contrib/formatter_fixedwidth $@ @@ -34,6 +38,8 @@ install: installdirs uninstall: # $(MAKE) -C doc $@ + $(MAKE) -C depends/libhdfs3 $@ + $(MAKE) -C depends/libyarn $@ $(MAKE) -C src $@ $(MAKE) -C config $@ $(MAKE) -C contrib/formatter_fixedwidth $@ @@ -53,6 +59,8 @@ distprep: clean: # $(MAKE) -C doc $@ $(MAKE) -C contrib $@ + $(MAKE) -C depends/libhdfs3 $@ + $(MAKE) -C depends/libyarn $@ $(MAKE) -C src $@ $(MAKE) -C config $@ $(MAKE) -C contrib/formatter_fixedwidth $@ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/configure ---------------------------------------------------------------------- diff --git a/configure b/configure index 76842d4..5e65a48 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HAWQ 8.2.15. # -# Report bugs to https://issues.apache.org/jira/browse/HAWQ +# Report bugs to <https://issues.apache.org/jira/browse/HAWQ>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -269,11 +269,10 @@ fi $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell [email protected] and -$0: https://issues.apache.org/jira/browse/HAWQ -$0: about your system, including any -$0: error possibly output before this message. Then install -$0: a modern shell, or manually run the script under such a -$0: shell if you do have one." +$0: https://issues.apache.org/jira/browse/HAWQ about your +$0: system, including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." fi exit 1 fi @@ -841,7 +840,6 @@ enable_cassert enable_forceplan enable_debugbreak enable_debugntuplestore -enable_mdverinstrumentation enable_testutils enable_snmp enable_gphdfs @@ -1516,7 +1514,6 @@ build with coverage testing instrumentation --enable-forceplan enable forcing of plans via EXPLAIN FORCE (for debugging) --enable-debugbreak enable debug_break and debug_break_n (for debugging) --enable-ntuplestore enable debug_ntuplestore (for debugging) - --enable-mdverinstrumentation enable metadata versioning instrumentation --enable-testutils enable testing utilities --enable-snmp enable snmp for MIB and alerts via TRAP/INFORM --enable-gphdfs enables GPHDFS support @@ -1579,7 +1576,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to https://issues.apache.org/jira/browse/HAWQ +Report bugs to <https://issues.apache.org/jira/browse/HAWQ>. _ACEOF ac_status=$? fi @@ -1849,9 +1846,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------ ## +( $as_echo "## --------------------------------------------------------- ## ## Report this to https://issues.apache.org/jira/browse/HAWQ ## -## ------------------------------------ ##" +## --------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2088,9 +2085,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## --------------------------------------------------- ## +( $as_echo "## --------------------------------------------------------- ## ## Report this to https://issues.apache.org/jira/browse/HAWQ ## -## -------------------------------------------------- ##" +## --------------------------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -5336,34 +5333,6 @@ fi -# Enable metadata versioning instrumentation - -pgac_args="$pgac_args enable_mdverinstrumentation" - -# Check whether --enable-mdverinstrumentation was given. -if test "${enable_mdverinstrumentation+set}" = set; then : - enableval=$enable_mdverinstrumentation; - case $enableval in - yes) - -$as_echo "#define MD_VERSIONING_INSTRUMENTATION 1" >>confdefs.h - - ;; - no) - : - ;; - *) - as_fn_error $? "no argument expected for --enable-mdverinstrumentation option" "$LINENO" 5 - ;; - esac - -else - enable_mdverinstrumentation=no - -fi - - - # # Enable testing utilities # @@ -5532,9 +5501,6 @@ fi - - - # # Include directories # @@ -11125,10 +11091,10 @@ fi for ac_header in json-c/json.h do : - ac_fn_c_check_header_mongrel "$LINENO" "json-c/json.h" "ac_cv_header_json_json_h" "$ac_includes_default" -if test "x$ac_cv_header_json_json_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "json-c/json.h" "ac_cv_header_json_c_json_h" "$ac_includes_default" +if test "x$ac_cv_header_json_c_json_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_JSON_JSON_H 1 +#define HAVE_JSON_C_JSON_H 1 _ACEOF else @@ -16540,7 +16506,7 @@ fi -ac_config_files="$ac_config_files GNUmakefile src/VERSIONS.mk src/Makefile.global src/pl/pljava/src/java/Makefile.global" +ac_config_files="$ac_config_files GNUmakefile src/VERSIONS.mk depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global" ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}" @@ -17128,7 +17094,7 @@ $config_links Configuration commands: $config_commands -Report bugs to https://issues.apache.org/jira/browse/HAWQ"; +Report bugs to <https://issues.apache.org/jira/browse/HAWQ>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -17260,6 +17226,8 @@ do "src/backend/port/tas.s") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/tas.s:src/backend/port/tas/${tas_file}" ;; "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; "src/VERSIONS.mk") CONFIG_FILES="$CONFIG_FILES src/VERSIONS.mk" ;; + "depends/libhdfs3/Makefile.global") CONFIG_FILES="$CONFIG_FILES depends/libhdfs3/Makefile.global" ;; + "depends/libyarn/Makefile.global") CONFIG_FILES="$CONFIG_FILES depends/libyarn/Makefile.global" ;; "src/Makefile.global") CONFIG_FILES="$CONFIG_FILES src/Makefile.global" ;; "src/pl/pljava/src/java/Makefile.global") CONFIG_FILES="$CONFIG_FILES src/pl/pljava/src/java/Makefile.global" ;; "src/backend/port/dynloader.c") CONFIG_LINKS="$CONFIG_LINKS src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c" ;; http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/configure.in ---------------------------------------------------------------------- diff --git a/configure.in b/configure.in index a5b322b..f1fdc02 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -AC_INIT([HAWQ], [8.2.15], [[email protected]]) +AC_INIT([HAWQ], [8.2.15], [https://issues.apache.org/jira/browse/HAWQ]) AC_PREREQ(2.63) dnl m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required. @@ -310,6 +310,7 @@ elif test "$GCC" = yes; then CFLAGS="-O0" else CFLAGS="-O3" + fi else # if the user selected debug mode, don't use -O if test "$enable_debug" != yes; then @@ -2055,7 +2056,7 @@ fi AC_SUBST(vpath_build) -AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk src/Makefile.global src/pl/pljava/src/java/Makefile.global]) +AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global]) AC_CONFIG_LINKS([ src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libhdfs3/.gitignore ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/.gitignore b/depends/libhdfs3/.gitignore new file mode 100644 index 0000000..8341b2e --- /dev/null +++ b/depends/libhdfs3/.gitignore @@ -0,0 +1,2 @@ +build/ +Makefile.global http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libhdfs3/Makefile ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/Makefile b/depends/libhdfs3/Makefile new file mode 100644 index 0000000..e509659 --- /dev/null +++ b/depends/libhdfs3/Makefile @@ -0,0 +1,33 @@ +# -*-makefile-*- +#------------------------------------------------------------------------------ +# A makefile that integrate building this module with hawq +#------------------------------------------------------------------------------ +subdir = depends/libhdfs3 +top_builddir = ../../ +include Makefile.global + +PRE_CFG_ARG = +# get argument for running ../boostrap +ifeq ($(enable_debug), yes) + PRE_CFG_ARG += --enable-debug +endif # enable_debug + +ifeq ($(enable_coverage), yes) + PRE_CFG_ARG += --enable-coverage +endif # enable_coverage + +########################################################################## +# +.PHONY: all install make pre-config + +all : make + +install: make + cd $(top_srcdir)/$(subdir)/build && $(MAKE) -j8 install + +make: pre-config + cd $(top_srcdir)/$(subdir)/build && $(MAKE) -j8 + +pre-config: + cd $(top_srcdir)/$(subdir)/ && mkdir -p build && cd build && ../bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) + http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libhdfs3/Makefile.global.in ---------------------------------------------------------------------- diff --git a/depends/libhdfs3/Makefile.global.in b/depends/libhdfs3/Makefile.global.in new file mode 100644 index 0000000..12dd05c --- /dev/null +++ b/depends/libhdfs3/Makefile.global.in @@ -0,0 +1,21 @@ +# -*-makefile-*- +#------------------------------------------------------------------------------ +# A makefile that integrate building this module with hawq +#------------------------------------------------------------------------------ + +prefix := @prefix@ +enable_debug = @enable_debug@ +enable_coverage = @enable_coverage@ + +# Support for VPATH builds +vpath_build = @vpath_build@ +abs_top_srcdir = @abs_top_srcdir@ + +ifneq ($(vpath_build),yes) +top_srcdir = $(top_builddir) +srcdir = . +else # vpath_build = yes +top_srcdir = $(abs_top_srcdir) +srcdir = $(top_srcdir)/$(subdir) +VPATH = $(srcdir) +endif http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libyarn/.gitignore ---------------------------------------------------------------------- diff --git a/depends/libyarn/.gitignore b/depends/libyarn/.gitignore new file mode 100644 index 0000000..8341b2e --- /dev/null +++ b/depends/libyarn/.gitignore @@ -0,0 +1,2 @@ +build/ +Makefile.global http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libyarn/Makefile ---------------------------------------------------------------------- diff --git a/depends/libyarn/Makefile b/depends/libyarn/Makefile new file mode 100644 index 0000000..3e17622 --- /dev/null +++ b/depends/libyarn/Makefile @@ -0,0 +1,33 @@ +# -*-makefile-*- +#------------------------------------------------------------------------------ +# A makefile that integrate building this module with hawq +#------------------------------------------------------------------------------ +subdir = depends/libyarn +top_builddir = ../../ +include Makefile.global + +PRE_CFG_ARG = +# get argument for running ../boostrap +ifeq ($(enable_debug), yes) + PRE_CFG_ARG += --enable-debug +endif # enable_debug + +ifeq ($(enable_coverage), yes) + PRE_CFG_ARG += --enable-coverage +endif # enable_coverage + +########################################################################## +# +.PHONY: all install make pre-config + +all : make + +install: make + cd $(top_srcdir)/$(subdir)/build && $(MAKE) -j8 install + +make: pre-config + cd $(top_srcdir)/$(subdir)/build && $(MAKE) -j8 + +pre-config: + cd $(top_srcdir)/$(subdir)/ && mkdir -p build && cd build && ../bootstrap --prefix=$(prefix) $(PRE_CFG_ARG) + http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/1b0e6e2d/depends/libyarn/Makefile.global.in ---------------------------------------------------------------------- diff --git a/depends/libyarn/Makefile.global.in b/depends/libyarn/Makefile.global.in new file mode 100644 index 0000000..12dd05c --- /dev/null +++ b/depends/libyarn/Makefile.global.in @@ -0,0 +1,21 @@ +# -*-makefile-*- +#------------------------------------------------------------------------------ +# A makefile that integrate building this module with hawq +#------------------------------------------------------------------------------ + +prefix := @prefix@ +enable_debug = @enable_debug@ +enable_coverage = @enable_coverage@ + +# Support for VPATH builds +vpath_build = @vpath_build@ +abs_top_srcdir = @abs_top_srcdir@ + +ifneq ($(vpath_build),yes) +top_srcdir = $(top_builddir) +srcdir = . +else # vpath_build = yes +top_srcdir = $(abs_top_srcdir) +srcdir = $(top_srcdir)/$(subdir) +VPATH = $(srcdir) +endif
