rpms/java-1.8.0-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add patch so as to remove unused include of sys/sysctl.h

Browse Source 
Tracked upstream as JDK-8244461
This commit is contained in:
Severin Gehwolf 2020-05-04 16:18:57 +02:00
parent 1b1cbf2cdf
commit 5ff7ed65db
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java-1.8.0-openjdk.spec
View File

@ -245,7 +245,7 @@
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
# eg jdk8u60-b27 -> b27 # eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
%global rpmrelease 3 %global rpmrelease 4
# Define milestone (EA for pre-releases, GA ("fcs") for releases) # Define milestone (EA for pre-releases, GA ("fcs") for releases)
# Release will be (where N is usually a number starting at 1): # Release will be (where N is usually a number starting at 1):
# - 0.N%%{?extraver}%%{?dist} for EA releases, # - 0.N%%{?extraver}%%{?dist} for EA releases,
@ -1136,6 +1136,7 @@ Patch110: jdk8219772-extra_c_cxx_flags_not_picked_for_assembler_source.patch
Patch111: jdk8218811-perfMemory_linux.patch Patch111: jdk8218811-perfMemory_linux.patch
# JDK-8241296: Segfault in JNIHandleBlock::oops_do() # JDK-8241296: Segfault in JNIHandleBlock::oops_do()
Patch112: jdk8241296-jnihandleblock_segfault.patch Patch112: jdk8241296-jnihandleblock_segfault.patch
Patch113: jdk8244461-remove_unused_sysctl.h.patch
############################################# #############################################
# #
@ -1570,6 +1571,7 @@ sh %{SOURCE12}
%patch110 %patch110
%patch111 %patch111
%patch112 %patch112
%patch113
# RPM-only fixes # RPM-only fixes
%patch539 %patch539
@ -2234,6 +2236,10 @@ require "copy_jdk_configs.lua"
%endif %endif
%changelog %changelog
* Tue May 05 2020 Severin Gehwolf <sgehwolf@redhat.com> - 1:1.8.0.242.b08-4
- Add patch for JDK-8244461 so as to fix sys/sysctl.h removal
in upcoming glibc 2.32
* Tue Mar 24 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.242.b08-3 * Tue Mar 24 2020 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.242.b08-3
- Introduce stapinstall variable to set SystemTap arch directory correctly (e.g. arm64 on aarch64) - Introduce stapinstall variable to set SystemTap arch directory correctly (e.g. arm64 on aarch64)
- Include support for noarch for when koji creates source RPMs - Include support for noarch for when koji creates source RPMs

22
jdk8244461-remove_unused_sysctl.h.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/src/solaris/native/java/net/PlainDatagramSocketImpl.c
--- openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -41,7 +41,6 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
#include <sys/utsname.h>
#include <netinet/ip.h>
diff --git a/src/solaris/native/java/net/PlainSocketImpl.c b/src/solaris/native/java/net/PlainSocketImpl.c
--- openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+++ openjdk/jdk/src/solaris/native/java/net/PlainSocketImpl.c
@@ -43,7 +43,6 @@
#endif
#ifdef __linux__
#include <unistd.h>
-#include <sys/sysctl.h>
#endif
#include "jvm.h"