Skip to content

Commit c14d5c5

Browse files
kelson42benoit74
authored andcommitted
Update a bit the libdir for aarch64
1 parent 4ad3034 commit c14d5c5

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

Changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Unreleased
22
* NEW: Use libzim 9.5.1
3+
* FIX: Fix lib directories for aarch64
34

45
4.0.0
56
* NEW: Use libzim 9.4.0

binding.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
],
3535
"libraries": [
3636
"-Wl,-rpath,'$$ORIGIN'",
37-
"-L<(libzim_dir)/lib/aarch64-rpi3-linux-gnu",
38-
"<(libzim_dir)/lib/aarch64-rpi3-linux-gnu/libzim.so.9",
37+
"-L<(libzim_dir)/lib64",
38+
"<(libzim_dir)/lib64/libzim.so.9",
3939
],
4040
}],
4141
["libzim_local!='true' and OS=='linux' and target_arch=='arm'", {

bundle-libzim.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ if (isLinux) {
1919
const rawArch = os.arch();
2020
let libDir;
2121
if (rawArch === "arm64") {
22-
libDir = "aarch64-rpi3-linux-gnu";
22+
libDir = "lib64";
2323
} else if (rawArch === "arm") {
24-
libDir = "arm-linux-gnueabihf";
24+
libDir = "lib/arm-linux-gnueabihf";
2525
} else {
26-
libDir = "x86_64-linux-gnu";
26+
libDir = "lib/x86_64-linux-gnu";
2727
}
2828

2929
console.info(`Copying libzim.so.9 from ${libDir} to build folder`);
30-
exec(`cp download/lib/${libDir}/libzim.so.9 build/Release/libzim.so.9`);
30+
exec(`cp download/${libDir}/libzim.so.9 build/Release/libzim.so.9`);
3131
exec("ln -sf build/Release/libzim.so.9 build/Release/libzim.so"); // convenience only, not required
3232
}
3333
if (isMacOS) {

0 commit comments

Comments
 (0)