diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2020-07-25 01:46:28 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-07-25 04:31:55 +0000 |
| commit | 44a59bd2f50ef15193c44a081c6974bb2b4b851d (patch) | |
| tree | 83e982a7721a84ff06cc58a8fc66b0de0e9ff9d0 | |
| parent | 8aa8d74240ef4790deb16ad26b1c59fc21cb3048 (diff) | |
testing/openjdk13: upgrade to 13.0.4
| -rw-r--r-- | testing/openjdk13/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/openjdk13/make-4.3.patch | 17 |
2 files changed, 2 insertions, 21 deletions
diff --git a/testing/openjdk13/APKBUILD b/testing/openjdk13/APKBUILD index 555789edd55..969b87ad57f 100644 --- a/testing/openjdk13/APKBUILD +++ b/testing/openjdk13/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Simon Frankenberger <simon-alpine@fraho.eu> # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu> pkgname=openjdk13 -pkgver=13.0.3_p3 +pkgver=13.0.4_p8 _pkgver=${pkgver%_p*}-ga pkgrel=0 pkgdesc="Oracle OpenJDK 13" @@ -46,7 +46,6 @@ source="jdk-$_pkgver.tar.gz::https://github.com/openjdk/jdk13u/archive/jdk-$_pkg build.patch aarch64.patch ppc64le.patch - make-4.3.patch fix-bootjdk-check.patch HelloWorld.java @@ -284,11 +283,10 @@ _jdk() { mv "$_fromroot/include" "$_toroot" } -sha512sums="f6e2ac7e8bbc93d85d5a94d28de6e37c6cfb53c1acc08b2166d31b014ca11d62b205c31964261135149ec913b7506dc6b7a6a7d52fd1ff27d4519edeb5fd7e29 jdk-13.0.3-ga.tar.gz +sha512sums="d29820da13b45fe64ff20ff277142a3dd73301145b9b7c03b387950928aae99564b7ecb0c1a25d29737de896e06b94f8618c6e141130788a6e87dc23e97a023e jdk-13.0.4-ga.tar.gz 953fea48fa200b4388867134428220b08aad38396cebff2b2a2d270ac49678e5baf08b19edf58b514750b527c06c5958e7394e7d0d4189950c213bea322048e1 build.patch 44e26f252a911acc4fa742c352177dbd59f3a9275b76bb4cc61d430232bd95a7279d116204e39c3ebd9b4fea2ff0ba3ba091d640cdd021baa437d0196818d6bb aarch64.patch fabbfd3d1a42d885e0631f6a9a93408dc4c3d1d6dd8099d3783192972d1f61776724d7d2d68f425c1d8eb4e942fa5302325fb8240c0a6049e891a29e8e3b2be7 ppc64le.patch -b8b420b9e73da54decbec04fab9ac1c79f3c01ef2f9af132cf98a008f9ff6544e67d98c109f8c48f224df9581a8b40399db25099766d9f3f9b11dafe5114c545 make-4.3.patch e54c69db6e97c9d7057275f6749565a748f42dadb397b2f3975d99608c4037ad93c84cf828c7e2955b1b4f1899dcc25069c8c6d675f1e963adf3f1223a47d56c fix-bootjdk-check.patch d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java 27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java diff --git a/testing/openjdk13/make-4.3.patch b/testing/openjdk13/make-4.3.patch deleted file mode 100644 index 356c6a988a6..00000000000 --- a/testing/openjdk13/make-4.3.patch +++ /dev/null @@ -1,17 +0,0 @@ -upstream report: https://bugs.openjdk.java.net/browse/JDK-8237879. - -diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk -index 170c3ed..697f9d2 100644 ---- a/make/common/MakeBase.gmk -+++ b/make/common/MakeBase.gmk -@@ -532,7 +532,9 @@ DependOnVariableHelper = \ - $(info NewVariable $1: >$(strip $($1))<) \ - $(info OldVariable $1: >$(strip $($1_old))<)) \ - $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ -- $(call DependOnVariableFileName, $1, $2))) \ -+ $(call DependOnVariableFileName, $1, $2)) \ -+ $(eval $(call DependOnVariableFileName, $1, $2): ) \ -+ ) \ - $(call DependOnVariableFileName, $1, $2) \ - ) - |