From fa3b219107c4ef1f841702ddfa35f1b6d2f66e9e Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sat, 24 Oct 2015 17:25:42 +0000 Subject: dev-java/jamvm: Sort out patch naming convention. Fixes bug 563988. Package-Manager: portage-2.2.20.1 Signed-off-by: Patrice Clement --- dev-java/jamvm/files/classes-location.patch | 27 ---------- .../jamvm/files/jamvm-1.5.4-classes-location.patch | 27 ++++++++++ dev-java/jamvm/files/jamvm-1.5.4-env.file | 11 +++++ dev-java/jamvm/files/jamvm-1.5.4-r2.env | 11 ----- .../jamvm/files/jamvm-2.0.0-classes-location.patch | 27 ++++++++++ dev-java/jamvm/files/jamvm-2.0.0-env.file | 16 ++++++ dev-java/jamvm/files/jamvm-2.0.0-javac.in | 57 ++++++++++++++++++++++ dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch | 48 ++++++++++++++++++ dev-java/jamvm/files/jamvm.env | 16 ------ dev-java/jamvm/files/javac.in | 57 ---------------------- dev-java/jamvm/files/noexecstack.patch | 48 ------------------ dev-java/jamvm/jamvm-1.5.4-r2.ebuild | 8 ++- dev-java/jamvm/jamvm-2.0.0-r1.ebuild | 16 +++--- 13 files changed, 202 insertions(+), 167 deletions(-) delete mode 100644 dev-java/jamvm/files/classes-location.patch create mode 100644 dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch create mode 100644 dev-java/jamvm/files/jamvm-1.5.4-env.file delete mode 100644 dev-java/jamvm/files/jamvm-1.5.4-r2.env create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-env.file create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-javac.in create mode 100644 dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch delete mode 100644 dev-java/jamvm/files/jamvm.env delete mode 100644 dev-java/jamvm/files/javac.in delete mode 100644 dev-java/jamvm/files/noexecstack.patch (limited to 'dev-java') diff --git a/dev-java/jamvm/files/classes-location.patch b/dev-java/jamvm/files/classes-location.patch deleted file mode 100644 index 6cf7611f1f35..000000000000 --- a/dev-java/jamvm/files/classes-location.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac ---- jamvm-2.0.0.old/configure.ac 2014-06-10 21:33:37.000000000 +0100 -+++ jamvm-2.0.0/configure.ac 2014-11-28 19:22:12.183091414 +0000 -@@ -236,6 +236,7 @@ - install_dir=$prefix - fi - AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) -+AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) - - AC_ARG_ENABLE(zip, - [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,) -diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c ---- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c 2012-05-17 22:01:47.000000000 +0100 -+++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c 2014-11-28 19:23:27.312108240 +0000 -@@ -110,10 +110,10 @@ - separate class files in a directory structure */ - - #ifdef USE_ZIP --#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" -+#define JAMVM_CLASSES PKGDATADIR"/classes.zip" - #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" - #else --#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" -+#define JAMVM_CLASSES PKGDATADIR"/classes" - #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" - #endif - diff --git a/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch new file mode 100644 index 000000000000..57d046a81882 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-1.5.4-classes-location.patch @@ -0,0 +1,27 @@ +diff -ur jamvm-1.5.0.old/configure.ac jamvm-1.5.0/configure.ac +--- jamvm-1.5.0.old/configure.ac 2008-03-03 17:31:46.000000000 +0200 ++++ jamvm-1.5.0/configure.ac 2008-03-03 17:36:14.000000000 +0200 +@@ -208,6 +208,7 @@ + install_dir=$prefix + fi + AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) ++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) + + AC_ARG_ENABLE(zip, + [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,) +diff -ur jamvm-1.5.0.old/src/class.h jamvm-1.5.0/src/class.h +--- jamvm-1.5.0.old/src/class.h 2008-03-03 17:31:46.000000000 +0200 ++++ jamvm-1.5.0/src/class.h 2008-03-03 17:36:51.000000000 +0200 +@@ -39,10 +39,10 @@ + separate class files in a directory structure */ + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" ++#define JAMVM_CLASSES PKGDATADIR"/classes.zip" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" + #else +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" ++#define JAMVM_CLASSES PKGDATADIR"/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" + #endif + diff --git a/dev-java/jamvm/files/jamvm-1.5.4-env.file b/dev-java/jamvm/files/jamvm-1.5.4-env.file new file mode 100644 index 000000000000..85c551eb63d3 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-1.5.4-env.file @@ -0,0 +1,11 @@ +VERSION="JamVM JRE @PV@" +JAVA_HOME="/usr/@LIBDIR@/@PN@" +BOOTCLASSPATH="${JAVA_HOME}/classes.zip:${JAVA_HOME}/lib/rt.jar" +JAVAC="${JAVA_HOME}/bin/javac" +PATH="${JAVA_HOME}/bin" +ROOTPATH="${JAVA_HOME}/bin" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="1.5" +GENERATION="2" +ENV_VARS="JAVA_HOME JAVAC PATH" +LDPATH="${JAVA_HOME}/lib" diff --git a/dev-java/jamvm/files/jamvm-1.5.4-r2.env b/dev-java/jamvm/files/jamvm-1.5.4-r2.env deleted file mode 100644 index 85c551eb63d3..000000000000 --- a/dev-java/jamvm/files/jamvm-1.5.4-r2.env +++ /dev/null @@ -1,11 +0,0 @@ -VERSION="JamVM JRE @PV@" -JAVA_HOME="/usr/@LIBDIR@/@PN@" -BOOTCLASSPATH="${JAVA_HOME}/classes.zip:${JAVA_HOME}/lib/rt.jar" -JAVAC="${JAVA_HOME}/bin/javac" -PATH="${JAVA_HOME}/bin" -ROOTPATH="${JAVA_HOME}/bin" -PROVIDES_TYPE="JRE" -PROVIDES_VERSION="1.5" -GENERATION="2" -ENV_VARS="JAVA_HOME JAVAC PATH" -LDPATH="${JAVA_HOME}/lib" diff --git a/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch new file mode 100644 index 000000000000..6cf7611f1f35 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-classes-location.patch @@ -0,0 +1,27 @@ +diff -Nru jamvm-2.0.0.old/configure.ac jamvm-2.0.0/configure.ac +--- jamvm-2.0.0.old/configure.ac 2014-06-10 21:33:37.000000000 +0100 ++++ jamvm-2.0.0/configure.ac 2014-11-28 19:22:12.183091414 +0000 +@@ -236,6 +236,7 @@ + install_dir=$prefix + fi + AC_DEFINE_UNQUOTED(INSTALL_DIR, "$install_dir", [Installation directory (prefix)]) ++AC_DEFINE_UNQUOTED(PKGDATADIR, "$datadir/$PACKAGE", [Package data directory (pkgdatadir)]) + + AC_ARG_ENABLE(zip, + [AS_HELP_STRING(--disable-zip,turn-off zip support in the bootstrap loader)],,) +diff -Nru jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c jamvm-2.0.0/src/classlib/gnuclasspath/class.c +--- jamvm-2.0.0.old/src/classlib/gnuclasspath/class.c 2012-05-17 22:01:47.000000000 +0100 ++++ jamvm-2.0.0/src/classlib/gnuclasspath/class.c 2014-11-28 19:23:27.312108240 +0000 +@@ -110,10 +110,10 @@ + separate class files in a directory structure */ + + #ifdef USE_ZIP +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes.zip" ++#define JAMVM_CLASSES PKGDATADIR"/classes.zip" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath/glibj.zip" + #else +-#define JAMVM_CLASSES INSTALL_DIR"/share/jamvm/classes" ++#define JAMVM_CLASSES PKGDATADIR"/classes" + #define CLASSPATH_CLASSES CLASSPATH_INSTALL_DIR"/share/classpath" + #endif + diff --git a/dev-java/jamvm/files/jamvm-2.0.0-env.file b/dev-java/jamvm/files/jamvm-2.0.0-env.file new file mode 100644 index 000000000000..5eee6a9e0f39 --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-env.file @@ -0,0 +1,16 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +VERSION="JamVM JDK @PV@" +JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" +JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" +BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes.zip:${JAVA_HOME}/lib/rt.jar" +JAVAC="${JAVA_HOME}/bin/javac" +PATH="${JAVA_HOME}/bin" +ROOTPATH="${JAVA_HOME}/bin" +PROVIDES_TYPE="JRE" +PROVIDES_VERSION="1.5" +GENERATION="2" +ENV_VARS="JAVA_HOME JAVAC PATH" +LDPATH="${JAVA_HOME}/lib" diff --git a/dev-java/jamvm/files/jamvm-2.0.0-javac.in b/dev-java/jamvm/files/jamvm-2.0.0-javac.in new file mode 100644 index 000000000000..8eeda68c7a5e --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-javac.in @@ -0,0 +1,57 @@ +#!/usr/bin/perl -w +use strict; +use constant NO_DUP_ARGS => qw(-source -target -d -encoding); +use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:); + +my $ECJ_WARNINGS="-nowarn"; + +my ( @bcoption, @source15, @target15, @cp ); +push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@' + unless grep {$_ eq '-bootclasspath'} @ARGV; +push @source15, '-source', '1.5' + unless grep {$_ eq '-source'} @ARGV; +push @target15, '-target', '1.5' + unless grep {$_ eq '-target'} @ARGV; +push @cp, '-cp', '.' + unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH}; +my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp); + +# Work around ecj's inability to handle duplicate command-line +# options and unknown javac options. +sub gen_ecj_opts +{ + my @new_args = @{$_[0]}; + + for my $opt (NO_DUP_ARGS) + { + my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; + if (@indices > 1) { + shift @indices; # keep last instance only + splice @new_args, $_, 2 for @indices; + } + } + + for my $opt (STRIP_ARGS) + { + my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; + splice @new_args, $_, 1 for @indices; + } + + return \@new_args; +} + +sub split_vm_args +{ + my @new_args = @{$_[0]}; + + my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args; + my @javac_args = grep $_ !~ /^-J/, @new_args; + + return (\@vm_args, \@javac_args); +} + +my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV )); +my @CLASSPATH = ('@ECJ_JAR@'); +push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; +$ENV{"CLASSPATH"} = join ':', @CLASSPATH; +exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; diff --git a/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch new file mode 100644 index 000000000000..2a0f14c71a1e --- /dev/null +++ b/dev-java/jamvm/files/jamvm-2.0.0-noexecstack.patch @@ -0,0 +1,48 @@ +diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S +index 245afd1..1583023 100644 +--- a/src/os/linux/arm/callNative.S ++++ b/src/os/linux/arm/callNative.S +@@ -36,3 +36,7 @@ + #include "callNativeOABI.S" + #endif + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S +index cede343..90d9163 100644 +--- a/src/os/linux/mips/callNative.S ++++ b/src/os/linux/mips/callNative.S +@@ -184,3 +184,7 @@ return: + j $31 + .end callJNIMethod + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S +index aa47f6a..763dc0a 100644 +--- a/src/os/linux/powerpc/callNative.S ++++ b/src/os/linux/powerpc/callNative.S +@@ -281,3 +281,7 @@ return: + mr 1,11 + blr + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif +diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S +index 26404e6..9fb5cdf 100644 +--- a/src/os/linux/x86_64/callNative.S ++++ b/src/os/linux/x86_64/callNative.S +@@ -267,3 +267,7 @@ float_ret: + addq $8, %rcx + jmp return + #endif ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/dev-java/jamvm/files/jamvm.env b/dev-java/jamvm/files/jamvm.env deleted file mode 100644 index 5eee6a9e0f39..000000000000 --- a/dev-java/jamvm/files/jamvm.env +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="JamVM JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@-jdk" -BOOTCLASSPATH="@GENTOO_PORTAGE_EPREFIX@/usr/@LIBDIR@/@PN@/classes.zip:${JAVA_HOME}/lib/rt.jar" -JAVAC="${JAVA_HOME}/bin/javac" -PATH="${JAVA_HOME}/bin" -ROOTPATH="${JAVA_HOME}/bin" -PROVIDES_TYPE="JRE" -PROVIDES_VERSION="1.5" -GENERATION="2" -ENV_VARS="JAVA_HOME JAVAC PATH" -LDPATH="${JAVA_HOME}/lib" diff --git a/dev-java/jamvm/files/javac.in b/dev-java/jamvm/files/javac.in deleted file mode 100644 index 8eeda68c7a5e..000000000000 --- a/dev-java/jamvm/files/javac.in +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/perl -w -use strict; -use constant NO_DUP_ARGS => qw(-source -target -d -encoding); -use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:); - -my $ECJ_WARNINGS="-nowarn"; - -my ( @bcoption, @source15, @target15, @cp ); -push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@' - unless grep {$_ eq '-bootclasspath'} @ARGV; -push @source15, '-source', '1.5' - unless grep {$_ eq '-source'} @ARGV; -push @target15, '-target', '1.5' - unless grep {$_ eq '-target'} @ARGV; -push @cp, '-cp', '.' - unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH}; -my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp); - -# Work around ecj's inability to handle duplicate command-line -# options and unknown javac options. -sub gen_ecj_opts -{ - my @new_args = @{$_[0]}; - - for my $opt (NO_DUP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - if (@indices > 1) { - shift @indices; # keep last instance only - splice @new_args, $_, 2 for @indices; - } - } - - for my $opt (STRIP_ARGS) - { - my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args; - splice @new_args, $_, 1 for @indices; - } - - return \@new_args; -} - -sub split_vm_args -{ - my @new_args = @{$_[0]}; - - my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args; - my @javac_args = grep $_ !~ /^-J/, @new_args; - - return (\@vm_args, \@javac_args); -} - -my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV )); -my @CLASSPATH = ('@ECJ_JAR@'); -push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"}; -$ENV{"CLASSPATH"} = join ':', @CLASSPATH; -exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args; diff --git a/dev-java/jamvm/files/noexecstack.patch b/dev-java/jamvm/files/noexecstack.patch deleted file mode 100644 index 2a0f14c71a1e..000000000000 --- a/dev-java/jamvm/files/noexecstack.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/os/linux/arm/callNative.S b/src/os/linux/arm/callNative.S -index 245afd1..1583023 100644 ---- a/src/os/linux/arm/callNative.S -+++ b/src/os/linux/arm/callNative.S -@@ -36,3 +36,7 @@ - #include "callNativeOABI.S" - #endif - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/mips/callNative.S b/src/os/linux/mips/callNative.S -index cede343..90d9163 100644 ---- a/src/os/linux/mips/callNative.S -+++ b/src/os/linux/mips/callNative.S -@@ -184,3 +184,7 @@ return: - j $31 - .end callJNIMethod - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/powerpc/callNative.S b/src/os/linux/powerpc/callNative.S -index aa47f6a..763dc0a 100644 ---- a/src/os/linux/powerpc/callNative.S -+++ b/src/os/linux/powerpc/callNative.S -@@ -281,3 +281,7 @@ return: - mr 1,11 - blr - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -diff --git a/src/os/linux/x86_64/callNative.S b/src/os/linux/x86_64/callNative.S -index 26404e6..9fb5cdf 100644 ---- a/src/os/linux/x86_64/callNative.S -+++ b/src/os/linux/x86_64/callNative.S -@@ -267,3 +267,7 @@ float_ret: - addq $8, %rcx - jmp return - #endif -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild index 163773a18ea9..03dccea6ed94 100644 --- a/dev-java/jamvm/jamvm-1.5.4-r2.ebuild +++ b/dev-java/jamvm/jamvm-1.5.4-r2.ebuild @@ -21,9 +21,13 @@ DEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT} amd64? ( virtual/libffi )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/"${P}-classes-location.patch" +) + src_prepare() { # without this patch, classes.zip is not found at runtime - epatch "${FILESDIR}/classes-location.patch" + epatch "${PATCHES[@]}" eautoreconf # These come precompiled. @@ -76,7 +80,7 @@ src_install() { dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README - set_java_env "${FILESDIR}/${PN}-1.5.4-r2.env" + set_java_env "${FILESDIR}/${P}-env.file" dosym /usr/bin/jamvm ${INSTALL_DIR}/bin/java dosym ${CLASSPATH_DIR}/share/classpath/glibj.zip ${INSTALL_DIR}/jre/lib/rt.jar diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild index 65eeb618fa67..878fd1b711ee 100644 --- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild +++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild @@ -22,10 +22,14 @@ DEPEND="dev-java/gnu-classpath:0.98 sparc? ( virtual/libffi )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/"${P}-classes-location.patch" + "${FILESDIR}"/"${P}-noexecstack.patch" +) + src_prepare() { # without this patch, classes.zip is not found at runtime - epatch "${FILESDIR}/classes-location.patch" - epatch "${FILESDIR}/noexecstack.patch" + epatch "${PATCHES[@]}" eautoreconf # These come precompiled. @@ -65,7 +69,7 @@ create_launcher() { -Xbootclasspath/p:/usr/share/classpath/tools.zip" \ gnu.classpath.tools.${1}.Main "\$@" EOF - chmod +x "${script}" + chmod +x "${script}" || die } src_install() { @@ -77,7 +81,7 @@ src_install() { dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS README - set_java_env "${FILESDIR}/${PN}.env" + set_java_env "${FILESDIR}/${P}-env.file" dodir ${JDK_DIR}/bin dosym /usr/bin/jamvm ${JDK_DIR}/bin/java @@ -97,11 +101,11 @@ src_install() { local ecj_jar="$(readlink "${EPREFIX}"/usr/share/eclipse-ecj/ecj.jar)" exeinto ${JDK_DIR}/bin - cat "${FILESDIR}"/javac.in | sed -e "s#@JAVA@#/usr/bin/jamvm#" \ + sed -e "s#@JAVA@#/usr/bin/jamvm#" \ -e "s#@ECJ_JAR@#${ecj_jar}#" \ -e "s#@RT_JAR@#/usr/share/classpath/glibj.zip#" \ -e "s#@TOOLS_JAR@#/usr/share/classpath/tools.zip#" \ - | newexe - javac + "${FILESDIR}"/"${P}-javac.in" | newexe - javac local libarch="${ARCH}" [ ${ARCH} == x86 ] && libarch="i386" -- cgit v1.2.3-65-gdbad