From b4fbf7c4e8a5b1da1efdeb5c3b3ebcb2cfecfe3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 18 Aug 2020 02:48:38 +0200 Subject: [PATCH] openjdk8: update to 8u272-b02 This fixes build w/ gcc10. [ci skip] --- srcpkgs/openjdk8/files/musl_005_jdk.patch | 22 ---------------------- srcpkgs/openjdk8/template | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/srcpkgs/openjdk8/files/musl_005_jdk.patch b/srcpkgs/openjdk8/files/musl_005_jdk.patch index 97946ba424f..68ff8d59b9b 100644 --- a/srcpkgs/openjdk8/files/musl_005_jdk.patch +++ b/srcpkgs/openjdk8/files/musl_005_jdk.patch @@ -47,28 +47,6 @@ diff -ru openjdk.orig/jdk/src/solaris/native/java/net/Inet4AddressImpl.c openjdk #define HAS_GLIBC_GETHOSTBY_R 1 #endif -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -41,7 +41,6 @@ - #endif - #ifdef __linux__ - #include --#include - #include - #include - -diff -ru openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c ---- openjdk.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-01-25 04:22:03.000000000 +0000 -+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c 2017-02-06 11:23:47.047832009 +0000 -@@ -43,7 +43,6 @@ - #endif - #ifdef __linux__ - #include --#include - #endif - - #include "jvm.h" diff -ru openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c openjdk/jdk/src/solaris/native/java/net/linux_close.c --- openjdk.orig/jdk/src/solaris/native/java/net/linux_close.c 2017-01-25 04:22:03.000000000 +0000 +++ openjdk/jdk/src/solaris/native/java/net/linux_close.c 2017-02-06 11:23:47.047832009 +0000 diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template index 9f9c5998fdc..80b2b88331a 100644 --- a/srcpkgs/openjdk8/template +++ b/srcpkgs/openjdk8/template @@ -3,8 +3,8 @@ # TODO: make -headless versions # TODO: config files? _java_ver=8 -_jdk_update=252 -_jdk_build=09 +_jdk_update=272 +_jdk_build=02 _main_ver=${_java_ver}u${_jdk_update} _final_jdk_home="usr/lib/jvm/java-1.8-openjdk" pkgname=openjdk8 @@ -52,14 +52,14 @@ distfiles=" http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz" -checksum="92c682ee19844341a21853c7db8bd7654d2e6e50a4c8d630b6b6be34c2591341 - 5ced6b56b60a658c04092ee6152462b4f3f84465b654f4bc874f03a2bc6539fb - 255a113a1a299caef89b928ebcdb6964f0e63009089a07c162562beb20aa42c8 - ec9a858770e348fe60817a67e670e268fb2445d64f99b6d4d33556f4e2f0c1d1 - 96ae2b2362f3d45874247b11bd8df59914fbfab051513e908eda11bb71a5837b - de5fe5813d47092e048f6860dc58dad8a2dbd2b9e7272493cff78cd7ad7aa82d - a971f578c3d8550f0b96b01ac24fc408cdcc7f2923d530d5ada81bba8caef9fe - 02d4042b042c457b0ed41cc6c95cfe005badec55b5fc19f03f57aebbc7121e52" +checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294 + 655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d + 2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78 + 9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5 + 7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd + 330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d + 04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba + 48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7" build_options="docs" desc_option_docs="Build documentation"