| From 258b8ae82b8812743fef0ca168c89a00a5f5f2bd Mon Sep 17 00:00:00 2001 |
| From: Thomas Richter <tmricht@linux.ibm.com> |
| Date: Mon, 9 Sep 2019 13:41:16 +0200 |
| Subject: [PATCH] perf build: Add detection of java-11-openjdk-devel package |
| |
| commit 815c1560bf8fd522b8d93a1d727868b910c1cc24 upstream. |
| |
| 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 |
| $ |
| |
| Suggested-by: Andreas Krebbel <krebbel@linux.ibm.com> |
| Signed-off-by: Thomas Richter <tmricht@linux.ibm.com> |
| Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: Heiko Carstens <heiko.carstens@de.ibm.com> |
| Cc: Hendrik Brueckner <brueckner@linux.ibm.com> |
| Cc: Vasily Gorbik <gor@linux.ibm.com> |
| Link: http://lore.kernel.org/lkml/20190909114116.50469-4-tmricht@linux.ibm.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config |
| index 17b81bc403e4..f7115501435f 100644 |
| --- a/tools/perf/Makefile.config |
| +++ b/tools/perf/Makefile.config |
| @@ -902,7 +902,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.7.4 |
| |
