From 6b6814f149cccfb4ae7f34fbfd317560b6cd98ca Mon Sep 17 00:00:00 2001 From: James Knight Date: Tue, 25 Apr 2023 00:33:52 -0400 Subject: [PATCH] package/libcurl: drop override of LD_LIBRARY_PATH A previous commit [1] (libcurl 7.19.2) configured `LD_LIBRARY_PATH` to prevent cross-compiling errors when target == host; however, such an override is no longer needed [2][3] (libcurl 7.37, 7.74) and causes build errors in some environments. Dropping the override. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15181 [1]: a51ce3194923430fc229fc2ad98b12795b5a1876 [2]: https://github.com/curl/curl/commit/e48a821ed580cd2897b3e1b0bc88ca9245ac234c [3]: https://github.com/curl/curl/commit/6f3369bbcf9d0ebdaa5d141f8ca446448c24494c Signed-off-by: James Knight Signed-off-by: Yann E. MORIN --- package/libcurl/libcurl.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 1a1594a45e..dd715c1bb6 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -56,11 +56,6 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib LIBCURL_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else