Author: rvs
Date: Thu Dec 8 02:30:12 2011
New Revision: 1211744
URL: http://svn.apache.org/viewvc?rev=1211744&view=rev
Log:
BIGTOP-289. hadoop-0.23: need to package native libraries for compression
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build?rev=1211744&r1=1211743&r2=1211744&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/do-component-build
Thu Dec 8 02:30:12 2011
@@ -16,12 +16,17 @@
set -ex
+if [ -z "$BUNDLE_SNAPPY" ] ; then
+ [ -f /usr/lib/libsnappy.so ] && BUNDLE_SNAPPY="-Dsnappy.prefix=x
-Dbundle.snappy=true -Dsnappy.lib=/usr/lib"
+ [ -f /usr/lib64/libsnappy.so ] && BUNDLE_SNAPPY="-Dsnappy.prefix=x
-Dbundle.snappy=true -Dsnappy.lib=/usr/lib64"
+fi
+
mkdir build
mkdir build/src
# Build artifacts
MAVEN_SKIP_TESTS="-DskipTests -DskipTest -DskipITs"
-mvn -Pdist -Pnative -Psrc -Dtar ${MAVEN_SKIP_TESTS} install "$@"
+mvn $BUNDLE_SNAPPY -Pdist -Pnative -Psrc -Dtar ${MAVEN_SKIP_TESTS} install "$@"
# Build documentation
# FIXME: the pushd/popd block is an ugly workaround for spurious Maven failures
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1211744&r1=1211743&r2=1211744&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Thu Dec 8 02:30:12 2011
@@ -207,7 +207,7 @@ install -d -m 0755 ${SYSTEM_INCLUDE_DIR}
cp ${BUILD_DIR}/../hadoop-hdfs-project/hadoop-hdfs/src/main/native/hdfs.h
${SYSTEM_INCLUDE_DIR}/
cp ${BUILD_DIR}/lib/*.a ${HADOOP_NATIVE_LIB_DIR}/
-for library in libhadoop.so.1.0.0; do
+for library in libsnappy.so.1.* libhadoop.so.1.0.0; do
cp ${BUILD_DIR}/lib/${library} ${HADOOP_NATIVE_LIB_DIR}/
ldconfig -vlN ${HADOOP_NATIVE_LIB_DIR}/${library}
done
