Merge pull request #187 from openzim/libzim-9.5.1

Use libzim 9.5.1

Author: benoit74

.env

@@ -1 +1 @@
-LIBZIM_VERSION=9.4.0
+LIBZIM_VERSION=9.5.1

Changelog

@@ -1,4 +1,6 @@
 Unreleased
+* NEW: Use libzim 9.5.1
+* FIX: Fix lib directories for aarch64
 
 4.0.0
 * NEW: Use libzim 9.4.0

binding.gyp

@@ -34,8 +34,8 @@
                 ],
                 "libraries": [
                   "-Wl,-rpath,'$$ORIGIN'",
-                  "-L<(libzim_dir)/lib/aarch64-rpi3-linux-gnu",
-                  "<(libzim_dir)/lib/aarch64-rpi3-linux-gnu/libzim.so.9",
+                  "-L<(libzim_dir)/lib64",
+                  "<(libzim_dir)/lib64/libzim.so.9",
                 ],
               }],
               ["libzim_local!='true' and OS=='linux' and target_arch=='arm'", {

bundle-libzim.js

@@ -19,15 +19,15 @@ if (isLinux) {
   const rawArch = os.arch();
   let libDir;
   if (rawArch === "arm64") {
-    libDir = "aarch64-rpi3-linux-gnu";
+    libDir = "lib64";
   } else if (rawArch === "arm") {
-    libDir = "arm-linux-gnueabihf";
+    libDir = "lib/arm-linux-gnueabihf";
   } else {
-    libDir = "x86_64-linux-gnu";
+    libDir = "lib/x86_64-linux-gnu";
   }
 
   console.info(`Copying libzim.so.9 from ${libDir} to build folder`);
-  exec(`cp download/lib/${libDir}/libzim.so.9 build/Release/libzim.so.9`);
+  exec(`cp download/${libDir}/libzim.so.9 build/Release/libzim.so.9`);
   exec("ln -sf build/Release/libzim.so.9 build/Release/libzim.so"); // convenience only, not required
 }
 if (isMacOS) {