From 72896f7156538716e2d4176ea8925be73a5608f2 Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Sun, 21 Oct 2018 20:34:49 +0100 Subject: dev-java/icedtea-bin: Rebuild for x86 with stack alignment The other arches are unchanged. Bug: https://bugs.gentoo.org/647954 Signed-off-by: James Le Cuirot Package-Manager: Portage-2.3.51, Repoman-2.3.11 --- dev-java/icedtea-bin/Manifest | 4 +- dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild | 160 +++++++++++++++++++++++ dev-java/icedtea-bin/icedtea-bin-3.9.0.ebuild | 160 ----------------------- 3 files changed, 162 insertions(+), 162 deletions(-) create mode 100644 dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild delete mode 100644 dev-java/icedtea-bin/icedtea-bin-3.9.0.ebuild (limited to 'dev-java') diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest index 204084308e7d..39d7c55f110c 100644 --- a/dev-java/icedtea-bin/Manifest +++ b/dev-java/icedtea-bin/Manifest @@ -9,7 +9,7 @@ DIST icedtea-bin-core-3.9.0-arm.tar.xz 58032620 BLAKE2B 1646096d659a702b5ddb08c2 DIST icedtea-bin-core-3.9.0-arm64.tar.xz 59190292 BLAKE2B 8778d668e96a660b73371e4d67bd3c8121b981efea1d3c900c8d38b6be3bd3de65e79e87deeaa88b86be2ce766750471e332e0fbad08fb669b803eba3c367903 SHA512 577bb5bca4c9b9bc9ae14ba50fde73c89d37515e7287ff611d297394aecc2dfd69f4d2ca347ba5d833c41584cd4b644060f21ac5b6c3c11bf710037176065314 DIST icedtea-bin-core-3.9.0-ppc64.tar.xz 54302616 BLAKE2B 6a354a96bdfd3d6398832e0840f88c50981a1ca304f076c599603f98d3f61b32192f03b5a9830966e3a683af63415c56769977202cda6a618bc6953922f94f89 SHA512 534d1c7d7e64b69cd6352b62c46da005df0855bb5a8d01657462a9202d1149f3e9d3e89b8fe499b53f3f7faff976b6fb665e200bc05ee7ac17c981096c7ba584 DIST icedtea-bin-core-3.9.0-ppc64le.tar.xz 54336300 BLAKE2B 2cee58d745faee8dab0ad8b064b51d60552995d33407f40e50794a17f7d993b74fbd340db3aac520642e11a926a89554e9d686cd425b05bed4194eb1bc957e5f SHA512 6d680a987dddff0d569417c3d33d8c8b73bf2aeb454906047226be3ff7277ffc62d272c0dcd6c2bc9ee3724eacf77074ef9e931f980232ffb356e9e919f2247b -DIST icedtea-bin-core-3.9.0-x86.tar.xz 61471872 BLAKE2B 09d1a9d66759ed008de33d6f0b6888308f9f6ef782501bce513bca9a9f5040d0407883018dda106b446bdd040ad8cb02f69177d6244dff7604e9a5bdb71bcaf5 SHA512 713b3c1fc4f18f2dc3729f0432f4695b44c45ceb16b576d3a291e756f2353267dbe2f6819a7bafab797d43ccc77c55a117c3782a7f75eb39f0749b1572d7b982 +DIST icedtea-bin-core-3.9.0-r1-x86.tar.xz 61523320 BLAKE2B c5c1415faefaf1199937158d953bdced763c1cb739cb521b5439d37dbe66d659546940154a4139c3a8b7ef13c822da877a335c7e09299c097ed97c22eb65c50d SHA512 8239e56248923d67174a7729cf0821862b8b349edfee46ffb92d25121b1b8bb7b5aac7e67b8cbb35ca97c480ed9292ae9a5eb14cfa03142de2fa77f93a1e4f81 DIST icedtea-bin-doc-3.8.0.tar.xz 11683136 BLAKE2B 37fd84b58f6d6934b4775b23c3cfd47dbf275083719361ef74d55dcd2385f822b8cd0257e76cf4a194cc6d555c579a8373b39f72f4a8e80b8511acb5a0b2b537 SHA512 aee063874fa2de7cc7848deb511b1373df14ecb530eb00887920ca82b9af80763616ac4df641cd0debbf08011f71b20e8b250384e9d142387139e7698dece53a DIST icedtea-bin-doc-3.9.0.tar.xz 11685100 BLAKE2B 3c0301193e295b1441f657247263994deaf84c3c534b110db9a7e4fd3e6fe73d2499a2661dbed4f9d2751634c0b99242963b92a0cbea3fa846230d7dbfce1604 SHA512 d5190f0c341181321aab1a0113368cd138550a12d6be684568e45899df509b3e9ea95abd72c1505c298d6a14977ca2fcb07e85e6ab4d2d554959af35f993cb8f DIST icedtea-bin-examples-3.8.0-amd64.tar.xz 1856688 BLAKE2B c6ab09ae55a2c1ae42485acffa72ed7a16a5a19e5ee105f2e4e856c7929ac9758a5ff04873a5e3114f4fcb84184a85d30503904eeb21c34010b72b23b2b9f98d SHA512 de48a06fc39393e5967cf83565ce42845ce864104038a2094555cee4331ce1dbe1cc7e56668b773581a9f2e8bbd11c23dc77d922d20e0d80251ced09edd509be @@ -23,6 +23,6 @@ DIST icedtea-bin-examples-3.9.0-arm.tar.xz 1840572 BLAKE2B f3a5e470b4bcbc7310660 DIST icedtea-bin-examples-3.9.0-arm64.tar.xz 1837768 BLAKE2B 96d870c5a823c5b8accbe540548ad29f648466a094a0bef2351770758c6f7481b359c6d64c4229e61a168c0514375174634a0fa5c74e63351e50de4b2b87078b SHA512 28a00121176df9ed71d8a65eea1c7592669e201b1b2f57bad4d219c64d14fc891766a7f33e9c4a7f6d28dadab9ff7f174612936cfc20ffa2802d4b477c3b11c1 DIST icedtea-bin-examples-3.9.0-ppc64.tar.xz 1847612 BLAKE2B f14e5e4c2b28b19b9e05a98e98c930dfacf3afaac3bd7e791d3de51ad276316506f370e35e73b1f6cefc14b1215da2a6a51d2cba5f94cbcf76233a3fa51fe23f SHA512 334b5db34987eb0c2e17c2570bda2fc45de8c445ba226137a9dbf768d1627175c3621a29408e9f31fb40c0aa1b3801f3e050bc6bfc81e87a43da9fcc64d9cdad DIST icedtea-bin-examples-3.9.0-ppc64le.tar.xz 1845088 BLAKE2B 95f98bf4d76241ebaa3966675a78f871b388de7aa5e3d672b804fcc010e7506c961ea8a0c46e4e3a966007198a95144aa7f1d1abb0fd3fe1da610e4f99ffe49b SHA512 4be2961f5b042d0edacc944243c3cdb66ebb71919247a38f3e992e792c3a5c85a72a8b0fa87d614b21b6f93e5e96062be145666e9b5e9ace7982ec2976d9ca31 -DIST icedtea-bin-examples-3.9.0-x86.tar.xz 1863192 BLAKE2B 5925a920a849518c1f6a6fb7fb97be3dd12902f4fc04a9102ce297e2f2ed19cae126e195f7c7652b39ac8f3d75ce14d6bb3e3d4faadf8fb99f3080c471d9657b SHA512 97dd39f86a5a3b33b55800628247ca285173ff3bc63890419a37064b99a853c8a44601ae7a638cd4bd686612d5d7105a6b048540aff6bb0bbebbb09073fe77ed +DIST icedtea-bin-examples-3.9.0-r1-x86.tar.xz 1862632 BLAKE2B ac63c7f38ec35dd63b01e5f9472a1f226fd3eac7f5e5f8a55e5d211b20344b86ad2d55cbe8f67acfe80a30bbddc72f8de091ae6d3b7df454bbe43c42ec957726 SHA512 d5b377e015550f14996deb040ce753fa4f88eb1fc0ed76babee6e187feff61c8947c54c4f876d25e5fc6344b1411c4c93b75d362206f966e69b205a14d18380c DIST icedtea-bin-src-3.8.0.tar.xz 45741844 BLAKE2B b06e21b2d243a4be4e8328e7551285df9e71697b04b74a98a10293cbc8ee13bb570183e3c15511434e0b21a9052fbf945da8872c5db40fe28564794557f2d67e SHA512 527bbcec8d1c6a638e0861fb8041c94eda4d5d51ecc5a6ecaa615db155ba8cb1563e5009c4031c6b161328ff75654f2b46b09b08279260745288c5876336bd3e DIST icedtea-bin-src-3.9.0.tar.xz 45749212 BLAKE2B 2b66ddd1639e84c637775321648d24e6161c292f54af40d6ce1dbd07e9bbcbb177d5895548ea82a6168b35811d48807e58292533846091f13745f13408ee055e SHA512 05b4df389d84f7be144bc99c10cf544183db77b4a7c141826079edb445b5af333440a5bf0ac627133043e276334993969be22caca2db9edd6249560a4db031e2 diff --git a/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild new file mode 100644 index 000000000000..47acc0d18744 --- /dev/null +++ b/dev-java/icedtea-bin/icedtea-bin-3.9.0-r1.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# Don't block arm. See bug #600134. +#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} ) +KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86" + +inherit java-vm-2 multilib-build toolchain-funcs + +abi_uri() { + echo "${2-$1}? ( + ${BASE_URI}/${PN}-core-${PV}${3+-r${3}}-${1}.tar.xz + examples? ( ${BASE_URI}/${PN}-examples-${PV}${3+-r${3}}-${1}.tar.xz ) + )" +} + +BASE_URI="https://dev.gentoo.org/~chewi/distfiles" +SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) + source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz ) + multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-r1-x86.tar.xz ) ) ) + big-endian? ( $(abi_uri ppc64) ) + !big-endian? ( $(abi_uri ppc64le ppc64) ) + $(abi_uri amd64) + $(abi_uri arm) + $(abi_uri arm64) + $(abi_uri x86 x86 1)" + +DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" +HOMEPAGE="http://icedtea.classpath.org" +LICENSE="GPL-2-with-classpath-exception" +SLOT="8" + +IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart" +REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )" + +RESTRICT="preserve-libs strip" +QA_PREBUILT="opt/.*" + +RDEPEND=">=dev-libs/glib-2.42:2% + >=media-libs/fontconfig-2.11:1.0% + >=media-libs/freetype-2.5.5:2% + >=media-libs/lcms-2.9:2% + >=sys-libs/zlib-1.2.8-r1% + virtual/jpeg:62% + alsa? ( >=media-libs/alsa-lib-1.0% ) + cups? ( >=net-print/cups-2.0% ) + gtk? ( + >=dev-libs/atk-2.16.0% + >=x11-libs/cairo-1.14.2% + x11-libs/gdk-pixbuf:2% + >=x11-libs/gtk+-2.24:2% + >=x11-libs/pango-1.36% + ) + !headless-awt? ( + media-libs/giflib:0/7% + =media-libs/libpng-1.6*% + >=x11-libs/libX11-1.6% + >=x11-libs/libXcomposite-0.4% + >=x11-libs/libXext-1.3% + >=x11-libs/libXi-1.7% + >=x11-libs/libXrender-0.9.8% + >=x11-libs/libXtst-1.2% + )" + +RDEPEND=">=sys-devel/gcc-6.4.0[multilib?] + >=sys-libs/glibc-2.26[multilib?] + virtual/ttf-fonts + selinux? ( sec-policy/selinux-java ) + multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} ) + !multilib? ( ${RDEPEND//%/} )" + +PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) + nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) + pulseaudio? ( dev-java/icedtea-sound )" + +S="${WORKDIR}" + +pkg_pretend() { + if [[ "$(tc-is-softfloat)" != "no" ]]; then + die "These binaries require a hardfloat system." + fi +} + +src_prepare() { + default + + # I wouldn't normally use -f below but symlinks in the arm files + # make this fail otherwise and any other approach would be tedious. + + if ! use alsa; then + rm -fv */jre/lib/*/libjsoundalsa.* || die + fi + + if use headless-awt; then + rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ + */{,jre/}bin/policytool */bin/appletviewer || die + fi +} + +multilib_src_install() { + local dest="/opt/${P}-${ABI}" + dest="${dest/%-${DEFAULT_ABI}/}" + local ddest="${ED}${dest#/}" + dodir "${dest}" + + if multilib_is_native_abi; then + dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} + use doc && dodoc -r ${P}/doc/html + + # doins doesn't preserve executable bits. + cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die + + if use examples; then + cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die + fi + + if use source; then + cp ${P}/src.zip "${ddest}" || die + fi + + # Use default VMHANDLE. + java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" + else + local x native=$(get_system_arch ${DEFAULT_ABI}) + + for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do + dodir "${dest}"${x%/*} + cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die + done + + for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do + [[ ${x##*/} = ${native} ]] && continue + [[ -e "${ddest}"/${x#*/} ]] && continue + dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/} + done + + # Use ABI-suffixed VMHANDLE. + VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" + fi + + # Both icedtea itself and the icedtea ebuild set PAX markings but we + # disable them for the icedtea-bin build because the line below will + # respect end-user settings when icedtea-bin is actually installed. + java-vm_set-pax-markings "${ddest}" + + # Each invocation appends to the config. + java-vm_revdep-mask "${EPREFIX}${dest}" +} + +src_install() { + if use multilib; then + multilib_foreach_abi multilib_src_install + else + multilib_src_install + fi + + java-vm_sandbox-predict /proc/self/coredump_filter +} diff --git a/dev-java/icedtea-bin/icedtea-bin-3.9.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.9.0.ebuild deleted file mode 100644 index 9faa93f33937..000000000000 --- a/dev-java/icedtea-bin/icedtea-bin-3.9.0.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Don't block arm. See bug #600134. -#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} ) -KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86" - -inherit java-vm-2 multilib-build toolchain-funcs - -abi_uri() { - echo "${2-$1}? ( - ${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz - examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz ) - )" -} - -BASE_URI="https://dev.gentoo.org/~chewi/distfiles" -SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) - source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz ) - multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) ) - big-endian? ( $(abi_uri ppc64) ) - !big-endian? ( $(abi_uri ppc64le ppc64) ) - $(abi_uri amd64) - $(abi_uri arm) - $(abi_uri arm64) - $(abi_uri x86)" - -DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" -HOMEPAGE="http://icedtea.classpath.org" -LICENSE="GPL-2-with-classpath-exception" -SLOT="8" - -IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart" -REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )" - -RESTRICT="preserve-libs strip" -QA_PREBUILT="opt/.*" - -RDEPEND=">=dev-libs/glib-2.42:2% - >=media-libs/fontconfig-2.11:1.0% - >=media-libs/freetype-2.5.5:2% - >=media-libs/lcms-2.9:2% - >=sys-libs/zlib-1.2.8-r1% - virtual/jpeg:62% - alsa? ( >=media-libs/alsa-lib-1.0% ) - cups? ( >=net-print/cups-2.0% ) - gtk? ( - >=dev-libs/atk-2.16.0% - >=x11-libs/cairo-1.14.2% - x11-libs/gdk-pixbuf:2% - >=x11-libs/gtk+-2.24:2% - >=x11-libs/pango-1.36% - ) - !headless-awt? ( - media-libs/giflib:0/7% - =media-libs/libpng-1.6*% - >=x11-libs/libX11-1.6% - >=x11-libs/libXcomposite-0.4% - >=x11-libs/libXext-1.3% - >=x11-libs/libXi-1.7% - >=x11-libs/libXrender-0.9.8% - >=x11-libs/libXtst-1.2% - )" - -RDEPEND=">=sys-devel/gcc-6.4.0[multilib?] - >=sys-libs/glibc-2.26[multilib?] - virtual/ttf-fonts - selinux? ( sec-policy/selinux-java ) - multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} ) - !multilib? ( ${RDEPEND//%/} )" - -PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) - nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] ) - pulseaudio? ( dev-java/icedtea-sound )" - -S="${WORKDIR}" - -pkg_pretend() { - if [[ "$(tc-is-softfloat)" != "no" ]]; then - die "These binaries require a hardfloat system." - fi -} - -src_prepare() { - default - - # I wouldn't normally use -f below but symlinks in the arm files - # make this fail otherwise and any other approach would be tedious. - - if ! use alsa; then - rm -fv */jre/lib/*/libjsoundalsa.* || die - fi - - if use headless-awt; then - rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \ - */{,jre/}bin/policytool */bin/appletviewer || die - fi -} - -multilib_src_install() { - local dest="/opt/${P}-${ABI}" - dest="${dest/%-${DEFAULT_ABI}/}" - local ddest="${ED}${dest#/}" - dodir "${dest}" - - if multilib_is_native_abi; then - dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README} - use doc && dodoc -r ${P}/doc/html - - # doins doesn't preserve executable bits. - cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die - - if use examples; then - cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die - fi - - if use source; then - cp ${P}/src.zip "${ddest}" || die - fi - - # Use default VMHANDLE. - java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" - else - local x native=$(get_system_arch ${DEFAULT_ABI}) - - for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do - dodir "${dest}"${x%/*} - cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die - done - - for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do - [[ ${x##*/} = ${native} ]] && continue - [[ -e "${ddest}"/${x#*/} ]] && continue - dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/} - done - - # Use ABI-suffixed VMHANDLE. - VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh" - fi - - # Both icedtea itself and the icedtea ebuild set PAX markings but we - # disable them for the icedtea-bin build because the line below will - # respect end-user settings when icedtea-bin is actually installed. - java-vm_set-pax-markings "${ddest}" - - # Each invocation appends to the config. - java-vm_revdep-mask "${EPREFIX}${dest}" -} - -src_install() { - if use multilib; then - multilib_foreach_abi multilib_src_install - else - multilib_src_install - fi - - java-vm_sandbox-predict /proc/self/coredump_filter -} -- cgit v1.2.3-65-gdbad