Commit fc8b6513 authored by Shrikrishna Khare's avatar Shrikrishna Khare Committed by Facebook Github Bot

fbcode_builder: getdeps: fboss: update libcurl manifest to disable lldp

Summary:
D15683387 introduced manifest for libcurl and used cmake instead of autoconf
(rationale: having cmake build curl would make it easy as we want curl to build
on windows and macos).

if libcurl finds ldap.h, then it builds with ldap enabled.
On my devserver, ldap library is not installed, and thus libcurl builds without
it, and links with FBOSS binaries fine.

In sandbox, ldap seems to be installed, thus libcurl builds with ldap. However,
linking fails for FBOSS binaries as those don't link against ldap - FBOSS does
not depend on ldap.

Thus, we need a way to configure libcurl with ldap disabled. [cmake.defines]
CURL_DISABLE_LDAP=OFF, does not quite do it. Thus, am going with autoconf, with
args --disable-ldap for now for Linux and cmake for non-Linux environments.

Reviewed By: wez

Differential Revision: D15730947

fbshipit-source-id: 2ce48976ee785401d550720cbdccb22f9d416675
parent c9e0baad
...@@ -6,5 +6,15 @@ url = https://curl.haxx.se/download/curl-7.65.1.tar.gz ...@@ -6,5 +6,15 @@ url = https://curl.haxx.se/download/curl-7.65.1.tar.gz
sha256 = 821aeb78421375f70e55381c9ad2474bf279fc454b791b7e95fc83562951c690 sha256 = 821aeb78421375f70e55381c9ad2474bf279fc454b791b7e95fc83562951c690
[build.os=linux] [build.os=linux]
builder = autoconf
subdir = curl-7.65.1
[autoconf.args]
# fboss (which added the libcurl dep) doesn't need ldap so it is disabled here.
# if someone in the future wants to add ldap for something else, it won't hurt
# fboss. However, that would require adding an ldap manifest.
--disable-ldap
[build.not(os=linux)]
builder = cmake builder = cmake
subdir = curl-7.65.1 subdir = curl-7.65.1
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment