From 6d2604880d193c3d6a6f3180275599277d4081e5 Mon Sep 17 00:00:00 2001 From: NicJA Date: Sat, 9 Jun 2018 15:33:53 +0000 Subject: [PATCH] # Correct the needed linklibs in curl-config also. NB: This should really be fixed in curls configure script so that it doesn't add the extra "-lssl" on the tail end of the needed libraries. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@55260 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- development/libs/curl/mmakefile.src | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/development/libs/curl/mmakefile.src b/development/libs/curl/mmakefile.src index f0133b19b..1f2a88441 100644 --- a/development/libs/curl/mmakefile.src +++ b/development/libs/curl/mmakefile.src @@ -15,10 +15,10 @@ CURL_OPTIONS=--disable-shared --without-random --disable-threaded-resolver --dis %fetch_and_build_gnu_development package=curl version=$(CURL_VERSION) \ patch=yes package_repo="$(REPOSITORIES)" \ extraoptions="$(CURL_OPTIONS)" \ - postconfigure="development-curl-fixconfig" + postconfigure="development-curl-fixenv" postinstall="development-curl-fixconfig" #MM -development-curl-fixconfig : +development-curl-fixenv : for file in $(GENDIR)/$(CURDIR)/curl/lib/curl_config.h; \ do \ $(SED) -i -e 's@/\* #undef HAVE_SOCKET \*/@#define HAVE_SOCKET 1@' $$file; \ @@ -51,3 +51,10 @@ development-curl-fixconfig : do \ $(SED) -i -e 's@-lssl -lcrypto -lz -lssl@-lssl -lcrypto -lz@' $$file; \ done + +#MM +development-curl-fixconfig : + for file in $(AROS_DEVELOPER)/bin/curl-config; \ + do \ + $(SED) -i -e 's@-lssl -lcrypto -lz -lssl@-lssl -lcrypto -lz@' $$file; \ + done -- 2.11.4.GIT