openjdk15: fix build for x86 arch

This commit is contained in:
Gerasim Troeglazov
2023-03-25 19:42:02 +10:00
parent f5fe31f4aa
commit 8228cf9d94
2 changed files with 26 additions and 2 deletions

View File

@@ -10,7 +10,7 @@ license. OpenJDK is the official Java SE 8 reference implementation."
HOMEPAGE="https://openjdk.java.net/"
COPYRIGHT="2007-2020 Oracle and/or its affiliates."
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
jdkBuild="jdk-${portVersion%.*}+${portVersion##*.}"
srcGitRev="9b6b887b9bf09053013a44ae2bfa89ef2d63b944"
SOURCE_URI="https://github.com/zelenoviy/haiku-jdk15u/archive/$srcGitRev.tar.gz"
@@ -20,6 +20,7 @@ SOURCE_FILENAME="jdk15u-$jdkBuild-$srcGitRev.tar.gz"
SOURCE_URI_2="https://ftp.osuosl.org/pub/blfs/conglomeration/openjdk/jtreg-4.2-b13-433.tar.gz"
CHECKSUM_SHA256_2="ddf76660d4f519302b9c6310febcde3ff45313c435fff4e157854d1ff50785b1"
SOURCE_DIR_2="jtreg"
PATCHES="openjdk15-$portVersion.patchset"
ADDITIONAL_FILES="
elf.h
"
@@ -151,7 +152,7 @@ BUILD()
freeTypeHeaders=$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/freetype2
freeTypeLib=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib$secondaryArchSubDir
extraFlags="-Wno-maybe-uninitialized -Wno-misleading-indentation -Wno-array-bounds -Wno-stringop-truncation"
extraFlags="-Wno-maybe-uninitialized -Wno-misleading-indentation -Wno-array-bounds -Wno-stringop-truncation -Wno-format"
bash ./configure \
--with-freetype-include="${freeTypeHeaders}" \
@@ -161,6 +162,7 @@ BUILD()
--with-version-pre="" \
--with-version-opt="" \
--with-num-cores=1 \
--with-memory-size=3072 \
--enable-javac-server \
--disable-warnings-as-errors \
--with-extra-cflags="$extraFlags" \

View File

@@ -0,0 +1,22 @@
From 5e06966b735232074b23cef41e4b7fc2263a7ef9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 25 Mar 2023 12:48:37 +1000
Subject: Enable PollingWatchService for Haiku
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 861c9b9..53447d5 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -53,7 +53,7 @@ java.base_EXCLUDES += java/lang/doc-files
# data files and shouldn't go in the product
java.base_EXCLUDE_FILES += sun/text/resources/BreakIteratorRules.java
-ifeq ($(call isTargetOs, macosx aix), false)
+ifeq ($(call isTargetOs, macosx aix haiku), false)
java.base_EXCLUDE_FILES += sun/nio/fs/PollingWatchService.java
endif
--
2.37.3