Skip to content

cmake: improve OpenLDAP builds#12024

Closed
vszakats wants to merge 4 commits intocurl:masterfrom
vszakats:cmake-ldap-more
Closed

cmake: improve OpenLDAP builds#12024
vszakats wants to merge 4 commits intocurl:masterfrom
vszakats:cmake-ldap-more

Conversation

@vszakats
Copy link
Member

@vszakats vszakats commented Oct 3, 2023

  • cmake: detect OpenLDAP based on function ldap_init_fd.
    autotools does this. autotools also publishes this detection result
    in HAVE_LDAP_INIT_FD. We don't mimic that with CMake as the source
    doesn't use this value. (it might need to be remove-listed in
    scripts/cmp-config.pl for future OpenLDAP test builds.)
    This also deletes existing self-declaration method via the
    CMake-specific CURL_USE_OPENLDAP configuration.

  • cmake: define LDAP_DEPRECATED=1 for OpenLDAP.
    Like autotools does. This fixes a long list of these warnings:

    /usr/local/opt/openldap/include/ldap.h:1049:5: warning: 'LDAP_DEPRECATED' is not defined, evaluates to 0 [-Wundef]
    
  • cmake: delete LDAP TODO comment no longer relevant.

Also:

  • autotools: replace domain name dummy with 0.0.0.0 in LDAP feature
    detection functions.

Ref: #11964 (effort to sync cmake detections with autotools)

Closes #12024

@vszakats vszakats added build LDAP feature-window A merge of this requires an open feature window and removed feature-window A merge of this requires an open feature window labels Oct 3, 2023
To avoid warnings like this:
```
/usr/local/opt/openldap/include/ldap.h:1049:5: warning: 'LDAP_DEPRECATED' is not defined, evaluates to 0 [-Wundef]
```

autotools also does this.
@vszakats vszakats changed the title build: LDAP detection and build improvements cmake: improve OpenLDAP builds Oct 4, 2023
@vszakats vszakats closed this in 751e168 Oct 4, 2023
@vszakats vszakats deleted the cmake-ldap-more branch October 4, 2023 17:56
ligurio added a commit to ligurio/nanodata that referenced this pull request Dec 22, 2023
The commit 751e168d93b4a58f3fbbe2908c0041ae2f934329 ("cmake: improve
OpenLDAP builds") [1][2] in Curl deletes CMake option CURL_USE_OPENLDAP.

The patch relects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
ligurio added a commit to ligurio/nanodata that referenced this pull request Dec 22, 2023
The commit 751e168d93b4a58f3fbbe2908c0041ae2f934329 ("cmake: improve
OpenLDAP builds") [1][2] in Curl deletes CMake option CURL_USE_OPENLDAP.

The patch relects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
ligurio added a commit to ligurio/nanodata that referenced this pull request Dec 26, 2023
The commit 751e168d93b4a58f3fbbe2908c0041ae2f934329 ("cmake: improve
OpenLDAP builds") [1][2] in Curl deletes CMake option CURL_USE_OPENLDAP.

The patch relects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
ligurio added a commit to ligurio/nanodata that referenced this pull request Dec 26, 2023
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch relects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
ligurio added a commit to ligurio/nanodata that referenced this pull request Dec 26, 2023
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
igormunkin pushed a commit to tarantool/tarantool that referenced this pull request Dec 27, 2023
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up #9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party
ligurio added a commit to ligurio/nanodata that referenced this pull request Jan 9, 2024
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party

(cherry picked from commit 7e3dc17)
ligurio added a commit to ligurio/nanodata that referenced this pull request Jan 9, 2024
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up tarantool#9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party

(cherry picked from commit 7e3dc17)
igormunkin pushed a commit to tarantool/tarantool that referenced this pull request Jan 10, 2024
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up #9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party

(cherry picked from commit 7e3dc17)
igormunkin pushed a commit to tarantool/tarantool that referenced this pull request Jan 10, 2024
The commit "cmake: improve OpenLDAP builds" [1][2] in Curl deletes CMake
option CURL_USE_OPENLDAP.

The patch reflects this change in Tarantool's build infrastructure.

1. curl/curl@751e168
2. curl/curl#12024

Follows up #9086

NO_CHANGELOG=third_party
NO_DOC=third_party
NO_TEST=third_party

(cherry picked from commit 7e3dc17)
vszakats added a commit to vszakats/curl that referenced this pull request Feb 1, 2025
`lib/ldap.c` sets this macro in source for non-OpenLDAP with all build
systems.

Follow-up to 751e168 curl#12024
vszakats added a commit that referenced this pull request Feb 6, 2025
We set this macro to silence a warning inside `openldap.h`. With this
warning now silenced by using `-isystem`, we can drop it. Also it never
had to be set to `1`.

Also enable OpenLDAP in a CMake GHA/macos job.

Follow-up to 445fb81 #14763
Follow-up to 751e168 #12024

Closes #16146
pps83 pushed a commit to pps83/curl that referenced this pull request Apr 26, 2025
We set this macro to silence a warning inside `openldap.h`. With this
warning now silenced by using `-isystem`, we can drop it. Also it never
had to be set to `1`.

Also enable OpenLDAP in a CMake GHA/macos job.

Follow-up to 445fb81 curl#14763
Follow-up to 751e168 curl#12024

Closes curl#16146
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant