[packages/systemtap] java dir not used to find binaries, pass them explicitly

atler atler at pld-linux.org
Mon Jul 3 13:44:51 CEST 2023


commit 24046c3337c4804945136e9af8987989a9504a64
Author: Jan Palus <atler at pld-linux.org>
Date:   Mon Jul 3 12:14:01 2023 +0200

    java dir not used to find binaries, pass them explicitly
    
    Makefile.am has just fixed values, with only comment suggesting they
    should be configured:
    
    # XXX: perhaps autoconfigure the following?
    JAVAC = javac
    JAR = jar

 systemtap.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/systemtap.spec b/systemtap.spec
index d82cf66..218e242 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -317,6 +317,8 @@ find testsuite/systemtap.examples/ -name '*.stp' -print0 | xargs -0 \
 %{__autoheader}
 %{__automake}
 %configure \
+	%{?with_java:have_javac="%{java_home}/bin/javac"} \
+	%{?with_java:have_jar="%{java_home}/bin/jar"} \
 	--disable-silent-rules \
 	%{?with_crash:--enable-crash} \
 	--enable-docs%{!?with_doc:=no} \
@@ -325,7 +327,9 @@ find testsuite/systemtap.examples/ -name '*.stp' -print0 | xargs -0 \
 	--enable-sqlite \
 	--with-dyninst%{!?with_dyninst:=no} \
 	--with-java=%{?with_java:%{java_home}}%{!?with_java:no}
-%{__make}
+%{__make} \
+	%{?with_java:JAVAC="%{java_home}/bin/javac"} \
+	%{?with_java:JAR="%{java_home}/bin/jar"}
 
 %install
 rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemtap.git/commitdiff/d621331a0280c2e57000c20efdc1ebdf2ef5b11c



More information about the pld-cvs-commit mailing list