mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
OpenJDK17: try to build with gcc
This commit is contained in:
@@ -10,7 +10,7 @@ license. OpenJDK is the official Java SE 8 reference implementation."
|
||||
HOMEPAGE="https://openjdk.java.net/"
|
||||
COPYRIGHT="2007-2022 Oracle and/or its affiliates."
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
REVISION="2"
|
||||
jdkBuild="jdk-${portVersion%.*}+${portVersion##*.}"
|
||||
srcGitRev="7d96ea2c4f4b1cb9a256731f2332eb4f1e8d1c41"
|
||||
SOURCE_URI="https://github.com/zelenoviy/jdk17u/archive/$srcGitRev.tar.gz"
|
||||
@@ -100,21 +100,16 @@ REQUIRES_sources="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
gcc${secondaryArchSuffix}_syslibs
|
||||
gcc${secondaryArchSuffix}_syslibs_devel
|
||||
java:environment == 16
|
||||
ca_root_certificates
|
||||
devel:libfontconfig$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libiconv$secondaryArchSuffix
|
||||
devel:libjpeg$secondaryArchSuffix
|
||||
devel:libLLVM_12$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cpio
|
||||
cmd:clang >= 12
|
||||
cmd:clang++ >= 12
|
||||
cmd:make
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
@@ -156,9 +151,6 @@ BUILD()
|
||||
|
||||
freeTypeHeaders=$(finddir B_SYSTEM_HEADERS_DIRECTORY)$secondaryArchSubDir/freetype2
|
||||
freeTypeLib=$(finddir B_SYSTEM_DEVELOP_DIRECTORY)/lib$secondaryArchSubDir
|
||||
|
||||
export CC="/bin/clang"
|
||||
export CXX="/bin/clang++"
|
||||
|
||||
bash ./configure \
|
||||
--with-freetype-include="${freeTypeHeaders}" \
|
||||
@@ -169,7 +161,6 @@ BUILD()
|
||||
--with-version-opt="" \
|
||||
--with-num-cores=1 \
|
||||
--with-memory-size=3072 \
|
||||
--with-toolchain-type=clang \
|
||||
--enable-javac-server \
|
||||
--disable-warnings-as-errors \
|
||||
--with-extra-cflags="-w" \
|
||||
|
||||
Reference in New Issue
Block a user