You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by as...@apache.org on 2020/06/30 19:56:28 UTC
[mesos] branch 1.10.x updated: Fixed build broken by a comment in
the patch that fixes `javah` race.
This is an automated email from the ASF dual-hosted git repository.
asekretenko pushed a commit to branch 1.10.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/1.10.x by this push:
new 8683463 Fixed build broken by a comment in the patch that fixes `javah` race.
8683463 is described below
commit 8683463a9fade9d86d77c0cea8336089fa2c10ca
Author: Andrei Sekretenko <as...@apache.org>
AuthorDate: Tue Jun 30 21:27:55 2020 +0200
Fixed build broken by a comment in the patch that fixes `javah` race.
This fixes build broken by 00f78dfeb3f23897aa0e68c9a124712ed1c0b65e.
---
src/Makefile.am | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 08735fd..a89919d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2166,14 +2166,15 @@ BUILT_SOURCES += $(nodist_libjava_la_SOURCES)
# * For 'javac -h' recipe, we substitute '_' with '/' to compute the source path
# of the java file. Unlike 'javah', 'javac -h' requires java sources to
# generate headers.
+#
+# NOTE: javah has a race between concurrent runs trying to create
+# the same output directory:
+# http://hg.openjdk.java.net/jdk8/jdk8/langtools/file/1ff9d5118aae/src/share/classes/com/sun/tools/javah/JavahTask.java#l475
+# Thus, we have to create the output directory here.
+#
+# TODO(asekretenko): Replace `javah` (deprecated as of JDK 9+)
+# with `javac` when switching to a newer JDK.
java/jni/%.h: $(MESOS_JAR)
- # NOTE: javah has a race between concurrent runs trying to create
- # the same output directory:
- # http://hg.openjdk.java.net/jdk8/jdk8/langtools/file/1ff9d5118aae/src/share/classes/com/sun/tools/javah/JavahTask.java#l475
- # Thus, we have to create the output directory here.
- #
- # TODO(asekretenko): Replace `javah` (deprecated as of JDK 9+)
- # with `javac` when switching to a newer JDK.
mkdir -p java/jni
if HAS_JAVAH
$(JAVA_HOME)/bin/javah -d java/jni \