Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rebump JNA with LIBFFI_TMPDIR #443

Merged
merged 5 commits into from Sep 26, 2023
Merged

Rebump JNA with LIBFFI_TMPDIR #443

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ffcb66d
Revert "Revert "Bump JNA to enable aarch64 support (#410)" (#442)"
wi11dey Sep 14, 2023
e82399d
Set LIBFFI_TMPDIR
wi11dey Sep 14, 2023
417c892
Also add TMPDIR
wi11dey Sep 14, 2023
eaaecb7
Fail with exception rather than segfault on noexec
wi11dey Sep 14, 2023
3c64de2
jna 5.13 lib
wi11dey Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/cassandra.in.sh
View file
Open in desktop
Expand Up @@ -99,6 +99,7 @@ JAVA_OPTS="$JAVA_OPTS:-Djava.library.path=$CASSANDRA_HOME/lib/sigar-bin"
CASSANDRA_TEMP_DIR=$SERVICE_HOME/var/data/tmp
JVM_OPTS="${JVM_OPTS} -Djava.io.tmpdir=$CASSANDRA_TEMP_DIR"
JVM_OPTS="${JVM_OPTS} -Djna.tmpdir=$CASSANDRA_TEMP_DIR"
export LIBFFI_TMPDIR="$CASSANDRA_TEMP_DIR"
wi11dey marked this conversation as resolved.
Show resolved Hide resolved

# parse the jvm options files and add them to JVM_OPTS
JVM_OPTS_FILE=$CASSANDRA_CONF/jvm${jvmoptions_variant:--clients}.options
Expand Down
2 changes: 1 addition & 1 deletion build.xml
View file
Open in desktop
Expand Up @@ -416,7 +416,7 @@
<exclusion groupId="hsqldb" artifactId="hsqldb"/> <!-- outdated version -->
<exclusion groupId="antlr" artifactId="antlr"/> <!-- outdated version -->
</dependency>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="4.0.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="5.8.0"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be at least 5.10.0 to pick up the fix java-native-access/jna#1378

Suggested change
<dependency groupId="net.java.dev.jna" artifactId="jna" version="5.8.0"/>
<dependency groupId="net.java.dev.jna" artifactId="jna" version="5.13.0"/>

Copy link
Contributor

Choose a reason for hiding this comment

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

I would support using 5.13, as that's what's used on Cassandra trunk https://github.com/apache/cassandra/blob/830f88d4ab2aaa1f7b88b90747a808d0a4e2a708/.build/parent-pom-template.xml#L548


<dependency groupId="net.sourceforge.cobertura" artifactId="cobertura" version="${cobertura.version}">
<exclusion groupId="xerces" artifactId="xercesImpl"/>
Expand Down
Binary file removed lib/jna-4.0.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/jna-5.8.0.jar
View file
Open in desktop
Binary file not shown.
0 lib/licenses/jna-4.0.0.txt → lib/licenses/jna-5.8.0.txt
View file
Open in desktop
File renamed without changes.