RFA, RFT: install JNI libraries in correct location
Thomas Fitzsimmons
fitzsim@redhat.com
Thu Jul 6 17:27:00 GMT 2006
Bryce McKinlay wrote:
> Thomas Fitzsimmons wrote:
>> We weren't installing the peer libraries in the right location on
>> lib64 architectures. This patch passes the correct
>> --with-native-libdir value to GNU Classpath's configure so that the
>> JNI libraries are installed in $(libdir)/gcj-$(gcc_version). OK to
>> commit?
>>
>> I'm testing this on i686-pc-linux-gnu, x86_64-unknown-linux-gnu and
>> powerpc-apple-darwin7.9.0. Can others test on the less-common platforms?
>>
>> Tom
>> ------------------------------------------------------------------------
>>
>> Index: configure.ac
>> ===================================================================
>> --- configure.ac (revision 115187)
>> +++ configure.ac (working copy)
>> @@ -1250,11 +1250,18 @@
>> AC_SUBST(toolexecmainlibdir)
>> AC_SUBST(toolexeclibdir)
>>
>> -# Determine where the standard .db file is found.
>> +# Determine where the standard .db file and GNU Classpath JNI
>> +# libraries are found.
>> multi_os_directory=`$CC -print-multi-os-directory`
>> case $multi_os_directory in
>> - .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /.
>> - *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;;
>> + .)
>> + dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
>> + ac_configure_args="$ac_configure_args
>> --with-native-libdir=\$\(libdir\)/gcj-`cat $srcdir/../gcc/BASE-VER`"
>> + ;;
>> + *)
>> + dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
>> + ac_configure_args="$ac_configure_args
>> --with-native-libdir=\$\(libdir\)/$multi_os_directory/gcj-`cat
>> $srcdir/../gcc/BASE-VER`"
>> + ;;
>> esac
>> AC_SUBST(dbexecdir)
>>
>
> Why cat BASE-VER here? Is there some reason why $(gcc_version) doesn't
> work?
Yes, it was simpler to cat BASE-VER from gcc/libjava. Otherwise I'd have to
introduce a gcc_version variable to all the Makefiles under gcc/libjava/classpath.
Tom
More information about the Java-patches
mailing list