Skip to content

Commit 901bc8d

Browse files
committed
fix openssl
1 parent 191d9cb commit 901bc8d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

contrib/src/curl/rules.mak

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ DEPS_curl = zlib $(DEPS_zlib)
1717

1818
DEPS_curl = openssl $(DEPS_openssl)
1919

20+
ifdef HAVE_LINUX
21+
configure_option=--without-libidn --without-librtmp
22+
endif
23+
2024
.curl: curl .zlib .openssl
2125
$(RECONF)
2226
cd $< && $(HOSTVARS_PIC) ./configure $(HOSTCONF) \
2327
--with-ssl=$(PREFIX) \
2428
--with-zlib \
25-
--disable-ldap
29+
--disable-ldap \
30+
$(configure_option)
2631
# ifdef HAVE_ANDROID
2732
# $(APPLY) $(SRC)/curl/android.patch
2833
# endif

contrib/src/openssl/rules.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ endif
1818
ifdef HAVE_LINUX
1919
ifeq ($(MY_TARGET_ARCH),x86_64)
2020
OPENSSL_CONFIG_VARS="linux-x86_64"
21-
OPENSSL_ARCH=-m64
21+
OPENSSL_ARCH=-m64 -no-ssl2
2222
endif
2323

2424
ifeq ($(MY_TARGET_ARCH),i386)
2525
OPENSSL_CONFIG_VARS="linux-generic32"
26-
OPENSSL_ARCH=-m32
26+
OPENSSL_ARCH=-m32 -no-ssl2
2727
endif
2828
endif
2929

0 commit comments

Comments
 (0)