diff options
| author | Richard Leitner <richard.leitner@skidata.com> | 2020-11-02 12:22:20 +0100 |
|---|---|---|
| committer | Richard Leitner <richard.leitner@skidata.com> | 2020-11-03 13:28:26 +0100 |
| commit | 9c61ac937e5c54e3ef34d41dda8f635209ac52b7 (patch) | |
| tree | 6f46550f6e2e8c7459b10a1c184daaa951f18cd0 | |
| parent | 03537feee539526ec9bb0cf4f55dd4eef6badc71 (diff) | |
| download | meta-java-9c61ac937e5c54e3ef34d41dda8f635209ac52b7.tar.gz | |
icedtea-7: add fix for deprecated sys/sysctl.h include
As glibc deprecated sys/sysctl.h we use linux/sysctl.h for now.
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
| -rw-r--r-- | recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch | 22 | ||||
| -rw-r--r-- | recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch new file mode 100644 index 0000000..1c7a585 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-replace-sys-sysctl.patch | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | --- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | ||
| 2 | +++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c | ||
| 3 | @@ -35,7 +35,7 @@ | ||
| 4 | #endif | ||
| 5 | #ifdef __linux__ | ||
| 6 | #include <unistd.h> | ||
| 7 | -#include <sys/sysctl.h> | ||
| 8 | +#include <linux/sysctl.h> | ||
| 9 | #include <sys/utsname.h> | ||
| 10 | #include <netinet/ip.h> | ||
| 11 | |||
| 12 | --- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c | ||
| 13 | +++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c | ||
| 14 | @@ -43,7 +43,7 @@ | ||
| 15 | #endif | ||
| 16 | #ifdef __linux__ | ||
| 17 | #include <unistd.h> | ||
| 18 | -#include <sys/sysctl.h> | ||
| 19 | +#include <linux/sysctl.h> | ||
| 20 | #endif | ||
| 21 | |||
| 22 | #include "jvm.h" | ||
diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index b504667..627501c 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc | |||
| @@ -101,6 +101,7 @@ OPENJDK_PATCHES = " \ | |||
| 101 | file://icedtea-jdk-unzip.patch;apply=no \ | 101 | file://icedtea-jdk-unzip.patch;apply=no \ |
| 102 | file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ | 102 | file://icedtea-hotspot-handle-gcc7-format-overflow.patch;apply=no \ |
| 103 | file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \ | 103 | file://icedtea-hotspot-fix-prefix_relocInfo-declaration.patch;apply=no \ |
| 104 | file://icedtea-jdk-replace-sys-sysctl.patch;apply=no \ | ||
| 104 | " | 105 | " |
| 105 | 106 | ||
| 106 | OPENJDK_HEADLESS_PATCHES = " \ | 107 | OPENJDK_HEADLESS_PATCHES = " \ |
| @@ -126,6 +127,7 @@ export DISTRIBUTION_PATCHES = " \ | |||
| 126 | patches/icedtea-jdk-unzip.patch \ | 127 | patches/icedtea-jdk-unzip.patch \ |
| 127 | patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ | 128 | patches/icedtea-hotspot-handle-gcc7-format-overflow.patch \ |
| 128 | patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \ | 129 | patches/icedtea-hotspot-fix-prefix_relocInfo-declaration.patch \ |
| 130 | patches/icedtea-jdk-replace-sys-sysctl.patch \ | ||
| 129 | ${CLEAN_X11_DISTRIBUTION_PATCH} \ | 131 | ${CLEAN_X11_DISTRIBUTION_PATCH} \ |
| 130 | " | 132 | " |
| 131 | 133 | ||
