Markus Koschany pushed to branch master at Debian Java Maintainers / openjfx
Commits: ab72e697 by Markus Koschany at 2018-10-07T10:47:11Z Install the correct javafx.web jar. - - - - - 0d9b275b by Markus Koschany at 2018-10-07T12:44:54Z Add build-on-non-JIT-architectures.patch. - - - - - 01ceddd7 by Markus Koschany at 2018-10-07T12:45:31Z Start new changelog entry - - - - - 78066b24 by Markus Koschany at 2018-10-07T13:52:51Z Update changelog - - - - - 4 changed files: - debian/changelog - debian/libopenjfx-java.poms - + debian/patches/build-on-non-JIT-architectures.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +openjfx (11+26-3) unstable; urgency=medium + + * Team upload. + * Install the correct javafx.web jar. (Closes: #910501) + * Add build-on-non-JIT-architectures.patch and try to fix the + build failure on !x86 architectures. + + -- Markus Koschany <[email protected]> Sun, 07 Oct 2018 15:51:48 +0200 + openjfx (11+26-2) unstable; urgency=medium * Keep the profiles of the parent pom ===================================== debian/libopenjfx-java.poms ===================================== @@ -5,4 +5,4 @@ debian/poms/javafx-fxml.pom --java-lib --classifier=linux --artifact=build/ debian/poms/javafx-graphics.pom --java-lib --classifier=linux --artifact=build/sdk/lib/javafx.graphics.jar debian/poms/javafx-media.pom --java-lib --classifier=linux --artifact=build/sdk/lib/javafx.media.jar debian/poms/javafx-swing.pom --java-lib --classifier=linux --artifact=build/sdk/lib/javafx.swing.jar -debian/poms/javafx-web.pom --java-lib --classifier=linux --artifact=build/sdk/lib/javafx.controls.jar +debian/poms/javafx-web.pom --java-lib --classifier=linux --artifact=build/sdk/lib/javafx.web.jar ===================================== debian/patches/build-on-non-JIT-architectures.patch ===================================== @@ -0,0 +1,30 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 7 Oct 2018 14:43:53 +0200 +Subject: build on non-JIT architectures + +--- + .../main/native/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp +index c4a1f2c..d3d974a 100644 +--- a/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp ++++ b/modules/javafx.web/src/main/native/Source/JavaScriptCore/llint/LLIntOffsetsExtractor.cpp +@@ -73,6 +73,7 @@ public: + + const int64_t* LLIntOffsetsExtractor::dummy() + { ++#if ENABLE(JIT) + // This is a file generated by offlineasm/generate_offsets_extractor.rb, and contains code + // to create a table of offsets, sizes, and a header identifying what combination of + // Platform.h macros we have set. We include it inside of a method on LLIntOffsetsExtractor +@@ -82,6 +83,9 @@ const int64_t* LLIntOffsetsExtractor::dummy() + #include "LLIntDesiredOffsets.h" + return extractorTable; + } ++#else ++ return 0; ++#endif + + } // namespace JSC + ===================================== debian/patches/series ===================================== @@ -14,3 +14,4 @@ fix-arm32-build.patch 25-webkit-debug-level.patch 26-disable-webkit-jit-for-armv4.patch 29-glibc-compatibility.patch +build-on-non-JIT-architectures.patch View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/2ede5996cb825f1b247bb372e0a3c5c63801e3a8...78066b24768d2305d9f405c740c8c77ccff21ab2 -- View it on GitLab: https://salsa.debian.org/java-team/openjfx/compare/2ede5996cb825f1b247bb372e0a3c5c63801e3a8...78066b24768d2305d9f405c740c8c77ccff21ab2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
