Switch openjdk:9 sources to github and fix timebomb issue.
This commit is contained in:
parent
88ab252f30
commit
59173233da
|
|
@ -70,6 +70,7 @@ AUX patches/8/openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace
|
|||
AUX patches/8/openjdk-8-jdk-revert-improve-stub-classes.patch 1416 BLAKE2B 12bfe1946fc2487abacfa71fd1a8bb35ef0ca607241c84162043269fe057f49745961fc4482bed4ae81a09c3f2c96465e8abc23f61e0a4e573f2792a2a7edc7d SHA512 c5374dc8754a6dd983f4c5dca046464941675332dae9525715c27e73300045fc731935660560eba9db527aea42aad5d40b6467f4b4d0f4c3bfc94c68501d1854
|
||||
AUX patches/9/aarch64_gcc_fix.patch 377 BLAKE2B b94336be65f16831c63cb3288d71b48c9c0c12e91a3612501895b924791d41c94eae1cae35e64ff03f7ba873463d78fff09652c4fe2f0bc749697d82f9ea4e8b SHA512 d4666e419559b10d4d2c0b3ec7b10ce6607e8480ffac6a8685263e0997d8bd43b059244f1beb452759a8a2e86a867d03e5e44793b62b2fe0a4a3dc00a5dd6ad9
|
||||
AUX patches/9/fix-no-such-field-ipv6-error.patch 309 BLAKE2B aa76a8cf41bc902dd9175e9ae03b12343290fb021f6fde6dcd3bf07557ca78297a4b36d3383aafb2b49b5116975249f79445b4a7f94e5d28cbe266abed31794c SHA512 40fbf7ab0efb280e3d59c73efa9f2eeb75223b68457774def4620e217e275e5f993ec503e8ff449513b90d5e70109b655074fd6075430be08e35499951febd48
|
||||
AUX patches/9/jdk-currency-timebomb.patch 467 BLAKE2B e543e95b184504e54c99eedde0e84e565968b416b810d748f72777cf69b0943e0c2eb96badd89bd4b3ac49b8ddfe5b6e4dc92f3927f5aba138e910b8f1312460 SHA512 b6aff66b2486b94f64607fac86bd33cb85add9b047afeee49a8641e39e6c21f4d28fd5cf6dba33f9db2e41a5cd2c59b4ca4d3ab119d216f655431644d2c3f6ac
|
||||
AUX patches/9/make-4.3.patch 740 BLAKE2B c155e808f69221c6720841c6ce9bb2fb58b413ad2864fd5b5b3e661e57796d75ac5740d2873d9222174045015c8ad96e6b3b966b3361a3a7cd164ad0968552e0 SHA512 8460dde4d40d57254f14e995090bc4255ee7662d18c19f127d56a1d12d53ec56731574a784ed5d68e89aef1133da760f30ae0982389cf1512ccab1d5f62c4b75
|
||||
AUX patches/9/pointer-comparison.patch 1162 BLAKE2B 048b67bfe50d658bb0e4756b66a307fb680d0e1c6f18458eff3a666334f5d94425138ba343907247b284402f47d78a6fc85df5aa6381ad78b3d7a7e116d822c7 SHA512 8d92d8be4a3a0227d602b99e581f05a16f54ad633111abf3355bd933db344c726e22e285b33f936d6e70c7da9087bc113477aba78554f37b273a70e784aaca5a
|
||||
DIST jdk-10.0.2+13.tar.bz2 88365048 BLAKE2B f898a0976cff12cca439ccdba2bf7eff7fcbc5f00709fa41302fd781819a44165fa864d5e551023c507ad18dc957abd24b15744fc6dc5304ee1a26bd4cb8cb86 SHA512 7491da11d5e0013db75d33e09be7a91ac0dbcde6282541a39fe471fd5368d49b15403bc7508b330ca60210b3ca02730743ba280657283a231853f6882a3ca74d
|
||||
|
|
@ -85,14 +86,7 @@ DIST openjdk-19.0.2_p07.tar.gz 108190694 BLAKE2B e45ab5339240ae965f780b931895473
|
|||
DIST openjdk-20.0.2_p09.tar.gz 109625812 BLAKE2B ea3e9e306c2a5e1593977095db7c775d2925b5daa088e940cb2cdfb6c386878f0004cb7c2cd63ee0097286c19abbf3041ff8e70af526f9389217379aa397509a SHA512 77b46f43318288c7923cc63522410872df5b191af1ecd65d9fe0cb587be18bfdb370c7859476356f2e4ed5ed6d9c099542d7dca3fb948bed3a9674f95ba63237
|
||||
DIST openjdk-21.0.0_p35.tar.gz 112178860 BLAKE2B 03a81df4c2e16194c66299109e70a61093eec6885b615d8a1a4bff34139474876a290889b46f51065f473a5b0ab37aff1c1cf166d067f0dca16096fe67d06aae SHA512 97800cf55dc03fb1baa8da65ed5d991033c0023d4e9ada65ea79ebc2b2cb691add8e093b18efea238a95dab47daff21fcf29cca993fa7d11516ece72478383c8
|
||||
DIST openjdk-8.272_p10.tar.gz 87119338 BLAKE2B 71ba8cc5c76d71047a555357e51789defaab7a316185aadb05a4666e64dc780cfe193aa754176891ce63c05fd64885d654c8328389822b5e7de82027b0b9a88e SHA512 e0d16cde4668dc006aaf9bdc6e7dfdc1685e3c4d6e0b8e07dc01300dd953251b84e8cc4fe96116ea26f2acae0166c65bf9944c689a34f4c268e7e15836023755
|
||||
DIST openjdk-9.0.4_p12.tar.bz2 823756 BLAKE2B f1b457655520b983597b15254323abdb0c39feaff78ce36d88ef556a086d9f9333ceddec63d945ca28bb06f4a06c2bc1344051ac2c1df55a01728016ff7255c1 SHA512 cef3655ae7db657e6c81aa86587e451e58896bb6ee786495f6d757096334435b6a4de26ec3ec927da2487e135f09ce26414f8d6b9b9c508a28d3087be286b1ec
|
||||
DIST openjdk-corba-9.0.4_p12.tar.bz2 1002503 BLAKE2B 789664686432cee36e7e165aa4ac6e9a2ed1a1a85a961cd362d9bbdf59d7c7077b71bd2fc59e03f3e3a8cdbc4443a7e359fbfbbbaebfe29bbd220e3cafc3a298 SHA512 455998437a9e3ff538b921025d57e19e6fb5148b3f124c9c427c3604689884d81b3ce5c9dbd93d88de26bf1b43ce76d75f75afd95e473a94973a668575e41748
|
||||
DIST openjdk-hotspot-9.0.4_p12.tar.bz2 11411231 BLAKE2B a21a5003266f6d8f60adaf78b109d496e46058841d0ab2c8f17256a503124b36e18908240f04fdbb16c056a1f68608f891fed1dbb9c9a0b2bb2326a303a32a4f SHA512 49d93764b13085a5626bec1c3d4e790f8748c24577a4e990e76bd1006721a5b8b9a256c40bf6419df4dda6f6390e457485f90c1b1101c010476a04d9056e9f16
|
||||
DIST openjdk-jaxp-9.0.4_p12.tar.bz2 3215994 BLAKE2B 57061280601277706ef263e19a8a8ff7eadeaa8d60edc9fe195d15669b554684f5b4132d4899d9031888f3140a6acbab8b0d7ba950d304d7e83b1e3f74253259 SHA512 82f28586fd576cc01062e2ff37a917987775838910e4a5ecdfd096abec1c8d23028b77bfc87a38ada53bc30d71d89bde7408c1ae572a43c87a71ced64fd08d3a
|
||||
DIST openjdk-jaxws-9.0.4_p12.tar.bz2 2517916 BLAKE2B 650fbaf93349ce12ba7426e626a6c6e3468183a44f65abb16c139a4b09a2a0d91aed0f9fdfbb7fe779a335a66a003da001229e5504a60396023504ad6c1e3b90 SHA512 459978a5e3ca21910781daed848229e043eea5bd82dcd20e9249934ec97a2a982126c6e37aac1a36719e3b73a5e6c8a92a50b63033149913614d8f3edfc0846e
|
||||
DIST openjdk-jdk-9.0.4_p12.tar.bz2 55469786 BLAKE2B 92f6b30c4c23d99492ff85f61099dcbb4dd1adfc4f4a297801d26e5b0c44be76fb40d482ad0752ac3abdf1d9db0e940a2dd5ba2c5f37d658689147c8eacca26d SHA512 259228d3f439dde239e38cdebb8c3bbb83804ab141d87a9c236310707de9c58cd78cd80ceb4c17755cc1048071f24462839988112c2698f7ec1453a8810610f2
|
||||
DIST openjdk-langtools-9.0.4_p12.tar.bz2 4497608 BLAKE2B 382bfa6119345f1983cf5a168fa0d2e523a6dad5ad35f446cd11d6f6f24bb5850e65d1d0aab7fe8298ba7a2d7fe3ebb8a472c567a46577dff17ab80ea32abae9 SHA512 ef3c70be906a4b0dd9c9195c88da045909ee3ef144941fb7b4495ed66b4162f481095cad87626d2bd38e5a62134b440223cd008dd6123b6b43c00e338610a692
|
||||
DIST openjdk-nashorn-9.0.4_p12.tar.bz2 8961760 BLAKE2B 2ff03adf87a0e0561d52529cf95b8fb827e75773462be7ecddd60dc966e1a229b897eb65a0301a531dfcaff884122e612f1a24b5d5fbc8f0352a8d84218423d7 SHA512 848c6ece418e250561572ad704baeb565580098cfc5f849d4e1a3b41b916aae3487eb4d8d0b319f3a503d122ec064ed4de0678d06821c9a2bdb09c990e589c97
|
||||
DIST openjdk-9.0.4_p12.tar.gz 110286927 BLAKE2B 50bfd023b11d2af6b3a0282e861c55d6b355134e3091e3f019beeff0b943f8894b8f0a173ea6c17a54b38efe409c786371c17d1073576d3e04d3919ccd2f6987 SHA512 999e7b726941db7ecbefb9d1d7b113fe39bd3b62e71b4250031bb24c056bc8cdb39ab30e930c8d8977c871ec1faaf6e489d61ceecf44ecc1245040f663400b22
|
||||
EBUILD openjdk-10.0.2_p13.ebuild 8328 BLAKE2B c738c7bfa47070edc8e3aa20d238cdd251ded7e44d0fe1e138154424f56141d42e91f7e4c5c619b40cea7696b96f277b1af579a67a59a4fdb70e0474dc758a51 SHA512 3a5efdf6148c2c92068f09dd5219b90cb3bf27dedd17f653fef658dc7b47c96605b1a80fa85bf5ac1c25b69312bf56268f318a2e2c9867ae4ccb7f535757d753
|
||||
EBUILD openjdk-11.0.9_p11.ebuild 8321 BLAKE2B 68259ff36688d96c9f48989ea9f015e41d47562307b65d0191e997779c92342d1e8be40a0210df69bacec5fcf9ee9d3c5a4a6c60234c9c7c14f6d3eff88e017c SHA512 404d35e206d34eb6aa67450a65ef9d694a7c9cf73521e7d7c390f2107fbdea5f6f65e21cb24225df357258fcecbd5a4e5f37034b8a8a61ee98a92b42faf321ab
|
||||
EBUILD openjdk-12.0.2_p01.ebuild 8827 BLAKE2B 108c522f5b57698485914945e6b4e17e689cb6944441d0e54aef5abfaef897f9b36338cd4af026d6f31b2316bcdc0cc8e70c48ee0e49d86ee779cfdbdfb5615f SHA512 56cec08b9625453c4a7e7c34203a35aa09efe9c146c9dda16fe0f8b02a8133b2b47eeb71dc1a30666b67181982719d69cee99780d201c65bea6770bb0db964a0
|
||||
|
|
@ -106,5 +100,5 @@ EBUILD openjdk-19.0.2_p07.ebuild 8349 BLAKE2B 40c766352be5104b3448a5ea506b9f236c
|
|||
EBUILD openjdk-20.0.2_p09.ebuild 8349 BLAKE2B 40c766352be5104b3448a5ea506b9f236cf36dbbdf825bc93578c7830c3d340f83eb5dade233d4a0c3892a83d3d1ce0ec925c73e82241d5006544f51597f5624 SHA512 1c9641916ce24dfa6ece0908e971504f53e2f9eb6147bc6279b4e03c19857036063e2b9c61550c6cf010bf447ed2b4819cde170f9abb1ed38c691d625f285a2d
|
||||
EBUILD openjdk-21.0.0_p35.ebuild 8098 BLAKE2B 85faf3eb26662a2c5a0a8aedd420b8e8ccac23ddcea35ccdc09a33460e27f2eb7deaa866fcd39aeefcd8c2c120e21807ba66e3cf8d39e366720d8668e4795d62 SHA512 eb55b35b5b71f1623cc888610171c478b462277072840ba88d14b278bb1c0daa419065c5e81526e330cd4cf82069ef5aaded59ce47f3c8e74f4158863686d340
|
||||
EBUILD openjdk-8.272_p10.ebuild 7680 BLAKE2B cf4097a2ef96f200e83dbd93a7b06c0dcb19044dd45f7eabdae2d8803b085756f60da6affb911c085ec33fb92978c76633dfb54e1a3f951488e3b42c47f90be2 SHA512 bbf736a86130ff2023d00885c4f68e7088a05aeb4b826f9b20121206a786395fdcb753a18f49139497f709d270dc8e7c3d9858689ba23448991004adbfef28e8
|
||||
EBUILD openjdk-9.0.4_p12.ebuild 8296 BLAKE2B 79b6a13687e067d1a00066857cd88ee167deec0a37c6772f799e04aea46a95558617472916bcc4f3662d45a45607a39ad15a895f31637c384868ceacc21bdb5c SHA512 d80d10008de8e24c12dc05419c8ce9c549ee15ce53cf25370e1922969cdf89905af89507105c4f9ab9cd3b2077ac4624322f4bfa3d0609182bf628b4e842b1d7
|
||||
EBUILD openjdk-9.0.4_p12.ebuild 8430 BLAKE2B aa12345820b54330a0b482b3e197866744fc2ddd4066f2283520550473429b8832befdc48d7de8415e9125b265a460ba7de5ee58c847595a18a8e5f96bc9a8db SHA512 962febb3e6f5090de0d14f5cd894502e5fdd12c49f2cbfb9f3a0a724252a9b523ec8c2b8de1393307f4463a959a7913e3e78cd40b90ad775233d54b8e2afb437
|
||||
MISC metadata.xml 1432 BLAKE2B 36a11642c99127a5f97fc0b095a142705c6b4e077ed24604f1886e4d1beaa47b4fa30359600797d5e6a085befd11a2851196fe97a75a0f0907461679946b4cbf SHA512 ecc66015da3a0fc616b91dd5aaffb5b050c9f66e936cad02ec12fb56dd7c6b3b3c331d8856402c0deee16c415ea083e088cce7414703f9d659f551883b055ff0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
--- openjdk/jdk/make/data/currency/CurrencyData.properties 2024-02-18 13:38:19.525666416 +0000
|
||||
+++ openjdk/jdk/make/data/currency/CurrencyData.properties 2024-02-18 13:38:40.436243388 +0000
|
||||
@@ -324,7 +324,7 @@
|
||||
# LAO PEOPLE'S DEMOCRATIC REPUBLIC
|
||||
LA=LAK
|
||||
# LATVIA
|
||||
-LV=LVL;2013-12-31-22-00-00;EUR
|
||||
+LV=LVL
|
||||
# LEBANON
|
||||
LB=LBP
|
||||
# LESOTHO
|
||||
@@ -336,7 +336,7 @@
|
||||
# LIECHTENSTEIN
|
||||
LI=CHF
|
||||
# LITHUANIA
|
||||
-LT=LTL;2014-12-31-22-00-00;EUR
|
||||
+LT=LTL
|
||||
# LUXEMBOURG
|
||||
LU=EUR
|
||||
# MACAU
|
||||
|
|
@ -1,31 +1,29 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
inherit check-reqs eapi7-ver flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils toolchain-funcs
|
||||
inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs
|
||||
|
||||
MY_PV=${PV/_p/+}
|
||||
SLOT=${MY_PV%%[.+]*}
|
||||
|
||||
BASE_URI="https://hg.${PN}.java.net/jdk-updates/jdk9u"
|
||||
# don't change versioning scheme
|
||||
# to find correct _p number, look at
|
||||
# https://github.com/openjdk/jdk${SLOT}u/tags
|
||||
# you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
|
||||
# to exact same commit sha. we should always use the full version.
|
||||
# -ga tag is just for humans to easily identify General Availability release tag.
|
||||
# we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to
|
||||
# set build version properly
|
||||
MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)"
|
||||
FULL_VERSION="${PV/_p/+}"
|
||||
SLOT="${PV%%[.+]*}"
|
||||
|
||||
DESCRIPTION="Open source implementation of the Java programming language"
|
||||
HOMEPAGE="https://openjdk.java.net"
|
||||
SRC_URI="
|
||||
${BASE_URI}/archive/jdk-${MY_PV}.tar.bz2 -> ${P}.tar.bz2
|
||||
${BASE_URI}/corba/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-corba-${PV}.tar.bz2
|
||||
${BASE_URI}/hotspot/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-hotspot-${PV}.tar.bz2
|
||||
${BASE_URI}/jaxp/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-jaxp-${PV}.tar.bz2
|
||||
${BASE_URI}/jaxws/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-jaxws-${PV}.tar.bz2
|
||||
${BASE_URI}/jdk/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-jdk-${PV}.tar.bz2
|
||||
${BASE_URI}/langtools/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-langtools-${PV}.tar.bz2
|
||||
${BASE_URI}/nashorn/archive/jdk-${MY_PV}.tar.bz2 -> ${PN}-nashorn-${PV}.tar.bz2
|
||||
"
|
||||
SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk-${FULL_VERSION}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
LICENSE="GPL-2-with-classpath-exception"
|
||||
KEYWORDS="amd64 arm64"
|
||||
IUSE="alsa debug cups doc examples gentoo-vm headless-awt pch selinux source"
|
||||
IUSE="alsa debug cups doc examples +gentoo-vm headless-awt pch selinux source"
|
||||
|
||||
COMMON_DEPEND="
|
||||
media-libs/freetype:2=
|
||||
|
|
@ -128,12 +126,7 @@ pkg_setup() {
|
|||
|
||||
src_unpack() {
|
||||
default
|
||||
mv -v "jdk${SLOT}u"* "${P}" || die
|
||||
|
||||
local repo
|
||||
for repo in corba hotspot jdk jaxp jaxws langtools nashorn; do
|
||||
mv -v "${repo}-"* "${P}/${repo}" || die
|
||||
done
|
||||
mv -v "jdk${SLOT}"* "${P}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
|
|
@ -169,6 +162,7 @@ src_prepare() {
|
|||
eapply "${FILESDIR}/patches/${SLOT}/pointer-comparison.patch"
|
||||
eapply "${FILESDIR}/patches/${SLOT}/aarch64_gcc_fix.patch"
|
||||
eapply "${FILESDIR}/patches/${SLOT}/fix-no-such-field-ipv6-error.patch"
|
||||
eapply "${FILESDIR}/patches/${SLOT}/jdk-currency-timebomb.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
|
@ -187,16 +181,18 @@ src_configure() {
|
|||
use x86 && append-flags -mincoming-stack-boundary=2
|
||||
|
||||
local myconf=(
|
||||
--disable-ccache
|
||||
--disable-warnings-as-errors
|
||||
--disable-ccache
|
||||
--disable-freetype-bundling
|
||||
--disable-precompiled-headers
|
||||
--enable-unlimited-crypto
|
||||
--with-boot-jdk="${JDK_HOME}"
|
||||
--with-extra-cflags="${CFLAGS}"
|
||||
--with-extra-cxxflags="${CXXFLAGS}"
|
||||
--with-extra-ldflags="${LDFLAGS}"
|
||||
--with-freetype-lib="$( $(tc-getPKG_CONFIG) --variable=libdir freetype2 )"
|
||||
--with-freetype-include="$( $(tc-getPKG_CONFIG) --variable=includedir freetype2)/freetype2"
|
||||
--with-giflib=system
|
||||
--disable-hotspot-gtest
|
||||
--disable-freetype-bundling
|
||||
--with-jtreg=no
|
||||
--with-jobs=1
|
||||
--with-num-cores=1
|
||||
|
|
@ -206,6 +202,7 @@ src_configure() {
|
|||
--with-zlib=system
|
||||
--with-native-debug-symbols=$(usex debug internal none)
|
||||
$(usex headless-awt --disable-headful '')
|
||||
$(tc-is-clang && echo "--with-toolchain-type=clang")
|
||||
)
|
||||
|
||||
# PaX breaks pch, bug #601016
|
||||
|
|
|
|||
Loading…
Reference in New Issue