diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-29 08:20:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-29 08:21:17 +0000 |
| commit | 7761faaf9a3a23486ada07d6cdc81f4cfc973b79 (patch) | |
| tree | 4c87a6cc6edb63cbdd54b4f2ab2d7a9728a2e2a1 /community | |
| parent | b7342d2b8824c97f1e386f8d0406d269c2cc0829 (diff) | |
| download | aports-7761faaf9a3a23486ada07d6cdc81f4cfc973b79.tar.bz2 aports-7761faaf9a3a23486ada07d6cdc81f4cfc973b79.tar.xz | |
community/openjdk11: fix build with make 4.3
upstream reports:
https://savannah.gnu.org/bugs/index.php?57676
https://bugs.openjdk.java.net/browse/JDK-8237879.
Diffstat (limited to 'community')
| -rw-r--r-- | community/openjdk11/APKBUILD | 2 | ||||
| -rw-r--r-- | community/openjdk11/make-4.3.patch | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/community/openjdk11/APKBUILD b/community/openjdk11/APKBUILD index 1f791487ea..cc2b3a130b 100644 --- a/community/openjdk11/APKBUILD +++ b/community/openjdk11/APKBUILD @@ -49,6 +49,7 @@ aarch64.patch arm.patch ppc64le.patch x86.patch +make-4.3.patch HelloWorld.java TestECDSA.java @@ -322,6 +323,7 @@ sha512sums="2c17182d3dd16dcf9ab527ce84ad1737946c80259ac227f9eddf385444471a78b3b1 d2903a5b3b9f82c4888416580f0b93888bf21ae0dac0ce6e926607a82a9e53b7e10e13f07a984f65dc116e81f58cd3844d6156088534c0059be8f6ee68e19a43 arm.patch 592bf6c1be99879735f0b2484d7d286be049170f5fb7de8526b452cde732e97f2b9b5b0af0073ec0a525bd52ce9f207a7dcace9d9d83a950eee38b11d6f5ad8d ppc64le.patch 89e681da2de0bcb5131e2512d1280ce8da684ede5b38379c6325cd9f57e78a4bdde3abfa0a0a496889411dd57264312094973ce2da301293d0826114a3ef09d3 x86.patch +a819eb321b925d626f26d0095603cf44040edc5e9d7f5d2f51a54ddc544d2933d0fa3c766645e8eea2cbdf57066f677d8c013e8bfea1ae943e4605441703c89f make-4.3.patch d1767dddd8e0956e25c0f77ed45c6fc86a1191bae1704a6dc33be490fd20eaa50461fe5c2a3349512059d555651e2eb41437dd3c1096c351e8ee68b4534a2579 HelloWorld.java 27e91edef89d26c0c5b9a813e2045f8d2b348745a506ae37b34b660fa7093da9a4e0e676ea41dc4a5c901bce02e5304d95e90f68d6c99cbf461b2da40a7a9853 TestECDSA.java b02dff8d549f88317bb4c741a9e269e8d59eef990197d085388fc49c7423a4eb9367dbe1e02bffb10e7862f5980301eb58d4494e177d0e8f60af6b05c7fbbe60 TestCryptoLevel.java diff --git a/community/openjdk11/make-4.3.patch b/community/openjdk11/make-4.3.patch new file mode 100644 index 0000000000..b15238cc75 --- /dev/null +++ b/community/openjdk11/make-4.3.patch @@ -0,0 +1,17 @@ +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 +@@ -981,7 +981,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) \ + ) + |