diff options
Diffstat (limited to 'org.handhelds.familiar/packages/classpath/cp-tools')
| -rw-r--r-- | org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch | 38 | ||||
| -rw-r--r-- | org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch | 15 |
2 files changed, 53 insertions, 0 deletions
diff --git a/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch b/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch new file mode 100644 index 0000000..f1336c2 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools/bytecodejar-workaround.patch @@ -0,0 +1,38 @@ +--- cp-tools.orig/configure.ac 2005-10-01 19:26:32.000000000 +0200 ++++ cp-tools/configure.ac 2005-10-01 19:34:12.000000000 +0200 +@@ -75,8 +75,21 @@ + with_gnubytecode=yes + ] + ) ++AC_ARG_WITH([gnu-bytecode-jar], ++ [AS_HELP_STRING(--with-gnu-bytecode-jar,where to look for the gnu.bytecode.jar [[default=search]])], ++ [ ++ if test "x${withval}" != xno; then ++ with_gnubytecodejar=${withval} ++ else ++ with_gnubytecodejar=no ++ fi ++ ], ++ [ ++ with_gnubytecodejar=no ++ ] ++) + AM_CONDITIONAL(USE_GNUBYTECODE, test "x${with_gnubytecode}" = xyes) +-if test "x${with_gnubytecode}" = xyes ++if test "x${with_gnubytecode}" = xyes -a "x${with_gnubytecodejar}" = xno + then + for path in /usr /usr/local; do + AC_CHECK_FILE([$path/share/java/bytecode.jar], +@@ -88,6 +101,12 @@ + test -d src || mkdir src + test -d src/jars || mkdir src/jars + cp -f ${BYTECODE_JAR} src/jars/ ++else ++ BYTECODE_JAR=$with_gnubytecodejar ++ export BYTECODE_JAR ++ test -d src || mkdir src ++ test -d src/jars || mkdir src/jars ++ cp -f ${BYTECODE_JAR} src/jars/ + fi + + dnl diff --git a/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch b/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch new file mode 100644 index 0000000..d4740e2 --- /dev/null +++ b/org.handhelds.familiar/packages/classpath/cp-tools/destdir.patch @@ -0,0 +1,15 @@ +--- cp-tools/Makefile.am.orig 2005-10-01 20:34:45.000000000 +0200 ++++ cp-tools/Makefile.am 2005-10-01 20:36:28.000000000 +0200 +@@ -187,9 +187,9 @@ + cp $(srcdir)/bin/serialver $(distdir)/bin/ + + install-data-hook: +- $(INSTALL) -d $(datadir)/java +- $(INSTALL) --mode 644 $(data_JARS) $(datadir)/java +- $(LN_S) -f $(datadir)/java/cptools-$(VERSION).jar $(datadir)/java/cptools.jar ++ $(INSTALL) -d $(DESTDIR)$(datadir)/java ++ $(INSTALL) --mode 644 $(data_JARS) $(DESTDIR)$(datadir)/java ++ $(LN_S) -f $(DESTDIR)$(datadir)/java/cptools-$(VERSION).jar $(DESTDIR)$(datadir)/java/cptools.jar + + test: tests/%.class $(srcdir)/src/test/%.java + $(JAVAC) -g -d tests $< |