Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion dev-support/docker/Dockerfile_rockylinux_8
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ RUN yum update -y \
&& yum install -y python3 \
&& yum install -y $(pkg-resolver/resolve.py rockylinux:8)

RUN update-alternatives --set java java-17-openjdk.x86_64

RUN dnf --enablerepo=powertools install -y \
doxygen \
snappy-devel \
Expand Down Expand Up @@ -85,8 +87,14 @@ ENV INFOPATH="${GCC_HOME}/root/usr/share/info"
######
ENV MAVEN_HOME=/opt/maven
ENV PATH="${PATH}:${MAVEN_HOME}/bin"

# jenkins.sh sets --java-home to a path with an "-amd64" suffix, which doesn't
# exist on Rocky. Fake it with symlinks.
RUN ln -s /usr/lib/jvm/java-17-openjdk /usr/lib/jvm/java-17-openjdk-amd64
RUN ln -s /usr/lib/jvm/java-21-openjdk /usr/lib/jvm/java-21-openjdk-amd64

# JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003)
ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk

#######
# Set env vars for SpotBugs
Expand Down
4 changes: 4 additions & 0 deletions dev-support/docker/pkg-resolver/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@
"temurin-17-jdk",
"openjdk-25-jdk"
],
"rockylinux:8": [
"java-17-openjdk-devel",
"java-21-openjdk-devel"
],
"ubuntu:focal": [
"temurin-25-jdk",
"openjdk-8-jdk",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,18 @@ jthrowable newIOException(JNIEnv* env, const char *fmt, ...)

const char* terror(int errnum)
{
// MT-Safe under Solaris or glibc >= 2.32 not supporting sys_errlist/sys_nerr
#if defined(__sun)
#define USE_STR_ERROR
#elif defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 32)
#define USE_STR_ERROR
/* STD_ERROR is the new standard. Alpine musc does not want to be 'detected' it want to be pure and modern. Thus we detect the old glib and handle. */
#ifdef __GLIBC__
#if defined(__GLIBC_PREREQ)
#if __GLIBC_PREREQ(2, 32)
#define USE_STR_ERROR
#endif
#endif
#else
#define USE_STR_ERROR
#endif


#if defined(USE_STR_ERROR)
return strerror(errnum);
Comment on lines -113 to 126
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we overlapping with:
#8151

@edwardcapriolo can you check once?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Edward's PR is what made me first notice this problem. I had temporarily included it here just so Yetus would trigger a native code patch run. I'm going to commit #8151 separately.

#else
Expand Down