Skip to content

Commit df429c5

Browse files
committed
Remove -lz on Windows
1 parent a1652cc commit df429c5

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: openssl
22
Type: Package
33
Title: Toolkit for Encryption, Signatures and Certificates Based on OpenSSL
4-
Version: 2.3.1
4+
Version: 2.3.2
55
Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "[email protected]",
66
comment = c(ORCID = "0000-0002-4035-0289")),
77
person("Oliver", "Keyes", role = "ctb"))

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
2.3.2
22
- Remove R_unload_openssl() as it may interfere with other packages
3+
- Fix Windows build on compilers without zlib
34

45
2.3.1
56
- Fix case base64_decode(NA) for libssl 3.4.0 (#130)

src/Makevars.win

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ else
88
RWINLIB = ../windows/libssl
99
TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)
1010
OPENSSL_CFLAGS = -I$(RWINLIB)/include
11-
OPENSSL_LIBS = -L$(RWINLIB)/$(TARGET) -L$(RWINLIB)/lib -lssl -lcrypto -lz -lws2_32 -lgdi32 -lcrypt32
11+
OPENSSL_LIBS = -L$(RWINLIB)/$(TARGET) -L$(RWINLIB)/lib -lssl -lcrypto -lws2_32 -lgdi32 -lcrypt32
1212
endif
1313

1414
STATLIB = bcrypt/libstatbcrypt.a

0 commit comments

Comments
 (0)