because I can't leave well enough alone

Signed-off-by: garyschulte <garyschulte@gmail.com>
hyperledger · Aug 21, 2024 · c1f910c · c1f910c
1 parent e996d8e
commit c1f910c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
           # secp256k1 dependencies
           sudo apt-get update
           sudo apt upgrade -y
-          sudo apt-get install -y autoconf build-essential libtool automake patchelf
+          sudo apt-get install -y autoconf build-essential libtool automake patchelf clang
           sudo apt autoremove -y
           # golang dependencies
           wget https://go.dev/dl/go1.22.4.linux-amd64.tar.gz

diff --git a/build.sh b/build.sh
@@ -364,7 +364,7 @@ build_constantine() {
  if [[ "$OSTYPE" == "darwin"* ]]; then
    clang -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/darwin" -shared -o "$SCRIPTDIR/constantine/build/${OSARCH}/lib/libconstantineeip196.dylib" jna_ethereum_evm_precompiles.c -Iconstantine/include -I. constantine/lib/libconstantine.a
  elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-   gcc -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -fPIC -shared -o "$SCRIPTDIR/constantine/build/${OSARCH}/lib/libconstantineeip196.so" jna_ethereum_evm_precompiles.c -Iconstantine/include -I. -Lconstantine/lib constantine/lib/libconstantine.a
+   clang -I"${JAVA_HOME}/include" -I"${JAVA_HOME}/include/linux" -fPIC -shared -o "$SCRIPTDIR/constantine/build/${OSARCH}/lib/libconstantineeip196.so" jna_ethereum_evm_precompiles.c -Iconstantine/include -I. -Lconstantine/lib constantine/lib/libconstantine.a
  else
    echo "Unsupported OS/architecture: ${OSARCH}"
    exit 1

diff --git a/constantine/build.gradle b/constantine/build.gradle
@@ -48,16 +48,6 @@ task linuxArm64LibCopy(type: Copy) {
 
 processResources.dependsOn macArmLibCopy, macLibCopy, linuxLibCopy, linuxArm64LibCopy
 
-tasks.named('test', Test) {
-    description = 'Runs the Java tests'
-    useJUnit {
-        include '**/*Test.class'
-    }
-    environment 'LD_LIBRARY_PATH', "${System.env.LD_LIBRARY_PATH}:build/resources/main/linux-gnu-x86_64"
-
-    dependsOn macArmLibCopy, macLibCopy, linuxLibCopy, linuxArm64LibCopy
-}
-
 jar {
     archiveBaseName = 'besu-native-constantine'
     includeEmptyDirs = false

diff --git a/native-build.sh b/native-build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 apt-get update
-DEBIAN_FRONTEND=non-interactive apt-get install -y autoconf build-essential libtool automake patchelf curl openjdk-21-jdk git wget
+DEBIAN_FRONTEND=non-interactive apt-get install -y autoconf build-essential libtool automake patchelf curl openjdk-21-jdk git wget clang
 export JAVA_HOME=$(dirname $(dirname $(readlink -f $(which java))))
 export PATH=$JAVA_HOME/bin:$PATH
 wget https://go.dev/dl/go1.20.2.linux-arm64.tar.gz