diff -ur root-5.34.11.orig/cmake/modules/RootConfiguration.cmake root-5.34.11/cmake/modules/RootConfiguration.cmake
--- root-5.34.11.orig/cmake/modules/RootConfiguration.cmake 2013-10-31 16:46:31.000000000 +0100
+++ root-5.34.11/cmake/modules/RootConfiguration.cmake 2013-11-06 09:43:56.008974184 +0100
@@ -167,10 +167,6 @@
set(hdfslib ${HDFS_LIBRARY})
set(hdfsincdir ${HDFS_INCLUDE_DIR})
-set(jniincdir ${Java_INCLUDE_DIRS})
-set(jvmlib ${Java_LIBRARIES})
-set(jvmlibdir ${Java_LIBRARY_DIR})
-
set(buildalien ${value${alien}})
set(alienlibdir ${ALIEN_LIBRARY_DIR})
set(alienlib ${ALIEN_LIBRARY})
diff -ur root-5.34.11.orig/config/Makefile.in root-5.34.11/config/Makefile.in
--- root-5.34.11.orig/config/Makefile.in 2013-10-31 16:46:31.000000000 +0100
+++ root-5.34.11/config/Makefile.in 2013-11-06 09:41:09.145976839 +0100
@@ -198,9 +198,6 @@
HDFSLIBDIR := @hdfslibdir@
HDFSCLILIB := @hdfslib@
HDFSINCDIR := $(filter-out /usr/include, @hdfsincdir@)
-JNIINCDIR := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
-JVMCLILIB := @jvmlib@
-JVMLIBDIR := @jvmlibdir@
BUILDALIEN := @buildalien@
ALIENLIBDIR := @alienlibdir@
diff -ur root-5.34.11.orig/configure root-5.34.11/configure
--- root-5.34.11.orig/configure 2013-10-31 16:46:31.000000000 +0100
+++ root-5.34.11/configure 2013-11-06 09:39:57.651833708 +0100
@@ -1682,8 +1682,6 @@
hdfs-incdir HDFS support, location of hdfs.h
hdfs-libdir HDFS support, location of libhdfs
iosvers iOS SDK version (6.1, 7.0), default will be latest SDK
- jni-incdir HDFS support, location of JNI headers
- jvm-libdir HDFS support, location of JVM library
krb5 Kerberos5 support, location of Kerberos distribution
krb5-incdir Kerberos5 support, location of krb5.h
krb5-libdir Kerberos5 support, location of libkrb5
@@ -2047,8 +2045,6 @@
--with-hdfs-incdir=*) hdfsincdir=$optarg ; enable_hdfs="yes" ;;
--with-hdfs-libdir=*) hdfslibdir=$optarg ; enable_hdfs="yes" ;;
--with-iosvers=*) iosvers=$optarg ;;
- --with-jni-incdir=*) jniincdir=$optarg ;;
- --with-jvm-libdir=*) jvmlibdir=$optarg ;;
--with-krb5=*) krb5dir=$optarg ; enable_krb5="yes" ;;
--with-krb5-incdir=*) krb5incdir=$optarg ; enable_krb5="yes" ;;
--with-krb5-libdir=*) krb5libdir=$optarg ; enable_krb5="yes" ;;
@@ -4082,17 +4078,6 @@
hdfsinc=$found_hdr
hdfsincdir=$found_dir
- if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
- JAVA_HOME=`/usr/libexec/java_home`
- fi
-
- keepincdir=$jniincdir
- check_header "jni.h" "$jniincdir" \
- ${JAVA_HOME:+$JAVA_HOME/include} \
- /usr/java/default/include /usr/include /usr/local/include
- jniinc=$found_hdr
- jniincdir=$found_dir
-
check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
$HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
$HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
@@ -4100,26 +4085,12 @@
hdfslib=$found_lib
hdfslibdir=$found_dir
- check_library "libjvm" "$enable_shared" "$jvmlibdir" \
- ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
- ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
- ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
- /usr/java/default/jre/lib/amd64/server \
- /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
- jvmlib=$found_lib
- jvmlibdir=$found_dir
-
- if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
+ if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
enable_hdfs="no"
else
case $platform in
linux)
- check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
- if test $link_result -eq 0 ; then
- enable_hdfs="no"
- fi
-
- check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
+ check_link "$hdfslib" "$hdfslibdir" hdfsConnect
if test $link_result -eq 0 ; then
enable_hdfs="no"
fi
@@ -6843,9 +6814,6 @@
-e "s|@iosvers@|$iosvers|" \
-e "s|@iconpath@|$iconpath|" \
-e "s|@incdir@|$incdir|" \
- -e "s|@jniincdir@|$jniincdir|g" \
- -e "s|@jvmlibdir@|$jvmlibdir|g" \
- -e "s|@jvmlib@|$jvmlib|g" \
-e "s|@krb5incdir@|$krb5incdir|" \
-e "s|@krb5lib@|$krb5lib|" \
-e "s|@krb5libdir@|$krb5libdir|" \
diff -ur root-5.34.11.orig/io/hdfs/Module.mk root-5.34.11/io/hdfs/Module.mk
--- root-5.34.11.orig/io/hdfs/Module.mk 2013-10-31 16:46:31.000000000 +0100
+++ root-5.34.11/io/hdfs/Module.mk 2013-11-06 09:42:21.320111053 +0100
@@ -44,7 +44,7 @@
$(HDFSLIB): $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
- "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
+ "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
$(HDFSDS): $(HDFSH) $(HDFSL) $(ROOTCINTTMPDEP)
$(MAKEDIR)
@@ -68,4 +68,4 @@
distclean:: distclean-$(MODNAME)
##### extra rules ######
-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)