reinstate linux_{armhf,armel} naming

nativelibs4java · Nov 8, 2022 · c7fd03c · c7fd03c
1 parent 2d54678
commit c7fd03c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 5 deletions.
diff --git a/BuildNative b/BuildNative
@@ -45,9 +45,9 @@ function get_arch() {
 					;;
         arm*)
 			    if [[ -d /lib/arm-linux-gnueabihf ]] ; then
-	        	# echo "armhf"
+	        	echo "armhf"
 						# echo "arm32v7"
-						echo "arm"
+						# echo "arm"
 	        elif [[ -d /lib/arm-linux-gnueabi ]] ; then
 	        	echo "armel"
 						# echo "arm32v5"
@@ -106,7 +106,8 @@ function build_libraries() {
 	if [[ "${DEBUG:-0}" == "1" ]]; then
 		CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=Debug )
 	else
-		CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=Release )
+		CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=RelWithDebInfo )
+		# CMAKE_FLAGS+=( -DCMAKE_BUILD_TYPE=Release )
 	fi
 
 	case "$OS" in

diff --git a/src/main/java/org/bridj/Platform.java b/src/main/java/org/bridj/Platform.java
@@ -589,8 +589,13 @@ static synchronized List<String> getEmbeddedLibraryPaths(String name) {
         if (os != null) {
             List<String> archs = new ArrayList<String>();
             if (isArm()) {
-                // Note: to discriminate between hard-float (armhf) and soft-float (armel), we used to test new File("/lib/arm-linux-gnueabihf").isDirectory().
-                archs.add(is64Bits() ? "arm64" : "arm");
+                // Note: to discriminate between hard-float (armhf) and soft-float (armel), we used to test .
+                archs.add(
+                    is64Bits()
+                        ? "arm64" :
+                    new File("/lib/arm-linux-gnueabihf").isDirectory()
+                        ? "armhf" :
+                    "armel");
             } else if (isSparc()) {
                 archs.add(is64Bits() ? "sparc64" : "sparc");
             } else {

diff --git a/src/main/resources/org/bridj/lib/linux_armel/libbridj.so b/src/main/resources/org/bridj/lib/linux_armel/libbridj.so
diff --git a/...urces/org/bridj/lib/linux_arm/libbridj.so → ...ces/org/bridj/lib/linux_armhf/libbridj.so b/...urces/org/bridj/lib/linux_arm/libbridj.so → ...ces/org/bridj/lib/linux_armhf/libbridj.so
diff --git a/src/test/resources/org/bridj/lib/linux_armel/libdependsOnTest.so b/src/test/resources/org/bridj/lib/linux_armel/libdependsOnTest.so
diff --git a/src/test/resources/org/bridj/lib/linux_armel/libtest.so b/src/test/resources/org/bridj/lib/linux_armel/libtest.so
diff --git a/...g/bridj/lib/linux_arm/libdependsOnTest.so → ...bridj/lib/linux_armhf/libdependsOnTest.so b/...g/bridj/lib/linux_arm/libdependsOnTest.so → ...bridj/lib/linux_armhf/libdependsOnTest.so
diff --git a/...ources/org/bridj/lib/linux_arm/libtest.so → ...rces/org/bridj/lib/linux_armhf/libtest.so b/...ources/org/bridj/lib/linux_arm/libtest.so → ...rces/org/bridj/lib/linux_armhf/libtest.so