lkml.org 
[lkml]   [2019]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 073/114] perf build: Add detection of java-11-openjdk-devel package
    Date
    From: Thomas Richter <tmricht@linux.ibm.com>

    [ Upstream commit 815c1560bf8fd522b8d93a1d727868b910c1cc24 ]

    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: Sasha Levin <sashal@kernel.org>
    ---
    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 849b3be15bd89..510caedd73194 100644
    --- a/tools/perf/Makefile.config
    +++ b/tools/perf/Makefile.config
    @@ -837,7 +837,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.20.1


    \
     
     \ /
      Last update: 2019-10-10 10:57    [W:2.501 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site