|
 |
b1435a8 |
diff -ur root-5.34.24.orig/cmake/modules/RootConfiguration.cmake root-5.34.24/cmake/modules/RootConfiguration.cmake
|
|
|
b1435a8 |
--- root-5.34.24.orig/cmake/modules/RootConfiguration.cmake 2014-12-02 18:12:03.000000000 +0100
|
|
|
b1435a8 |
+++ root-5.34.24/cmake/modules/RootConfiguration.cmake 2014-12-19 11:41:09.559330313 +0100
|
|
|
b1435a8 |
@@ -257,10 +257,6 @@
|
|
|
b1435a8 |
string(REPLACE ";" " " hdfslib "${HDFS_LIBRARY}")
|
|
|
1c00eef |
set(hdfsincdir ${HDFS_INCLUDE_DIR})
|
|
|
1c00eef |
|
|
|
1c00eef |
-set(jniincdir ${Java_INCLUDE_DIRS})
|
|
|
b1435a8 |
-string(REPLACE ";" " " jvmlib "${Java_LIBRARIES}")
|
|
|
1c00eef |
-set(jvmlibdir ${Java_LIBRARY_DIR})
|
|
|
1c00eef |
-
|
|
|
1c00eef |
set(buildalien ${value${alien}})
|
|
|
1c00eef |
set(alienlibdir ${ALIEN_LIBRARY_DIR})
|
|
|
b1435a8 |
string(REPLACE ";" " " alienlib "${ALIEN_LIBRARY}")
|
|
|
b1435a8 |
diff -ur root-5.34.24.orig/config/Makefile.in root-5.34.24/config/Makefile.in
|
|
|
b1435a8 |
--- root-5.34.24.orig/config/Makefile.in 2014-12-02 18:12:03.000000000 +0100
|
|
|
b1435a8 |
+++ root-5.34.24/config/Makefile.in 2014-12-19 11:39:26.580520172 +0100
|
|
|
b1435a8 |
@@ -207,9 +207,6 @@
|
|
|
1c00eef |
HDFSLIBDIR := @hdfslibdir@
|
|
|
1c00eef |
HDFSCLILIB := @hdfslib@
|
|
|
1c00eef |
HDFSINCDIR := $(filter-out /usr/include, @hdfsincdir@)
|
|
|
1c00eef |
-JNIINCDIR := $(filter-out /usr/include, @jniincdir@) $(filter-out /usr/include, @jniincdir@/linux)
|
|
|
1c00eef |
-JVMCLILIB := @jvmlib@
|
|
|
1c00eef |
-JVMLIBDIR := @jvmlibdir@
|
|
|
1c00eef |
|
|
|
1c00eef |
BUILDALIEN := @buildalien@
|
|
|
1c00eef |
ALIENLIBDIR := @alienlibdir@
|
|
|
b1435a8 |
diff -ur root-5.34.24.orig/configure root-5.34.24/configure
|
|
|
b1435a8 |
--- root-5.34.24.orig/configure 2014-12-02 18:12:03.000000000 +0100
|
|
|
b1435a8 |
+++ root-5.34.24/configure 2014-12-19 11:39:26.607519860 +0100
|
|
|
b1435a8 |
@@ -1753,8 +1753,6 @@
|
|
|
1c00eef |
hdfs-incdir HDFS support, location of hdfs.h
|
|
|
1c00eef |
hdfs-libdir HDFS support, location of libhdfs
|
|
|
1c00eef |
iosvers iOS SDK version (6.1, 7.0), default will be latest SDK
|
|
|
1c00eef |
- jni-incdir HDFS support, location of JNI headers
|
|
|
1c00eef |
- jvm-libdir HDFS support, location of JVM library
|
|
|
1c00eef |
krb5 Kerberos5 support, location of Kerberos distribution
|
|
|
1c00eef |
krb5-incdir Kerberos5 support, location of krb5.h
|
|
|
1c00eef |
krb5-libdir Kerberos5 support, location of libkrb5
|
|
|
b1435a8 |
@@ -2141,8 +2139,6 @@
|
|
|
1c00eef |
--with-hdfs-incdir=*) hdfsincdir=$optarg ; enable_hdfs="yes" ;;
|
|
|
1c00eef |
--with-hdfs-libdir=*) hdfslibdir=$optarg ; enable_hdfs="yes" ;;
|
|
|
1c00eef |
--with-iosvers=*) iosvers=$optarg ;;
|
|
|
1c00eef |
- --with-jni-incdir=*) jniincdir=$optarg ;;
|
|
|
1c00eef |
- --with-jvm-libdir=*) jvmlibdir=$optarg ;;
|
|
|
1c00eef |
--with-krb5=*) krb5dir=$optarg ; enable_krb5="yes" ;;
|
|
|
1c00eef |
--with-krb5-incdir=*) krb5incdir=$optarg ; enable_krb5="yes" ;;
|
|
|
1c00eef |
--with-krb5-libdir=*) krb5libdir=$optarg ; enable_krb5="yes" ;;
|
|
|
b1435a8 |
@@ -4285,17 +4281,6 @@
|
|
|
1c00eef |
hdfsinc=$found_hdr
|
|
|
1c00eef |
hdfsincdir=$found_dir
|
|
|
1c00eef |
|
|
|
1c00eef |
- if test "x$platform" = "xmacosx" && test -z $JAVA_HOME; then
|
|
|
1c00eef |
- JAVA_HOME=`/usr/libexec/java_home`
|
|
|
1c00eef |
- fi
|
|
|
1c00eef |
-
|
|
|
1c00eef |
- keepincdir=$jniincdir
|
|
|
1c00eef |
- check_header "jni.h" "$jniincdir" \
|
|
|
1c00eef |
- ${JAVA_HOME:+$JAVA_HOME/include} \
|
|
|
1c00eef |
- /usr/java/default/include /usr/include /usr/local/include
|
|
|
1c00eef |
- jniinc=$found_hdr
|
|
|
1c00eef |
- jniincdir=$found_dir
|
|
|
1c00eef |
-
|
|
|
1c00eef |
check_library "libhdfs" "$enable_shared" "$hdfslibdir" \
|
|
|
1c00eef |
$HDFS ${HDFS:+$HDFS/lib} ${HDFS:+$HDFS/build/libhdfs} \
|
|
|
1c00eef |
$HADOOP_HOME ${HADOOP_HOME:+$HADOOP_HOME/build/libhdfs} \
|
|
|
b1435a8 |
@@ -4303,26 +4288,12 @@
|
|
|
1c00eef |
hdfslib=$found_lib
|
|
|
1c00eef |
hdfslibdir=$found_dir
|
|
|
1c00eef |
|
|
|
1c00eef |
- check_library "libjvm" "$enable_shared" "$jvmlibdir" \
|
|
|
1c00eef |
- ${JAVA_HOME:+$JAVA_HOME/jre/lib/amd64/server} \
|
|
|
1c00eef |
- ${JAVA_HOME:+$JAVA_HOME/jre/lib/i386/server} \
|
|
|
1c00eef |
- ${JAVA_HOME:+$JAVA_HOME/../Libraries} \
|
|
|
1c00eef |
- /usr/java/default/jre/lib/amd64/server \
|
|
|
1c00eef |
- /usr/java/default/jre/lib/i386/server /usr/lib /usr/local/lib
|
|
|
1c00eef |
- jvmlib=$found_lib
|
|
|
1c00eef |
- jvmlibdir=$found_dir
|
|
|
1c00eef |
-
|
|
|
1c00eef |
- if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x" || test "x$jniincdir" = "x" || test "x$jvmlib" = "x"; then
|
|
|
1c00eef |
+ if test "x$hdfsincdir" = "x" || test "x$hdfslib" = "x"; then
|
|
|
1c00eef |
enable_hdfs="no"
|
|
|
1c00eef |
else
|
|
|
1c00eef |
case $platform in
|
|
|
1c00eef |
linux)
|
|
|
1c00eef |
- check_link "$hdfslib $jvmlib" "$hdfslibdir $jvmlibdir" hdfsConnect
|
|
|
1c00eef |
- if test $link_result -eq 0 ; then
|
|
|
1c00eef |
- enable_hdfs="no"
|
|
|
1c00eef |
- fi
|
|
|
1c00eef |
-
|
|
|
1c00eef |
- check_link $jvmlib "$jvmlibdir" JNI_CreateJavaVM
|
|
|
1c00eef |
+ check_link "$hdfslib" "$hdfslibdir" hdfsConnect
|
|
|
1c00eef |
if test $link_result -eq 0 ; then
|
|
|
1c00eef |
enable_hdfs="no"
|
|
|
1c00eef |
fi
|
|
|
b1435a8 |
@@ -7324,9 +7295,6 @@
|
|
|
1c00eef |
-e "s|@iosvers@|$iosvers|" \
|
|
|
1c00eef |
-e "s|@iconpath@|$iconpath|" \
|
|
|
1c00eef |
-e "s|@incdir@|$incdir|" \
|
|
|
1c00eef |
- -e "s|@jniincdir@|$jniincdir|g" \
|
|
|
1c00eef |
- -e "s|@jvmlibdir@|$jvmlibdir|g" \
|
|
|
1c00eef |
- -e "s|@jvmlib@|$jvmlib|g" \
|
|
|
1c00eef |
-e "s|@krb5incdir@|$krb5incdir|" \
|
|
|
1c00eef |
-e "s|@krb5lib@|$krb5lib|" \
|
|
|
1c00eef |
-e "s|@krb5libdir@|$krb5libdir|" \
|
|
|
b1435a8 |
diff -ur root-5.34.24.orig/io/hdfs/Module.mk root-5.34.24/io/hdfs/Module.mk
|
|
|
b1435a8 |
--- root-5.34.24.orig/io/hdfs/Module.mk 2014-12-02 18:12:03.000000000 +0100
|
|
|
b1435a8 |
+++ root-5.34.24/io/hdfs/Module.mk 2014-12-19 11:39:26.608519849 +0100
|
|
|
1c00eef |
@@ -44,7 +44,7 @@
|
|
|
1c00eef |
$(HDFSLIB): $(HDFSO) $(HDFSDO) $(ORDER_) $(MAINLIBS) $(HDFSLIBDEP)
|
|
|
1c00eef |
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
|
|
|
1c00eef |
"$(SOFLAGS)" libHDFS.$(SOEXT) $@ "$(HDFSO) $(HDFSDO)" \
|
|
|
1c00eef |
- "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB) $(JVMLIBDIR) $(JVMCLILIB)"
|
|
|
1c00eef |
+ "$(HDFSLIBEXTRA) $(HDFSLIBDIR) $(HDFSCLILIB)"
|
|
|
1c00eef |
|
|
|
1c00eef |
$(HDFSDS): $(HDFSH) $(HDFSL) $(ROOTCINTTMPDEP)
|
|
|
1c00eef |
$(MAKEDIR)
|
|
|
1c00eef |
@@ -68,4 +68,4 @@
|
|
|
1c00eef |
distclean:: distclean-$(MODNAME)
|
|
|
1c00eef |
|
|
|
1c00eef |
##### extra rules ######
|
|
|
1c00eef |
-$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%) $(JNIINCDIR:%=-I%)
|
|
|
1c00eef |
+$(HDFSO) $(HDFSDO): CXXFLAGS += $(HDFSCFLAGS) $(HDFSINCDIR:%=-I%)
|