source: trunk/dports/java/hadoop/files/patch-src-native.diff @ 109655

Last change on this file since 109655 was 109655, checked in by hum@…, 7 years ago

hadoop: update to 1.2.1.

File size: 3.3 KB
  • build.xml

    old new  
    696696          <env key="OS_ARCH" value="${os.arch}"/>
    697697          <env key="JVM_DATA_MODEL" value="${sun.arch.data.model}"/>
    698698          <env key="HADOOP_NATIVE_SRCDIR" value="${native.src.dir}"/>
    699       <arg line="${native.src.dir}/configure"/>
     699          <env key="CC"       value="@cc@"/>
     700          <env key="CFLAGS"   value="@cflags@"/>
     701          <env key="LDFLAGS"  value="@ldflags@"/>
     702          <env key="LIBS"     value="@libs@"/>
     703          <env key="CPPFLAGS" value="@cppflags@"/>
     704      <arg line="${native.src.dir}/configure @args@"/>
    700705    </exec>
    701706
    702707    <exec dir="${build.native}" executable="${make.cmd}" failonerror="true">
  • src/native/Makefile.am

    old new  
    5151                       src/org/apache/hadoop/io/nativeio/errno_enum.c \
    5252                       src/org/apache/hadoop/io/nativeio/NativeIO.c
    5353libhadoop_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
    54 libhadoop_la_LIBADD = -ldl -ljvm
     54libhadoop_la_LIBADD =
    5555
    5656#
    5757#vim: sw=4: ts=4: noet
  • src/native/acinclude.m4

    old new  
    1313      ac_cv_libname_$1="`objdump -p conftest | grep NEEDED | grep $1 | sed 's/\W*NEEDED\W*\(.*\)\W*$/\"\1\"/'`"
    1414    elif test ! -z "`which ldd | grep -v 'no ldd'`"; then
    1515      ac_cv_libname_$1="`ldd conftest | grep $1 | sed 's/^[[[^A-Za-z0-9]]]*\([[[A-Za-z0-9\.]]]*\)[[[^A-Za-z0-9]]]*=>.*$/\"\1\"/'`"
     16    elif test ! -z "`which otool | grep -v 'no otool'`"; then
     17      ac_cv_libname_$1=\"`otool -L conftest | grep $1 | sed -e 's/^[     ]*//' -e 's/ .*//' -e 's/.*\/\(.*\)$/\1/'`\";
    1618    else
    17       AC_MSG_ERROR(Can't find either 'objdump' or 'ldd' to compute the dynamic library for '-l$1')
     19      AC_MSG_ERROR(Can't find either 'objdump' or 'ldd' or 'otool' to compute the dynamic library for '-l$1')
    1820    fi
    1921  else
    2022    ac_cv_libname_$1=libnotfound.so
  • src/native/configure.ac

    old new  
    5555JNI_LDFLAGS=""
    5656if test $JAVA_HOME != ""
    5757then
    58   JNI_LDFLAGS="-L$JAVA_HOME/jre/lib/$OS_ARCH/server"
    59   JVMSOPATH=`find $JAVA_HOME/jre/ -name libjvm.so | head -n 1`
    60   JNI_LDFLAGS="$JNI_LDFLAGS -L`dirname $JVMSOPATH`"
     58  JNI_LDFLAGS=
    6159fi
    6260ldflags_bak=$LDFLAGS
    6361LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
     
    7371AC_CHECK_HEADERS([stdio.h stddef.h], [], AC_MSG_ERROR(Some system headers not found... please ensure their presence on your platform.))
    7472
    7573dnl Check for JNI headers
    76 JNI_CPPFLAGS=""
     74JNI_CPPFLAGS="-I/System/Library/Frameworks/JavaVM.framework/Headers"
    7775if test $JAVA_HOME != ""
    7876then
    7977  for dir in `find $JAVA_HOME/include -follow -type d`
  • src/native/src/org/apache/hadoop/security/JniBasedUnixGroupsNetgroupMapping.c

    old new  
    7373  // was successfull or not (as long as it was called we need to call
    7474  // endnetgrent)
    7575  setnetgrentCalledFlag = 1;
    76   if(setnetgrent(cgroup) == 1) {
     76  setnetgrent(cgroup);
     77  if (true) {
    7778    UserList *current = NULL;
    7879    // three pointers are for host, user, domain, we only care
    7980    // about user now
Note: See TracBrowser for help on using the repository browser.