Messages in this thread Patch in this message | | | From | Arnaldo Carvalho de Melo <> | Date | Tue, 24 Sep 2019 16:48:31 -0300 | Subject | Re: [PATCH 3/3] perf/java: Add detection of java-11-openjdk-devel package |
| |
Em Mon, Sep 09, 2019 at 01:41:16PM +0200, Thomas Richter escreveu: > With Java 11 there is no seperate JRE anymore. > Details: https://coderanch.com/t/701603/java/JRE-JDK > Therefore the detection of the JRE needs to be adapted. > > This change works for s390 and x86. > I have not tested other platforms.
Committer testing:
Continues to work with the OpenJDK 8:
$ rm -f ~acme/lib64/libperf-jvmti.so $ rpm -qa | grep jdk-devel java-1.8.0-openjdk-devel-1.8.0.222.b10-0.fc30.x86_64 $ git log --oneline -1 a51937170f33 (HEAD -> perf/core) perf build: Add detection of java-11-openjdk-devel package $ rm -rf /tmp/build/perf ; mkdir -p /tmp/build/perf ; make -C tools/perf O=/tmp/build/perf install > /dev/null 2>1 $ ls -la ~acme/lib64/libperf-jvmti.so -rwxr-xr-x. 1 acme acme 230744 Sep 24 16:46 /home/acme/lib64/libperf-jvmti.so $
Thanks, applied.
- Arnaldo > Suggested-by: Andreas Krebbel <krebbel@linux.ibm.com> > Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> > --- > tools/perf/Makefile.config | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config > index 89ac5a1f1550..3da374911852 100644 > --- a/tools/perf/Makefile.config > +++ b/tools/perf/Makefile.config > @@ -908,7 +908,7 @@ ifndef NO_JVMTI > JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') > else > ifneq (,$(wildcard /usr/sbin/alternatives)) > - JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g') > + JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed -e 's%/jre/bin/java.%%g' -e 's%/bin/java.%%g') > endif > endif > ifndef JDIR > -- > 2.21.0
--
- Arnaldo
| |