| 1 |
betelgeuse 08/03/03 17:27:54 |
| 2 |
|
| 3 |
Added: jamvm-1.5.0.env classes-location.patch |
| 4 |
Log: |
| 5 |
Version bump. Fixes bug #181896 and part of fixing bug #163724. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-java/jamvm/files/jamvm-1.5.0.env |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/jamvm-1.5.0.env?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/jamvm-1.5.0.env?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: jamvm-1.5.0.env |
| 15 |
=================================================================== |
| 16 |
VERSION="JamVM @PV@" |
| 17 |
JAVA_HOME=/opt/@PN@ |
| 18 |
BOOTCLASSPATH="/opt/jamvm/classes.zip:/opt/gnu-classpath-0.97/share/classpath/glibj.zip" |
| 19 |
JDK_HOME=/opt/@PN@ |
| 20 |
JAVAC=${JAVA_HOME}/bin/javac |
| 21 |
PATH="${JAVA_HOME}/bin" |
| 22 |
ROOTPATH="${JAVA_HOME}/bin" |
| 23 |
PROVIDES_TYPE="JDK JRE" |
| 24 |
PROVIDES_VERSION="1.5" |
| 25 |
GENERATION="2" |
| 26 |
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH" |
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
1.1 dev-java/jamvm/files/classes-location.patch |
| 31 |
|
| 32 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/classes-location.patch?rev=1.1&view=markup |
| 33 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/files/classes-location.patch?rev=1.1&content-type=text/plain |
| 34 |
|
| 35 |
Index: classes-location.patch |
| 36 |
=================================================================== |
| 37 |
diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac |
| 38 |
--- jamvm-1.5.0.old/configure.ac 2008-03-03 17:31:46.000000000 +0200 |
| 39 |
+++ jamvm-1.5.0/configure.ac 2008-03-03 17:36:14.000000000 +0200 |
| 40 |
@@ -208,6 +208,7 @@ |
| 41 |
install_dir=$prefix |
| 42 |
fi |
| 43 |
AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) |
| 44 |
+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) |
| 45 |
|
| 46 |
AC_ARG_ENABLE(zip, |
| 47 |
[AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,) |
| 48 |
diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h |
| 49 |
--- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200 |
| 50 |
+++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200 |
| 51 |
@@ -39,10 +39,10 @@ |
| 52 |
separate class files in a directory structure */ |
| 53 |
|
| 54 |
#ifdef USE_ZIP |
| 55 |
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" |
| 56 |
+#define JAMVM_CLASSES PKGDATADIR"/classes.zip" |
| 57 |
#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" |
| 58 |
#else |
| 59 |
-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" |
| 60 |
+#define JAMVM_CLASSES PKGDATADIR"/classes" |
| 61 |
#define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" |
| 62 |
#endif |
| 63 |
|
| 64 |
|
| 65 |
|
| 66 |
|
| 67 |
-- |
| 68 |
gentoo-commits@l.g.o mailing list |
Archives