Skip to content

Commit a8cf0ed

Browse files
committed
fix: do not build the prebuilt binares with c-ares as this may cause issues
Closes #280
1 parent d9e2194 commit a8cf0ed

File tree

5 files changed

+20
-10
lines changed

5 files changed

+20
-10
lines changed

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1111
### Changed
1212
### Removed
1313

14+
## [2.3.2] - 2021-03-24
15+
16+
### Changed
17+
- The prebuilt binaries are not build with c-ares anymore, for reasoning see issue [#280](https://github.com/JCMais/node-libcurl/issues/280).
18+
c-ares was included in the prebuilt binaries starting with `2.3.0`.
19+
1420
## [2.3.1] - 2021-03-09
1521

1622
The yes, `curly` is still experimental release. 😅
@@ -86,7 +92,7 @@ As `curly` is marked as experimental, this allows us to do a breaking change in
8692
- Support libcurl info `CURLINFO_PROXY_ERROR`. Use `CurlPx` for constants. Requires libcurl >= 7.73.0.
8793
- Support libcurl option `CURLOPT_SSL_EC_CURVES`. Requires libcurl >= 7.73.0.
8894
- Added prebuilt binaries for Electron v10.1
89-
- The libcurl version being used by prebuilt binaries is now 7.73.0 and it's not built with c-ares.
95+
- The libcurl version being used by prebuilt binaries is now 7.73.0 and it's now built with c-ares.
9096

9197
### Changed
9298
- `curly` now has 100% code coverage.
@@ -315,7 +321,8 @@ Special Thanks to [@koskokos2](https://github.com/koskokos2) for their contribut
315321
- Improved code style, started using prettier
316322
## [1.2.0] - 2017-08-28
317323

318-
[Unreleased]: https://github.com/JCMais/node-libcurl/compare/v2.3.0...HEAD
324+
[Unreleased]: https://github.com/JCMais/node-libcurl/compare/v2.3.2...HEAD
325+
[2.3.2]: https://github.com/JCMais/node-libcurl/compare/v2.3.1...v2.3.2
319326
[2.3.1]: https://github.com/JCMais/node-libcurl/compare/v2.3.0...v2.3.1
320327
[2.3.0]: https://github.com/JCMais/node-libcurl/compare/v2.2.0...v2.3.0
321328
[2.2.0]: https://github.com/JCMais/node-libcurl/compare/v2.1.3...v2.2.0

LIBCURL_VERSION_WIN_DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
curl-7_73_0-2
1+
curl-7_73_0-3

scripts/ci/build-libcurl.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ OPENLDAP_BUILD_FOLDER=${OPENLDAP_BUILD_FOLDER:-}
3333
LIBSSH2_BUILD_FOLDER=${LIBSSH2_BUILD_FOLDER:-}
3434
NGHTTP2_BUILD_FOLDER=${NGHTTP2_BUILD_FOLDER:-}
3535
OPENSSL_BUILD_FOLDER=${OPENSSL_BUILD_FOLDER:-}
36+
CARES_BUILD_FOLDER=${CARES_BUILD_FOLDER:-}
37+
BROTLI_BUILD_FOLDER=${BROTLI_BUILD_FOLDER:-}
3638
ZLIB_BUILD_FOLDER=${ZLIB_BUILD_FOLDER:-}
3739

3840
LIBS=${LIBS:-}

scripts/ci/build.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ GSS_LIBRARY=${GSS_LIBRARY:-kerberos}
5454
###################
5555
# Build cares
5656
###################
57-
CARES_RELEASE=${CARES_RELEASE:-$(node -e "console.log(process.versions.ares || '1.16.1')")}
58-
CARES_DEST_FOLDER=$PREFIX_DIR/deps/cares
59-
echo "Building cares v$CARES_RELEASE"
60-
./scripts/ci/build-cares.sh $CARES_RELEASE $CARES_DEST_FOLDER >/dev/null
61-
export CARES_BUILD_FOLDER=$CARES_DEST_FOLDER/build/$CARES_RELEASE
62-
ls -al $CARES_BUILD_FOLDER/lib
57+
# c-ares is disabled at the moment due to this: https://github.com/JCMais/node-libcurl/issues/280
58+
# CARES_RELEASE=${CARES_RELEASE:-$(node -e "console.log(process.versions.ares || '1.16.1')")}
59+
# CARES_DEST_FOLDER=$PREFIX_DIR/deps/cares
60+
# echo "Building cares v$CARES_RELEASE"
61+
# ./scripts/ci/build-cares.sh $CARES_RELEASE $CARES_DEST_FOLDER >/dev/null
62+
# export CARES_BUILD_FOLDER=$CARES_DEST_FOLDER/build/$CARES_RELEASE
63+
# ls -al $CARES_BUILD_FOLDER/lib
6364

6465
###################
6566
# Build libunistring

0 commit comments

Comments
 (0)