RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 15-Aug-2014 20:56:54
Branch: rpm-5_4 Handle: 2014081518565400
Modified files: (Branch: rpm-5_4)
rpm devtool.conf
Log:
- java: detect lbjvm.so with scriptie.
Summary:
Revision Changes Path
2.365.2.94 +8 -3 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.93 -r2.365.2.94 devtool.conf
--- rpm/devtool.conf 15 Aug 2014 18:14:32 -0000 2.365.2.93
+++ rpm/devtool.conf 15 Aug 2014 18:56:54 -0000 2.365.2.94
@@ -132,7 +132,9 @@
export JAVA_HOME
JRE_HOME="$JAVA_HOME/jre"
export JRE_HOME
- JVM_LDPATH="$JRE_HOME/lib/amd64/server"
+ LIBJVM_SO="`find $JRE_HOME -name libjvm.so`"
+ export LIBJVM_SO
+ JVM_LDPATH="`dirname $LIBJVM_SO`"
export JVM_LDPATH
PATH="$JAVA_HOME/bin:$PATH"
export PATH
@@ -192,6 +194,7 @@
--without-perlembed \
--without-ruby \
--with-mruby \
+ --with-jvm=$JAVA_HOME/include:$JVM_LDPATH \
--without-selinux \
--without-sepol \
--without-semanage \
@@ -732,7 +735,9 @@
export JAVA_HOME
JRE_HOME="$JAVA_HOME/jre"
export JRE_HOME
- JVM_LDPATH="$JRE_HOME/lib/amd64/server"
+ LIBJVM_SO="`find $JRE_HOME -name libjvm.so`"
+ export LIBJVM_SO
+ JVM_LDPATH="`dirname $LIBJVM_SO`"
export JVM_LDPATH
PATH="$JAVA_HOME/bin:$PATH"
export PATH
@@ -795,7 +800,7 @@
--with-perlembed=/usr/lib64/perl5/CORE/:/usr/lib64/perl5/CORE \
--with-ruby=/usr/lib64:/usr/lib64/ruby/1.8 \
--with-mruby \
- --with-jvm=$JAVA_HOME/include:$JAVA_HOME/jre/lib/amd64/server/ \
+ --with-jvm=$JAVA_HOME/include:$JVM_LDPATH \
--with-selinux \
--with-sepol \
--with-semanage \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
