Permalink
Browse files

BIGTOP-23. Switching to pig 0.9.0 to allow for building with Java 6.

There's a Forrest 0.8/Java 6/Pig < 0.9.0 problem that leads to
hangs/out of heap space errors. This was fixed in Pig 0.9.0, so we'll
switch our pig version to that. This does end up also requiring
explicitly specifying the pig version on the ant calls in the Debian
and RPM builds, due to a snafu in the pig tarball where the version is
set to 0.9.1-SNAPSHOT, even though it's the 0.9.0 release
tarball. Some minor tweaks were needed to package.mk to support making
sure the needed variable was available in the Debian build.

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1159446 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent f6d2e8a commit 1c1c7cc5b8707e809e76c52c5cb73f3ec2900ea9 Andrew Bayer committed Aug 18, 2011
Showing with 6 additions and 5 deletions.
  1. +3 −3 bigtop.mk
  2. +1 −0 package.mk
  3. +1 −1 src/pkg/deb/pig/rules
  4. +1 −1 src/pkg/rpm/pig/SPECS/pig.spec
View
6 bigtop.mk
@@ -52,15 +52,15 @@ HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-0.90.3/
$(eval $(call PACKAGE,hbase,HBASE))
# Pig
-PIG_BASE_VERSION=0.8.1
-PIG_PKG_VERSION=0.8.1
+PIG_BASE_VERSION=0.9.0
+PIG_PKG_VERSION=$(PIG_BASE_VERSION)
PIG_RELEASE_VERSION=1
PIG_NAME=pig
PIG_RELNOTES_NAME=Apache Pig
PIG_PKG_NAME=hadoop-pig
PIG_TARBALL_DST=pig-$(PIG_BASE_VERSION).tar.gz
PIG_TARBALL_SRC=$(PIG_TARBALL_DST)
-PIG_SITE=$(APACHE_MIRROR)/pig/pig-0.8.1/
+PIG_SITE=$(APACHE_MIRROR)/pig/pig-$(PIG_BASE_VERSION)/
$(eval $(call PACKAGE,pig,PIG))
# Hive
View
1 package.mk
@@ -98,6 +98,7 @@ $(BUILD_DIR)/%/.deb:
--preserve-envvar FORREST_HOME \
--preserve-envvar MAVEN3_HOME \
--preserve-envvar JAVA_HOME \
+ --set-envvar=$(PKG)_BASE_VERSION=$($(PKG)_BASE_VERSION) \
--set-envvar=$(PKG)_VERSION=$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \
--set-envvar=$(PKG)_RELEASE=$($(PKG)_RELEASE_VERSION) \
-uc -us -b
View
2 src/pkg/deb/pig/rules
@@ -22,7 +22,7 @@ clean:
build-indep: build-indep-stamp
build-indep-stamp: patch-stamp
- ant -Divy.home=`pwd`/debian/.ivy -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp package
+ ant -Divy.home=`pwd`/debian/.ivy -Djava5.home=${JAVA5_HOME} -Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp -Dversion=${PIG_BASE_VERSION} package
touch $@
install: install-indep
View
2 src/pkg/rpm/pig/SPECS/pig.spec
@@ -108,7 +108,7 @@ language called Pig Latin, which has the following key properties:
%build
-ant -Djavac.version=1.6 -Djava5.home=$JAVA5_HOME -Dforrest.home=$FORREST_HOME package
+ant -Djavac.version=1.6 -Djava5.home=$JAVA5_HOME -Dforrest.home=$FORREST_HOME -Dversion=%{pig_base_version} package
#########################

0 comments on commit 1c1c7cc

Please sign in to comment.