Repository: incubator-hawq Updated Branches: refs/heads/master e8c745a63 -> c589334d6
HAWQ-775. Provide a seperate PLR package. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/c589334d Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/c589334d Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/c589334d Branch: refs/heads/master Commit: c589334d6e23fc56c1870fd8a8099d279b503a7d Parents: e8c745a Author: Paul Guo <[email protected]> Authored: Thu Jun 2 17:34:41 2016 +0800 Committer: rlei <[email protected]> Committed: Mon Jun 6 10:52:56 2016 +0800 ---------------------------------------------------------------------- configure | 8 ++++++++ configure.in | 4 ++++ src/pl/Makefile | 19 +++++++++++++++---- src/pl/plr.spec | 15 +++++++++++++++ 4 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c589334d/configure ---------------------------------------------------------------------- diff --git a/configure b/configure index 2760ca7..20346e6 100755 --- a/configure +++ b/configure @@ -5766,6 +5766,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_r" >&5 $as_echo "$with_r" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: +*** For license reason, we do not install pl/plr into hawq, instead please build the package +*** yourself by running \"make -C src/pl plr_pkgbuild\" on the root workspace path. +*** Then the package could be found under src/pl/build." >&5 +$as_echo "$as_me: WARNING: +*** For license reason, we do not install pl/plr into hawq, instead please build the package +*** yourself by running \"make -C src/pl plr_pkgbuild\" on the root workspace path. +*** Then the package could be found under src/pl/build." >&2;} http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c589334d/configure.in ---------------------------------------------------------------------- diff --git a/configure.in b/configure.in index 009d411..684bc58 100644 --- a/configure.in +++ b/configure.in @@ -705,6 +705,10 @@ AC_SUBST(with_java) AC_MSG_CHECKING([whether to build R modules]) PGAC_ARG_BOOL(with, r, no, [ --with-r build R modules (PL/R)]) AC_MSG_RESULT([$with_r]) +AC_MSG_WARN([ +*** For license reason, we do not install pl/plr into hawq, instead please build the package +*** yourself by running "make -C src/pl plr_pkgbuild" on the root workspace path. +*** Then the package could be found under src/pl/build.]) AC_SUBST(with_r) http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c589334d/src/pl/Makefile ---------------------------------------------------------------------- diff --git a/src/pl/Makefile b/src/pl/Makefile index 49f2a9b..79c6550 100644 --- a/src/pl/Makefile +++ b/src/pl/Makefile @@ -32,6 +32,7 @@ endif ifeq ($(with_r), yes) DIRS += plr +endif # fixme: depend on plr.patch also. plr_prepare: @@ -41,14 +42,24 @@ plr_prepare: (cd $(abs_top_srcdir)/$(subdir)/plr; git apply ../plr.patch) && \ touch $(abs_top_builddir)/$(subdir)/plr_prepare_timestamp; \ fi + +ABS_PLR_SRCDIR = $(abs_top_srcdir)/$(subdir)/plr + +# rpm only so far. +plr_pkgbuild: plr_prepare + if [ ! -f /etc/redhat-release ]; then echo "rpm build is not supported on the platform."; exit 1; fi + rm -rf plr/build; mkdir plr/build; + rpmbuild -bb plr.spec --define 'plr_srcdir $(ABS_PLR_SRCDIR)' --define '_topdir $(ABS_PLR_SRCDIR)/build' --define '__os_install_post \%{nil}' + +ifeq ($(with_r), yes) +plr_prepare2: plr_prepare else -plr_prepare: +plr_prepare2: endif -.PHONY: plr_prepare +.PHONY: plr_prepare plr_prepare2 plr_pkgbuild -# We need to fetch plrr if needed. -all install installdirs uninstall distprep: plr_prepare +all distprep install installdirs uninstall: plr_prepare2 @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit 1; done clean distclean maintainer-clean: http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/c589334d/src/pl/plr.spec ---------------------------------------------------------------------- diff --git a/src/pl/plr.spec b/src/pl/plr.spec new file mode 100644 index 0000000..eb08778 --- /dev/null +++ b/src/pl/plr.spec @@ -0,0 +1,15 @@ +Summary: PL/R module for HAWQ +Name: plr-hawq +Version: 08.03.00.14 +Release: 0 +Prefix: /usr/local +License: GPL + +%description +The PL/R modules provides Procedural language implementation of R for HAWQ. + +%install +make -C %{plr_srcdir} install prefix=%{buildroot}/usr/local + +%files +/usr/local
