diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2017-01-21 23:18:07 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2017-01-23 22:52:09 +0000 |
| commit | 44fc88593e0aadc2e69b48034280ecb4c0149887 (patch) | |
| tree | 907c7b4e575ba3eec5a9b11e0e8da311cba8103e | |
| parent | dev-java/oracle-jdk-bin: Migrate to java-vm_install-env (diff) | |
| download | gentoo-44fc88593e0aadc2e69b48034280ecb4c0149887.tar.gz gentoo-44fc88593e0aadc2e69b48034280ecb4c0149887.tar.bz2 gentoo-44fc88593e0aadc2e69b48034280ecb4c0149887.zip | |
dev-java/oracle-jdk-bin: Drop support for PT PaX marking, bug #592856
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| -rw-r--r-- | dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild index 82fc8b6a0c34..f0a77c03e78a 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild @@ -61,7 +61,7 @@ SRC_URI+=" jce? ( ${JCE_FILE} )" LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" SLOT="1.8" KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" +IUSE="alsa cups derby doc examples +fontconfig headless-awt javafx jce nsplugin selinux source" REQUIRED_USE="javafx? ( alsa fontconfig )" RESTRICT="fetch preserve-libs strip" @@ -107,12 +107,9 @@ RDEPEND="!x64-macos? ( !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java )" -# A PaX header isn't created by scanelf so depend on paxctl to avoid -# fallback marking. See bug #427642. DEPEND="app-arch/zip jce? ( app-arch/unzip ) - examples? ( x64-macos? ( app-arch/unzip ) ) - pax_kernel? ( sys-apps/paxctl )" + examples? ( x64-macos? ( app-arch/unzip ) )" S="${WORKDIR}/jdk" @@ -187,7 +184,7 @@ src_prepare() { if [[ -n ${JAVA_PKG_STRICT} ]] ; then # Mark this binary early to run it now. - pax-mark Cm ./bin/javap + pax-mark m ./bin/javap eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." eqawarn |