diff options
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/Manifest.gz | bin | 55999 -> 56007 bytes | |||
| -rw-r--r-- | dev-java/openjdk/Manifest | 7 | ||||
| -rw-r--r-- | dev-java/openjdk/metadata.xml | 6 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.5_p5.ebuild | 313 | ||||
| -rw-r--r-- | dev-java/openjdk/openjdk-17.0.5_p8.ebuild | 7 |
5 files changed, 13 insertions, 320 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz Binary files differindex eff72aff53be..4b7aa28fc071 100644 --- a/dev-java/Manifest.gz +++ b/dev-java/Manifest.gz diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index b57b0adbf15a..667e294b1bc8 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -2,6 +2,7 @@ AUX openjdk-17.0.3-fix-nullptr-cast.patch 5052 BLAKE2B d4a75732ba3f6c10279f8d33f AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de AUX openjdk-8.env.sh 687 BLAKE2B 4bb851545955fafa6a4b08f2589fa9a5441ef37484eb21ac5db06cde111d325903e70b5b7473659973a0bab972386c8f33ded1da57858fdca325cfa29b1122f5 SHA512 a43fc0fcf57108350235d47d6da65a12fb9f77f12f6163c649ceceacb3317c6a25516efa060efe129b74138a529945163343e5a7d1de2b7af36f6580054ed5e5 AUX openjdk.env.sh 432 BLAKE2B 8779a373af2f9e52473cb5e3bc2bbcb7fa83c6d09382d498466888dd322299adc1b736c6e3723fa68e92a80067599228b3511cc2826e1ebc3c5845a7a2f62fa3 SHA512 e6604a88fb857945a618e4b7735d49dbc23bdd4c6fb70fc5753470e9c1047825208a40fe25107bcde95f290656b44f92e1667ebc414454cbae2e71f16fec5fbd +DIST java17-riscv64.patch 2253475 BLAKE2B a10a257f0b8bf590cdc011cf0c5af4854d49d6bbdf68dd74b2f996b70e0ecdd2b87bc4a02394f67ded5e664efb41f8dd03bb312fbfcffd84c289afdcbf7868de SHA512 06230b121e1f28189877025a4eab99e6d8cba176a17c88f073498fec6c73ab26130ce1500ea4f83235cc6abbc1742e47b227d60b5ff77465740048abdc52d165 DIST openjdk-11.0.14-riscv.patch.xz 279088 BLAKE2B f67cf5707246b22285de8217b68fb806e3c18b7289cb81428c0fe83c5a4dcd60233be10aaca0853ffb00ac24fa60cae1b1d60ed300ad6bff8b07e881bddf8650 SHA512 32bac5f0c0f5df883de344718586bf798db6c8a5738058ea5d4902f5a0a3fc841c1893dec3379a74b9468c1c37af5c31a3e296476549972d3f1305401354060d DIST openjdk-11.0.15_p10.tar.gz 122902351 BLAKE2B a2dabad415a92765d548b19261e22e2cd483a17b478c8ef98342b44e88b39b23d89d31aecc80f93b27fce8df50ba41f4e6e5f10b66035bbfc1e0c03fc4707a40 SHA512 9d9e631046769d3ad95229172f392649ef4162161eb2d6fa7371665619600a04db440e1b3d30c580e283ad2b6bd7580d1199fc854fad3cb962d79f18b2347c67 DIST openjdk-11.0.16.1_p1.tar.gz 123134756 BLAKE2B 727294bb9d07193bb74b01a3e3e35f491b54be4cf3b6230e59df56ea7a9166b0b138f82b3d3c302c32b21efa8e9ac71437ca430a68a9ad8b69a7755d289bde17 SHA512 c694a8e6b0ff664b2c6a43ef3445d98e3b4ddf59c7fe94a21390b2d7756870ea7c7e34cb99d40bd66708ecaee93ffeb4dfc9ab7e2162bd6fc19479f23963560d @@ -9,7 +10,6 @@ DIST openjdk-11.0.17_p8.tar.gz 123284789 BLAKE2B 413f88b1b0e3c26c87d8e9e69468c14 DIST openjdk-17.0.3-riscv.patch.xz 296268 BLAKE2B 9b2036493a485a1e245230488a5985af4f5d5c6a85912d73d8a712742fdfc26d5eb08ca8e69dac04f0d516fb361e6ed057c95a3839b04639d129581cf00f0620 SHA512 692b5e39e5c6eb1222f25c3012e9a73366d9c98f5c29c2f2d35f41991cdcb026a644398b6f3fdd8c9d8368b4b1f5dc4d89b3dbd594a2e7751de96a140551d445 DIST openjdk-17.0.3_p7.tar.gz 104797560 BLAKE2B 025ff6be360c74288990622bce31769e5780f3f326b0eed2b78a776cc4df8bdf8cb99dfb0d7dd3f03f8558ca9a66acc5c5bd04b227ba4dffe18f8586a287b74b SHA512 3bebaaf0469cd6558a3f033b768005e880ec95d5bb2a24b8929d2f6a05f18ca9977b291ad49b220a904f661cf6b47780a1cfd776109ed11d4e34d5345be8f66c DIST openjdk-17.0.4.1_p1.tar.gz 104892822 BLAKE2B e5c4ae7e59b7f078c3927ca74cdff4fe1f378da874eca45a7655fa7419c9abac6b9f81632c104614b7f1d6c20fbc5ee7f4b0a8e2aaef39a66f31377543e926de SHA512 33396f9d8101db605aac0b064d518a800194421b211f0d903d681968beab58540367e53293fa26d4751e4bd1f459a0d07bb08b2010ac64ea5438717ea1517f76 -DIST openjdk-17.0.5_p5.tar.gz 105040319 BLAKE2B 658df2630e1938d7787031e498474c347a10770a133d4d8234cb7450777264c07441ca56a1b09f368b837a182627d3a104848aa5e521d95b1b58e1f21f4645b1 SHA512 19b2466339db697a8564e44423878b5c5ed310478bf56aa7ace90d34458912c5f544fcea2c31eaba559c2fff33f818745e8160376eae8f6c3c694090aed7de09 DIST openjdk-17.0.5_p8.tar.gz 105048497 BLAKE2B c707633a247e5ff4f5083623e874200d694c3fa37519dad65db5271e8c218632846efc01520ddfa3f9ffdecf7c1209f85ee3320a92660af8fa1b1fbc9184f468 SHA512 8446b6ed93b286a39476fdb215be0da8ba679fb475f117a6a92f72a833759ac821c4ed87d033be56992d147c1b6d3ac1348ad2a6ad8a3e057c7b85b589266ff9 DIST openjdk-8.332_p09.tar.gz 88130953 BLAKE2B 9c7419851588dfbca92610f8fbb8b74fa7516282f82e8c7c37af88c776ba0c83a22fb3d4a1c2c2b98d44e394025217d095cff9c79fba53f9c5a32a43eb91ad70 SHA512 f6a717f77cc0e85bc2eb3c3c599d09e06a4004e4987a2caf0773b1197336722469e2abcca9d39c1f4c534d15cd77408d6405c9ee6edb3815bccd8e4872571aaa DIST openjdk-8.345_p01.tar.gz 88173976 BLAKE2B f0eca11f4fcb532a8fd156a74ff6629ea2d948c5d29d9b9638b526c57598618f5c3782ace26654be61f8d9ab229f44aa46112234c2d2e8a9bdc367c1071b6e53 SHA512 bb01156f751a0ba25290d1337356f9dd78121373220e2e2df07a4536e2ab31390865ab63d628901de7983d1679dd6dfd4bc3c6304911e6c76fe4c616bdf07eab @@ -26,9 +26,8 @@ EBUILD openjdk-11.0.16.1_p1.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e462 EBUILD openjdk-11.0.17_p8.ebuild 8429 BLAKE2B 8d4f3e16513d52f5a92a917057c0e46283b29c17853f40c08f81939cef0e5f1aa7e2c99535d776be13f37df6e9e5f51762a861c48d2bec9c6bda6d6a99e0cfed SHA512 f4598d99b1e26d1f08cc7c9aa5a8f93424665e18bbc913562460a080738b5ca9d990618dd47206b161f81908efdfcb3cc6444341753c1b5dec83645156a58b60 EBUILD openjdk-17.0.3_p7-r1.ebuild 9182 BLAKE2B b398b29f7dc72d8e5afcfd76552879699de72e748a288ea44cfdcea86703f764bcabf3e4dcd585d62186bdabb47ff7b3f3fc529b1beff3ad19f1bf0ec223e5a8 SHA512 6498f31530c69a7b2129748d2056cac6f4a0420566af27ef1a8f5918a4c2973eac9c162acb646314f7599cbcf9d825acfdba06af39ee2fc6db578d62c2353ebf EBUILD openjdk-17.0.4.1_p1.ebuild 9147 BLAKE2B 82f18b43d61b3333e064dfb31044fc6cb7d1ad3ef7694df275dcf3bc4e004a76c067d1652dc45c7f11306e14e5904944d84dd377a964c0908b9cb1f3edb09ef0 SHA512 3e14c36d05a6a37ede1faceb5dfb1a5799910004c627634864f7b0a769a54b2798d697f75c84bf03ded4d61c028ce274a8eb9ab495e1c480fc4dc24a476165f6 -EBUILD openjdk-17.0.5_p5.ebuild 9083 BLAKE2B 4cfe56adab6b14c3ced28ab0478a9081ad8b32aa7361a58f7621f2bc80c3e98ba1c1beb05f7879409b7be9ec86e4560b9e301b0680da74f2b9925a2217e6755a SHA512 4d1d53ede92939ef8ad6984ecd77e5c615c55f16d7d257985783b63d9b4622fa88849434f917fbd2a83b1276e01446b1096c16cc58450e5c55b892c84fe048fa -EBUILD openjdk-17.0.5_p8.ebuild 9087 BLAKE2B 9b45788d1c684a928aceb0d33407570bc5919578696b3da7b1cd824df0b8f76d65980d7b4dd67f306b95cbb30d95977c44a8788e7e318ad24663b3f860abf151 SHA512 7f64be7604478492564ffe99348e3ba9707caaad1165106fd6b5a7de0c500d4dd2aff42f9842c03bf09f7677a668088be86147a4651fc69e4e9d72b5d1b0a96b +EBUILD openjdk-17.0.5_p8.ebuild 9209 BLAKE2B 9e9bc4c14e053300df1ab19cde9c84ec81b44baf84c08f49e83618c0dbe8df4e70e3d0750c034f4d51eb9eb7455afafa365b819cf30537bb8c2bd91f9e1e0049 SHA512 e509473f27d6be8ae0796935d15abe62fc7a48b4899dcd264d93dbfd4a0784d11c4483c52ba7b4b5cfd9263cf73a4e87512795c966951d53aed63196ba7142a2 EBUILD openjdk-8.332_p09.ebuild 6183 BLAKE2B e1519d397a5bbb99c91485181af982d1ef6ed674a51e0dff54426eaf1a1222cf38d2a4b30990f33cb868a6385ce4d433fa6b18e9b41db381259d2bfc5e421db8 SHA512 ca2653a9f7f74bb057f8c0023fa7a7b7ab9b367d8571bf5db7f2532939a0bcf7500c062628cc5055d1ee58e28a666999e0df5da5351c2a1c609509a0a74c272a EBUILD openjdk-8.345_p01.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc EBUILD openjdk-8.352_p08.ebuild 6187 BLAKE2B 4a46442662eacfe3eb99348863592a7b40515f91aab59556ce16e70fb004b7b57d4401072dae4a6e4951054497ac91970a4209611895935ba05d1c218778a8db SHA512 0fc74381d7e3dcc658366bbb9e04ffcfabcb403d109b9145d12f8f9427451af3b99885fcfab0d2296ad8044e9c36aa4db5826d9b5a8959d8c5568f9b3a3bf4dc -MISC metadata.xml 1506 BLAKE2B d56098f4ba9acb9bd5891247f5165beea69a802ae4fe57f6c0e4b54875efd73d3dafaa78f5c182e640028e31840aa6b9d16bafade717a469b4a43ccbe37cbef6 SHA512 84aa8b3bef355e93fea678612e9512ca2ce5df77efbf4f055589ff67387f0571e43eb5308b8c575eb09bf52b68e5fcc68fdd819a6781080755c3f6c24d6eb77d +MISC metadata.xml 1736 BLAKE2B 5911a98287022f27f1e0247e33b483981aa4d7a21c387305661039b5d195c458ff603c1c50e54dfb1116bcb932f4bdf09e191130ed6ea3c7c19fc698e4c70730 SHA512 e120118ace1e053d7e3899343dbf82ac54d7758caaa354f4e29c68f3a705ba61cfe545334441b46eac425bf2b81d2b1c107890c3ca6bfe96c3b783fbecc7bbee diff --git a/dev-java/openjdk/metadata.xml b/dev-java/openjdk/metadata.xml index e4fe12d5b61f..ab5c5e686f17 100644 --- a/dev-java/openjdk/metadata.xml +++ b/dev-java/openjdk/metadata.xml @@ -16,6 +16,7 @@ <slots> <slot name="8">Java™ 8 is Java™ 1.8, where 8 is the version number, and 1.8 is the version string</slot> <slot name="11">Java™ version 11</slot> + <slot name="17">Java™ version 17</slot> </slots> <use> <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs</flag> @@ -27,4 +28,9 @@ <flag name="system-bootstrap">Bootstrap using installed openjdk</flag> <flag name="systemtap" restrict=">=dev-java/openjdk-11">Enable SystemTAP/DTrace tracing</flag> </use> + <upstream> + <remote-id type="github">openjdk/jdk8u</remote-id> + <remote-id type="github">openjdk/jdk11u</remote-id> + <remote-id type="github">openjdk/jdk17u</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild b/dev-java/openjdk/openjdk-17.0.5_p5.ebuild deleted file mode 100644 index a3c2226a0e17..000000000000 --- a/dev-java/openjdk/openjdk-17.0.5_p5.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing toolchain-funcs - -# variable name format: <UPPERCASE_KEYWORD>_XPAK -ARM64_XPAK="17.0.2_p8" # musl bootstrap install -PPC64_XPAK="17.0.1_p12" # big-endian bootstrap tarball -RISCV_XPAK="17.0.3_p7" -X86_XPAK="17.0.1_p12" - -# Usage: bootstrap_uri <keyword> <version> [extracond] -# Example: $(bootstrap_uri ppc64 17.0.1_p12 big-endian) -# Output: ppc64? ( big-endian? ( https://...17.0.1_p12-ppc64.tar.xz ) ) -bootstrap_uri() { - local baseuri="https://dev.gentoo.org/~arthurzam/distfiles/dev-java/${PN}/${PN}-bootstrap" - local suff="tar.xz" - local kw="${1:?${FUNCNAME[0]}: keyword not specified}" - local ver="${2:?${FUNCNAME[0]}: version not specified}" - local cond="${3-}" - [[ ${cond} == elibc_musl* ]] && local musl=yes - - # here be dragons - echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}${musl:+-musl}.${suff} ${cond:+) })" -} - -# 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. -MY_PV="${PV//_p/+}" -SLOT="$(ver_cut 1)" - -DESCRIPTION="Open source implementation of the Java programming language" -HOMEPAGE="https://openjdk.org" -SRC_URI=" - https://github.com/${PN}/jdk${SLOT}u/archive/refs/tags/jdk-${MY_PV}.tar.gz - -> ${P}.tar.gz - !system-bootstrap? ( - $(bootstrap_uri arm64 ${ARM64_XPAK} elibc_musl) - $(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian) - $(bootstrap_uri x86 ${X86_XPAK}) - $(bootstrap_uri riscv ${RISCV_XPAK}) - ) - riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz ) -" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" - -REQUIRED_USE=" - javafx? ( alsa !headless-awt ) - !system-bootstrap? ( jbootstrap ) -" - -COMMON_DEPEND=" - media-libs/freetype:2= - media-libs/giflib:0/7 - media-libs/harfbuzz:= - media-libs/libpng:0= - media-libs/lcms:2= - sys-libs/zlib - media-libs/libjpeg-turbo:0= - systemtap? ( dev-util/systemtap ) -" - -# Many libs are required to build, but not to run, make is possible to remove -# by listing conditionally in RDEPEND unconditionally in DEPEND -RDEPEND=" - ${COMMON_DEPEND} - >=sys-apps/baselayout-java-0.1.0-r1 - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - selinux? ( sec-policy/selinux-java ) -" - -DEPEND=" - ${COMMON_DEPEND} - app-arch/zip - media-libs/alsa-lib - net-print/cups - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst - javafx? ( dev-java/openjfx:${SLOT}= ) - system-bootstrap? ( - || ( - dev-java/openjdk-bin:${SLOT} - dev-java/openjdk:${SLOT} - ) - ) -" - -S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}" - -# The space required to build varies wildly depending on USE flags, -# ranging from 2GB to 16GB. This function is certainly not exact but -# should be close enough to be useful. -openjdk_check_requirements() { - local M - M=2048 - M=$(( $(usex jbootstrap 2 1) * $M )) - M=$(( $(usex debug 3 1) * $M )) - M=$(( $(usex doc 320 0) + $(usex source 128 0) + 192 + $M )) - - CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE} -} - -pkg_pretend() { - openjdk_check_requirements - if [[ ${MERGE_TYPE} != binary ]]; then - has ccache ${FEATURES} && die "FEATURES=ccache doesn't work with ${PN}, bug #677876" - fi -} - -pkg_setup() { - openjdk_check_requirements - java-vm-2_pkg_setup - - [[ ${MERGE_TYPE} == "binary" ]] && return - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${BROOT}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done -} - -src_prepare() { - use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch - default - chmod +x configure || die -} - -src_configure() { - if has_version dev-java/openjdk:${SLOT}; then - export JDK_HOME=${BROOT}/usr/$(get_libdir)/openjdk-${SLOT} - elif use !system-bootstrap ; then - local xpakvar="${ARCH^^}_XPAK" - export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" - else - JDK_HOME=$(best_version -b dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${BROOT}/opt/${JDK_HOME%-r*} - export JDK_HOME - fi - - # Work around stack alignment issue, bug #647954. in case we ever have x86 - use x86 && append-flags -mincoming-stack-boundary=2 - - # Work around -fno-common ( GCC10 default ), bug #713180 - append-flags -fcommon - - # Strip some flags users may set, but should not. #818502 - filter-flags -fexceptions - - # Enabling full docs appears to break doc building. If not - # explicitly disabled, the flag will get auto-enabled if pandoc and - # graphviz are detected. pandoc has loads of dependencies anyway. - - local myconf=( - --disable-ccache - --disable-precompiled-headers - --disable-warnings-as-errors - --enable-full-docs=no - --with-boot-jdk="${JDK_HOME}" - --with-extra-cflags="${CFLAGS}" - --with-extra-cxxflags="${CXXFLAGS}" - --with-extra-ldflags="${LDFLAGS}" - --with-freetype="${XPAK_BOOTSTRAP:-system}" - --with-giflib="${XPAK_BOOTSTRAP:-system}" - --with-harfbuzz="${XPAK_BOOTSTRAP:-system}" - --with-lcms="${XPAK_BOOTSTRAP:-system}" - --with-libjpeg="${XPAK_BOOTSTRAP:-system}" - --with-libpng="${XPAK_BOOTSTRAP:-system}" - --with-native-debug-symbols=$(usex debug internal none) - --with-vendor-name="Gentoo" - --with-vendor-url="https://gentoo.org" - --with-vendor-bug-url="https://bugs.gentoo.org" - --with-vendor-vm-bug-url="https://bugs.openjdk.java.net" - --with-vendor-version-string="${PVR}" - --with-version-pre="" - --with-version-string="${PV%_p*}" - --with-version-build="${PV#*_p}" - --with-zlib="${XPAK_BOOTSTRAP:-system}" - --enable-dtrace=$(usex systemtap yes no) - --enable-headless-only=$(usex headless-awt yes no) - $(tc-is-clang && echo "--with-toolchain-type=clang") - ) - - use riscv && myconf+=( --with-boot-jdk-jvmargs="-Djdk.lang.Process.launchMechanism=vfork" ) - - if use javafx; then - local zip="${EPREFIX}/usr/$(get_libdir)/openjfx-${SLOT}/javafx-exports.zip" - if [[ -r ${zip} ]]; then - myconf+=( --with-import-modules="${zip}" ) - else - die "${zip} not found or not readable" - fi - fi - - if use !system-bootstrap ; then - addpredict /dev/random - addpredict /proc/self/coredump_filter - fi - - ( - unset _JAVA_OPTIONS JAVA JAVA_TOOL_OPTIONS JAVAC XARGS - CFLAGS= CXXFLAGS= LDFLAGS= \ - CONFIG_SITE=/dev/null \ - econf "${myconf[@]}" - ) -} - -src_compile() { - local myemakeargs=( - JOBS=$(makeopts_jobs) - LOG=debug - CFLAGS_WARNINGS_ARE_ERRORS= # No -Werror - NICE= # Use PORTAGE_NICENESS, don't adjust further down - $(usex doc docs '') - $(usex jbootstrap bootcycle-images product-images) - ) - emake "${myemakeargs[@]}" -j1 #nowarn -} - -src_install() { - local dest="/usr/$(get_libdir)/${PN}-${SLOT}" - local ddest="${ED}/${dest#/}" - - cd "${S}"/build/*-release/images/jdk || die - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - # Oracle and IcedTea have libjsoundalsa.so depending on - # libasound.so.2 but OpenJDK only has libjsound.so. Weird. - if ! use alsa ; then - rm -v lib/libjsound.* || die - fi - - if ! use examples ; then - rm -vr demo/ || die - fi - - if ! use source ; then - rm -v lib/src.zip || die - fi - - rm -v lib/security/cacerts || die - - dodir "${dest}" - cp -pPR * "${ddest}" || die - - dosym8 -r /etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts - - # must be done before running itself - java-vm_set-pax-markings "${ddest}" - - einfo "Creating the Class Data Sharing archives and disabling usage tracking" - "${ddest}/bin/java" -server -Xshare:dump -Djdk.disableLastUsageTracking || die - - java-vm_install-env "${FILESDIR}"/${PN}.env.sh - java-vm_revdep-mask - java-vm_sandbox-predict /dev/random /proc/self/coredump_filter - - if use doc ; then - docinto html - dodoc -r "${S}"/build/*-release/images/docs/* - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} - -pkg_postinst() { - java-vm-2_pkg_postinst -} diff --git a/dev-java/openjdk/openjdk-17.0.5_p8.ebuild b/dev-java/openjdk/openjdk-17.0.5_p8.ebuild index 24f1298297b9..11d2c503987b 100644 --- a/dev-java/openjdk/openjdk-17.0.5_p8.ebuild +++ b/dev-java/openjdk/openjdk-17.0.5_p8.ebuild @@ -46,11 +46,12 @@ SRC_URI=" $(bootstrap_uri x86 ${X86_XPAK}) $(bootstrap_uri riscv ${RISCV_XPAK}) ) - riscv? ( https://dev.gentoo.org/~arthurzam/distfiles/dev-java/openjdk/openjdk-17.0.3-riscv.patch.xz ) + riscv? ( https://dev.gentoo.org/~gyakovlev/distfiles/dev-java/openjdk/java17-riscv64.patch ) " +# riscv patch origin: https://raw.githubusercontent.com/felixonmars/archriscv-packages/master/java17-openjdk/java17-riscv64.patch LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="alsa big-endian cups debug doc examples headless-awt javafx +jbootstrap selinux source system-bootstrap systemtap" @@ -161,7 +162,7 @@ pkg_setup() { } src_prepare() { - use riscv && eapply "${WORKDIR}"/openjdk-17.0.3-riscv.patch + use riscv && eapply "${DISTDIR}"/java17-riscv64.patch default chmod +x configure || die } |