Skip to content

Commit 95e071a

Browse files
committed
Excluded lmdbjava and wildfly-openssl on el7 and older
1 parent f81f50b commit 95e071a

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ lmdbjava for jdk21 and up needs `zig`.
4545

4646
# On top of that:
4747
## el9 and up
48-
Excluded wildfly8-openssl
48+
* Excluded wildfly8-openssl
4949

5050
## el7
51-
Excluded jnr-posix SpawnTest.inputFile
51+
* Excluded jnr-posix SpawnTest.inputFile
52+
* Excluded wildfly-openssl and lmdbjava
5253

5354
## ppc64le
5455
Excluded jnr-posix LinuxPOSIXTest.testMessageHdrMultipleControl

jni/lmdbjava.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
set -exo pipefail
2+
3+
if [ "x$OS_NAME" == "xrhel" -a "0$OS_VERSION_MAJOR" -le "7" ]; then
4+
echo "!skipped! rhel7 and older are to old "
5+
exit
6+
fi
7+
28
MVOPTS="--batch-mode"
39
if [ "x$EX_MVN" == "x" ] ; then
410
EX_MVN=mvn
511
fi
612

713
rm -rf lmdbjava
814

9-
if [ "x$OTOOL_OS_NAME" = "xel" -a "x$OTOOL_OS_VERSION" = "x7" ] ; then
10-
MVN="scl enable rh-maven36 -- mvn $MVOPTS"
11-
else
12-
MVN="$EX_MVN $MVOPTS"
13-
fi
15+
MVN="$EX_MVN $MVOPTS"
1416

1517
setZig() {
1618
local larch=`uname -m`

jni/wildfly-openssl.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ if [ "0$JDK_MAJOR" -eq 8 ]; then
55
echo "!skipped! older wildfly needed for jdk8"
66
exit
77
fi
8+
if [ "x$OS_NAME" == "xrhel" -a "0$OS_VERSION_MAJOR" -le "7" ]; then
9+
echo "!skipped! rhel7 and older are to old "
10+
exit
11+
fi
812

913
MVOPTS="--batch-mode"
1014
if [ "x$EX_MVN" == "x" ] ; then

0 commit comments

Comments
 (0)