From 1a348d8170038738585ddbc144266251ec6c8597 Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Sat, 16 Oct 2021 19:45:37 +0200
Subject: [PATCH] Remove commented code

---
 scripts/core/install-dependencies.sh | 13 -------------
 scripts/core/setup-variables.sh      |  6 ------
 2 files changed, 19 deletions(-)

diff --git a/scripts/core/install-dependencies.sh b/scripts/core/install-dependencies.sh
index c4b3dea..d14638e 100755
--- a/scripts/core/install-dependencies.sh
+++ b/scripts/core/install-dependencies.sh
@@ -144,22 +144,9 @@ if [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
     echo "SET(JAVA_INCLUDE_PATH \"$JAVA_HOME/include\")";
     echo "SET(JAVA_AWT_INCLUDE_PATH \"$JAVA_HOME/include\")";
     echo "SET(JAVA_INCLUDE_PATH2 \"$JAVA_HOME/include/linux\")";
-    #echo "SET(JAVA_JVM_LIBRARY \"/usr/lib/jvm/java-11-openjdk-amd64/jre/lib/amd64/${JAVA_INSTALLATION_TYPE}/libjvm.so\")";
-    #echo "SET(JAVA_AWT_LIBRARY \"/usr/lib/jvm/java-11-openjdk-amd64/jre/lib/amd64/libawt.so\")";
 
-    #echo "SET(JAVA_HOME \"$CROSS_OPENJDK_PATH\")";
-    #echo "SET(JAVA_INCLUDE_PATH \"$CROSS_OPENJDK_PATH/include\")";
-    #echo "SET(JAVA_INCLUDE_PATH2 \"$CROSS_OPENJDK_PATH/include/linux\")";
     echo "SET(JAVA_JVM_LIBRARY \"$CROSS_OPENJDK_PATH/lib/${JAVA_INSTALLATION_TYPE}/libjvm.so\")";
     echo "SET(JAVA_AWT_LIBRARY \"$CROSS_OPENJDK_PATH/lib/libawt.so\")";
-    #echo "SET(JNI_INCLUDE_DIRS \"$CROSS_OPENJDK_PATH/include\" \"$CROSS_OPENJDK_PATH/include/linux\")";
-    #echo "SET(Java_JAR_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/java\")";
-    #echo "SET(Java_JAVAC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javac\")";
-    #echo "SET(Java_JAVADOC_EXECUTABLE \"$CROSS_OPENJDK_PATH/bin/javadoc\")";
-    #echo "SET(JNI_LIBRARIES \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/${JAVA_INSTALLATION_TYPE}/libjvm.so\" \"$CROSS_OPENJDK_PATH/jre/lib/${CPU_ARCH_JAVA_INTERNAL}/libawt.so\")";
-    #echo "SET(JNI_FOUND True)";
-    #echo "MESSAGE(STATUS \"JNI INCLUDE DIRS: \${JNI_INCLUDE_DIRS}\")";
-    #echo "MESSAGE(STATUS \"JNI LIBS: \${JNI_LIBRARIES}\")";
     cat <<EOF
 SET(CMAKE_SYSTEM_NAME Linux)
 
diff --git a/scripts/core/setup-variables.sh b/scripts/core/setup-variables.sh
index 8111fcb..1020f50 100755
--- a/scripts/core/setup-variables.sh
+++ b/scripts/core/setup-variables.sh
@@ -76,12 +76,6 @@ if [[ "$CORE_VARIABLES_SET" != "YES" ]]; then
   elif [[ "$OPERATING_SYSTEM_NAME" == "osx" ]]; then
     export CMAKE_EXTRA_ARGUMENTS_TDJNI="${CMAKE_EXTRA_ARGUMENTS_TDJNI} -DOPENSSL_USE_STATIC_LIBS=True"
   elif [[ "$OPERATING_SYSTEM_NAME" == "linux" ]]; then
-    #if [[ "$CPU_ARCHITECTURE_NAME" == "aarch64" ]]; then
-      #export CMAKE_EXTRA_ARGUMENTS="$CMAKE_EXTRA_ARGUMENTS"
-    #else
-      #export CMAKE_EXTRA_ARGUMENTS="$CMAKE_EXTRA_ARGUMENTS -DOPENSSL_USE_STATIC_LIBS=ON -DCMAKE_FIND_LIBRARY_SUFFIXES=\".a\""
-    #fi
-
     if [[ "$CPU_ARCHITECTURE_NAME" == "386" ]] || [[ "$CPU_ARCHITECTURE_NAME" == "armhf" ]]; then
       export CMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS -latomic"
       export LDFLAGS="$LDFLAGS -latomic"