node-datachannel 0.3.5 → 0.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -11,31 +11,27 @@ env:
|
|
|
11
11
|
|
|
12
12
|
jobs:
|
|
13
13
|
build-macos:
|
|
14
|
-
runs-on: macos-
|
|
14
|
+
runs-on: macos-latest
|
|
15
15
|
strategy:
|
|
16
16
|
matrix:
|
|
17
|
-
node-version: [ 16.x]
|
|
17
|
+
node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x]
|
|
18
18
|
|
|
19
19
|
steps:
|
|
20
|
-
- uses: actions/checkout@
|
|
20
|
+
- uses: actions/checkout@v3
|
|
21
21
|
- name: Install OpenSSL
|
|
22
|
-
run:
|
|
22
|
+
run: |
|
|
23
|
+
wget https://mac.r-project.org/bin/darwin20/arm64/openssl-1.1.1o-darwin.20-arm64.tar.xz
|
|
24
|
+
tar -xf openssl-1.1.1o-darwin.20-arm64.tar.xz -C /tmp
|
|
25
|
+
rm -rf openssl-1.1.1o-darwin.20-arm64.tar.xz
|
|
23
26
|
- name: Use Node.js ${{ matrix.node-version }}
|
|
24
|
-
uses: actions/setup-node@
|
|
27
|
+
uses: actions/setup-node@v3
|
|
25
28
|
with:
|
|
26
29
|
node-version: ${{ matrix.node-version }}
|
|
27
|
-
architecture: x64
|
|
28
30
|
- name: Build
|
|
29
|
-
run:
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
OPENSSL_ROOT_DIR: /usr/local/opt/openssl
|
|
33
|
-
OPENSSL_LIBRARIES: /usr/local/opt/openssl/lib
|
|
34
|
-
- name: Test
|
|
35
|
-
run: npm run test
|
|
36
|
-
env:
|
|
37
|
-
CI: true
|
|
38
|
-
- name: Upload
|
|
39
|
-
run: node_modules/.bin/prebuild --upload -u ${{ secrets.GITHUB_TOKEN }}
|
|
31
|
+
run: |
|
|
32
|
+
npm install --ignore-scripts
|
|
33
|
+
node_modules/.bin/prebuild --backend cmake-js --arch arm64 --upload -u ${{ secrets.GITHUB_TOKEN }} -- --CDCMAKE_OSX_ARCHITECTURES="arm64"
|
|
40
34
|
env:
|
|
41
35
|
CI: true
|
|
36
|
+
OPENSSL_ROOT_DIR: /tmp/opt/R/arm64
|
|
37
|
+
OPENSSL_LIBRARIES: /tmp/opt/R/arm64/lib
|
package/CMakeLists.txt
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
cmake_minimum_required(VERSION 3.15)
|
|
2
2
|
cmake_policy(SET CMP0091 NEW)
|
|
3
|
-
project(node_datachannel VERSION 0.3.
|
|
3
|
+
project(node_datachannel VERSION 0.3.6)
|
|
4
4
|
|
|
5
5
|
# Workaround for https://github.com/murat-dogan/node-datachannel/issues/65
|
|
6
6
|
if( NODE_RUNTIMEVERSION VERSION_GREATER_EQUAL "17.0.0")
|
|
@@ -17,13 +17,18 @@ if(WIN32)
|
|
|
17
17
|
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
|
|
18
18
|
endif()
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
20
|
+
if(APPLE)
|
|
21
|
+
set(OPENSSL_USE_STATIC_LIBS TRUE)
|
|
22
|
+
find_package(OpenSSL REQUIRED)
|
|
23
|
+
elseif(UNIX)
|
|
24
|
+
# Got linker error for arm64
|
|
25
|
+
# /usr/lib/gcc-cross/aarch64-linux-gnu/9/../../../../aarch64-linux-gnu/bin/ld: ../sysroot/usr/lib/aarch64-linux-gnu/libcrypto.a(sha1-armv8.o): relocation R_AARCH64_PREL64 against symbol `OPENSSL_armcap_P' which may bind externally can not be used when making a shared object; recompile with -fPIC
|
|
26
|
+
# ../sysroot/usr/lib/aarch64-linux-gnu/libcrypto.a(sha1-armv8.o): in function `sha1_block_armv8':
|
|
27
|
+
# (.text+0x1240): dangerous relocation: unsupported relocation
|
|
28
|
+
if(NOT ${NODE_ARCH} STREQUAL "arm64")
|
|
29
|
+
set(OPENSSL_USE_STATIC_LIBS TRUE)
|
|
30
|
+
find_package(OpenSSL REQUIRED)
|
|
31
|
+
endif()
|
|
27
32
|
endif()
|
|
28
33
|
|
|
29
34
|
|
|
@@ -81,8 +86,7 @@ set(LINK_LIBRARIES
|
|
|
81
86
|
)
|
|
82
87
|
|
|
83
88
|
if(APPLE)
|
|
84
|
-
|
|
85
|
-
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_LINK_FLAGS} -arch x86_64 -arch arm64 ")
|
|
89
|
+
#
|
|
86
90
|
elseif(UNIX)
|
|
87
91
|
list(APPEND LINK_LIBRARIES -static-libgcc -static-libstdc++)
|
|
88
92
|
endif()
|
package/README.md
CHANGED
|
@@ -20,18 +20,18 @@ npm install node-datachannel
|
|
|
20
20
|
|
|
21
21
|
## Supported Platforms
|
|
22
22
|
|
|
23
|
-
| | Linux-x64 | Linux-armv7 | Linux-arm64(1) | Windows-x86 | Windows-x64 | Mac |
|
|
24
|
-
|
|
25
|
-
| Node V10 | + | + | + | + | + |
|
|
26
|
-
| Node V11 | + | + | + | + | + |
|
|
27
|
-
| Node V12 | + | + | + | + | + |
|
|
28
|
-
| Node V13 | + | + | + | + | + |
|
|
29
|
-
| Node V14 | + | + | + | + | + |
|
|
30
|
-
| Node V15 | + | + | + | + | + |
|
|
31
|
-
| Node V16 | + | + | + | + | + |
|
|
32
|
-
| Node V17 | + | + | + | + | + |
|
|
33
|
-
|
|
34
|
-
1) Please note that; For arm64 platform we need OpenSSL to be installed locally.
|
|
23
|
+
| | Linux-x64 | Linux-armv7 | Linux-arm64(1) | Windows-x86 | Windows-x64 | Mac (M1 + x64) |
|
|
24
|
+
|----------|:---------:|:-----------:|:----------------:|:-----------:|:-----------:|:--------------:|
|
|
25
|
+
| Node V10 | + | + | + | + | + | + |
|
|
26
|
+
| Node V11 | + | + | + | + | + | + |
|
|
27
|
+
| Node V12 | + | + | + | + | + | + |
|
|
28
|
+
| Node V13 | + | + | + | + | + | + |
|
|
29
|
+
| Node V14 | + | + | + | + | + | + |
|
|
30
|
+
| Node V15 | + | + | + | + | + | + |
|
|
31
|
+
| Node V16 | + | + | + | + | + | + |
|
|
32
|
+
| Node V17 | + | + | + | + | + | + |
|
|
33
|
+
|
|
34
|
+
1) Please note that; For Linux-arm64 platform we need OpenSSL to be installed locally.
|
|
35
35
|
|
|
36
36
|
|
|
37
37
|
## Example Usage
|