From 102dc42fae2907037d3ca9a6d63ed28e46c5b88e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Apr 2024 06:31:00 +0100 Subject: gentoo auto-resync : 08:04:2024 - 06:31:00 --- dev-java/openjdk/Manifest | 3 +- dev-java/openjdk/openjdk-8.402_p06.ebuild | 49 +++++++++++++++++++++++++++---- 2 files changed, 45 insertions(+), 7 deletions(-) (limited to 'dev-java/openjdk') diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index a055cdc58c3d..a5caf27717dc 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -20,8 +20,9 @@ DIST openjdk-bootstrap-17.0.2_p8-arm64-musl.tar.xz 115353932 BLAKE2B 0cc4ab07808 DIST openjdk-bootstrap-17.0.3_p7-riscv.tar.xz 113344052 BLAKE2B 69ae326c600ecf1840a0874b1e26545779434b979e195a3bc7975615f873cd9ffce324f291e56a2800edc304447845baec774b2a08964afde274bd8e0dd3f704 SHA512 4a483faa32b26758f6fae605fdb3d3b77814c627a3a560e91ca88e2d36a88543a53f019a59b5a6456b87ca671e8b7129d5766210bd5cd52125cb3a040ec2a23f DIST openjdk-bootstrap-21.0.0_p35-ppc64.tar.xz 125375264 BLAKE2B 28802995f393dc76362dae766f8b598fd56085051418075d4c426293e6431b441ea38a2d2e4676fc89173d10324e3aafac52c97a5d9459bb0199168a07807e16 SHA512 cbd3992450c44764373c25313f6ce32f0c8a47abec557e4a10f7f8517435bf450ba5ac9fa9c8cdfb41f1536b55829d733426dc12dc2b5a2eebf5a94e9094752a DIST openjdk-bootstrap-21.0.0_p35-x86.tar.xz 120906212 BLAKE2B c3a56f4e51a8aca1c318b9c32bebdb4c09e42d80416ce1843bc80077f09466b7f54627ab6992f9149fdabdb4d5557c3cad6b5e93b37ba3d89d84f736fc07a57a SHA512 40f0cf60adaebd0c6ae11badb6b71727a5cc64c89077731b0f7cc82f203297b9b780ae43ec74eca9dd5a64de1209f519c2ad0f9083c017cf474d1020206f762c +DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c158c7e7d9fae9741112230dcd6e314163911921d63e3222cd3f4ab9d08bbaacbf6d9bfce9a1a9336e21088fba6396613489a701b30797 SHA512 fe5719e0bbf9bcd6eb9790ebd4da34e7f6c99fe4b7d41de2b5d00b20ebe76a77d857c726d1a71b7f40657ca2a9aa08eaa9efc1ab4be60016f66af95530b454b5 EBUILD openjdk-11.0.22_p7.ebuild 8864 BLAKE2B 36030166187064b860ae74f7a11b6ae147e3c43b4251ff4e4e8cdb0136baa0208f2ba825d12f8e9270b0b33dec7a420f51b9f6929561733b685e47a771554fc1 SHA512 7e44978bb48ce996b8603cb5297587c6c3264431bb540b5d7614f4447084464e9bb28460176dd504805d19271b4f4bab3c105c327c21765ebd1dce6968c00c31 EBUILD openjdk-17.0.10_p7.ebuild 9658 BLAKE2B 70fd9a5134572f07b227403a90ab9223fc7f70ee57b3d2868fbb623566f51af97a32ce09ea38034808d76129bbce3aaf9ac9b9006500c8f7bbe4650f900ed17f SHA512 669f8831f7783640c97ed6d27182fcca6f46cbf5adf88eef37e7d3634dda9e0cfed68355d229b685c43f71fd96e4710a8f0aa5b6d864b361daac37be3e7051a8 EBUILD openjdk-21.0.2_p13.ebuild 9251 BLAKE2B e7fd409656211864689d2040d738a45a132d5e3150fc8fa180d7957255aaac6cff2a44dfb87bbcf0f519791f39f09bb6788bbe730738c70778d5f22c85e9fa00 SHA512 73ff9f0d4034dee508403f2ffc1924294265465629a6c0d9c33c4e5df776a474c6a7fae19eb0b446e7861cb30fc24929970b718b3da69ecb446bac994bb22950 -EBUILD openjdk-8.402_p06.ebuild 6746 BLAKE2B db1ac66aba7551e6a42e0c83da920e3048343918980b7723e6ca0f11c978e17c346f522dc7c8a50114e6ad755013d298f3f30d01d70c87df29cb04989f99ed33 SHA512 dbcae8682239d6a022e8a272dd904d09387d8b50633c44d48a6bcedf9022cf2359c0a32023536191021e758471b73e8fb20bfd7330adb06ca5caecacf7f5bd49 +EBUILD openjdk-8.402_p06.ebuild 7804 BLAKE2B 032d79c00a20c297a70706bef5bd3905bc1cd00d65914bb2979bbe100a7fa89173197dbc84ac9c354f04ba09d15c71261b992ff5c518197f74a4d919b807bfe1 SHA512 4aec007ff050a974626bd2b9877ac07e35ffd25c10dd322ebfd83f88f2d4689fbc278a0dab75bd8d1c59e2d9cdd1cbd9a13d741d294c4078584f6bdd0f79cdd1 MISC metadata.xml 1549 BLAKE2B 5f7caf2330b7d8eb264df12fe6eebbf1e4acf91b04e37a4c6ea6c45101a39f2e84b4d40152d58c93e63a1d2d6fdb5649b096a314f7269d33ce72da263d392c90 SHA512 8fa15bf9544f2665a47185a3701c3a9ce1654ddedf1aebfb344f77f544a71a3bda33c2d4f3c1d5d65d7ea42b6c1f04a6e1dfaaae723c1a5fcaf63ec48d79f3de diff --git a/dev-java/openjdk/openjdk-8.402_p06.ebuild b/dev-java/openjdk/openjdk-8.402_p06.ebuild index efd72999aa73..ce8e246db9d3 100644 --- a/dev-java/openjdk/openjdk-8.402_p06.ebuild +++ b/dev-java/openjdk/openjdk-8.402_p06.ebuild @@ -16,13 +16,36 @@ inherit check-reqs eapi8-dosym flag-o-matic java-pkg-2 java-vm-2 multiprocessing MY_PV="$(ver_rs 1 'u' 2 '-' ${PV%_p*}-ga)" SLOT="${PV%%[.+]*}" +# variable name format: _XPAK +X86_XPAK="8.402_p06" + +# Usage: bootstrap_uri [extracond] +# Example: $(bootstrap_uri x86 8.402_p06) +# Output: ppc64? ( big-endian? ( https://...8.402_p06-x86.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-}" + + # here be dragons + echo "${kw}? ( ${cond:+${cond}? (} ${baseuri}-${ver}-${kw}.${suff} ${cond:+) })" +} + DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.org" -SRC_URI="https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/openjdk/jdk${SLOT}u/archive/refs/tags/jdk${MY_PV}.tar.gz + -> ${P}.tar.gz + !system-bootstrap? ( + $(bootstrap_uri x86 ${X86_XPAK}) + ) +" LICENSE="GPL-2-with-classpath-exception" KEYWORDS="amd64 arm64 ppc64 x86" -IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux source" +IUSE="alsa debug cups doc examples headless-awt javafx +jbootstrap selinux system-bootstrap source" COMMON_DEPEND=" media-libs/freetype:2= @@ -105,13 +128,22 @@ pkg_pretend() { pkg_setup() { openjdk_check_requirements + java-vm-2_pkg_setup + + [[ ${MERGE_TYPE} == "binary" ]] && return JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} icedtea-${SLOT} icedtea-bin-${SLOT}" JAVA_PKG_WANT_SOURCE="${SLOT}" JAVA_PKG_WANT_TARGET="${SLOT}" - java-vm-2_pkg_setup - java-pkg-2_pkg_setup + if use system-bootstrap; then + 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 + fi } src_prepare() { @@ -125,6 +157,11 @@ src_prepare() { } src_configure() { + if ! use system-bootstrap; then + local xpakvar="${ARCH^^}_XPAK" + export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}" + fi + # general build info found here: # https://hg.openjdk.java.net/jdk8/jdk8/raw-file/tip/README-builds.html @@ -156,7 +193,7 @@ src_configure() { --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 + --with-giflib="${XPAK_BOOTSTRAP:-system}" --with-jtreg=no --with-jobs=1 --with-num-cores=1 @@ -167,7 +204,7 @@ src_configure() { --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-zlib=system + --with-zlib="${XPAK_BOOTSTRAP:-system}" --with-native-debug-symbols=$(usex debug internal none) $(usex headless-awt --disable-headful '') $(tc-is-clang && echo "--with-toolchain-type=clang") -- cgit v1.2.3