Skip to content

Commit

Permalink
jsthemis: Fix search paths on Apple M1 (#907)
Browse files Browse the repository at this point in the history
* jsthemis: Add /opt/homebrew/lib to library paths

Homebrew on Apple M1 macs installs libraries into a different place.
We need to look for "libthemis.dylib" there.

* jsthemis: Explicitly list include directories

Turns out node plugin compiler does not add some 'standard' include
paths, let's help it. Explicitly list some paths where Themis headers
are typically installed on Linux and macOS (both Intel and M1).

* jsthemis: Bump version to 0.14.1

* jsthemis: Release notes
  • Loading branch information
ilammy committed Mar 18, 2022
1 parent 992ed62 commit ed2d062
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@
Changes that are currently in development and have not been released yet.


## [0.14.1](https://github.com/cossacklabs/themis/releases/tag/0.14.1), March 18th 2022

**Hotfix for JsThemis on Apple M1**

_Code:_

- **Node.js**

- JsThemis now works with `libthemis` installed from Homebrew on Apple M1 ([#907](https://github.com/cossacklabs/themis/pull/907)).


## [0.14.0](https://github.com/cossacklabs/themis/releases/tag/0.14.0), December 24th 2021

**TL;DR:**
Expand Down
6 changes: 6 additions & 0 deletions src/wrappers/themis/jsthemis/binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@
],
"conditions": [
[ "OS=='linux' or OS=='mac'", {
"include_dirs": [
"/opt/homebrew/include",
"/usr/local/include",
"/usr/include"
],
"libraries": [
"-L/opt/homebrew/lib",
"-L/usr/local/lib",
"-L/usr/lib",
"-lsoter",
Expand Down
5 changes: 3 additions & 2 deletions src/wrappers/themis/jsthemis/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/wrappers/themis/jsthemis/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsthemis",
"version": "0.14.0",
"version": "0.14.1",
"description": "Themis is a convenient cryptographic library for data protection.",
"main": "build/Release/jsthemis.node",
"scripts": {
Expand Down

0 comments on commit ed2d062

Please sign in to comment.