[packages/rpm-pld-macros] add %java_env and append it to %set_build_flags; 2.061

[atler]

commit f4906782cff175ff716e768584787a79ed41f246
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Apr 23 19:13:26 2026 +0200

    add %java_env and append it to %set_build_flags; 2.061

 macros.java         | 10 ++++++++++
 macros.pld          |  3 ++-
 rpm-pld-macros.spec |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index e6658e5..7201585 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	2.060
+%define		rpm_macros_rev	2.061
 %define		find_lang_rev	1.42
 # split into individual X_prov_ver if there is a reason to desync
 %define		prov_ver	4.15
diff --git a/macros.java b/macros.java
index 09b8529..445dcf5 100644
--- a/macros.java
+++ b/macros.java
@@ -82,6 +82,16 @@
 %javac		%{java_home}/bin/javac
 %javadoc	%{java_home}/bin/javadoc
 
+%java_env \
+ if [ -n "%{java_home}" ] && [ "%{java_home}" != "ERROR" ]; then \
+ JAVA_HOME="${JAVA_HOME:-%{java_home}}"; export JAVA_HOME; \
+ JAVA="${JAVA:-%{java}}"; export JAVA; \
+ JAVAC="${JAVAC:-%{javac}}"; export JAVAC; \
+ JAVADOC="${JAVADOC:-%{javadoc}}"; export JAVADOC; \
+ JAR="${JAR:-%{jar}}"; export JAR; \
+ PATH="$PATH:%{java_home}/bin"; export PATH; \
+ fi
+
 %add_jvm_extension	JAVA_LIBDIR=%{buildroot}/%{_javadir}	%{_bindir}/jvmjar -l
 
 %jpackage_script() \
diff --git a/macros.pld b/macros.pld
index 56b49f2..065e03f 100644
--- a/macros.pld
+++ b/macros.pld
@@ -409,7 +409,8 @@ print(tmpdir)
  CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" ; export CPPFLAGS ; \
  LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
  RUSTC="${RUSTC:-%__rustc}" ; export RUSTC ; \
- RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" ; export RUSTFLAGS
+ RUSTFLAGS="${RUSTFLAGS:-%rpmrustflags}" ; export RUSTFLAGS; \
+ %{java_env}
 
 #-----------------------------------------------------------------
 #
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/f4906782cff175ff716e768584787a79ed41f246