Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

curl - stop requiring an ldap.pc #3729

Merged
merged 1 commit into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/curl/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ CC+=" $CTF_CFLAGS"
init
download_source $PROG $PROG $VER
patch_source
run_autoreconf -i
prep_build autoconf -oot
build -multi
run_testsuite
Expand Down
28 changes: 28 additions & 0 deletions build/curl/patches/ldap.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

OmniOS does not have an `ldap.pc` file for pkg-config to find so don't add it
to the private requirements list in `libcurl.pc`

Reverts upstream https://github.com/curl/curl/pull/15163

diff -wpruN --no-dereference '--exclude=*.orig' a~/CMakeLists.txt a/CMakeLists.txt
--- a~/CMakeLists.txt 1970-01-01 00:00:00
+++ a/CMakeLists.txt 1970-01-01 00:00:00
@@ -1042,7 +1042,6 @@ if(NOT CURL_DISABLE_LDAP)
list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DLDAP_DEPRECATED=1")
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LDAP_LIBRARY})
set(CURL_LIBS "${LDAP_LIBRARY};${CURL_LIBS}")
- set(LIBCURL_PC_REQUIRES_PRIVATE "ldap;${LIBCURL_PC_REQUIRES_PRIVATE}")
if(HAVE_LIBLBER)
list(APPEND CMAKE_REQUIRED_LIBRARIES ${LDAP_LBER_LIBRARY})
set(CURL_LIBS "${LDAP_LBER_LIBRARY};${CURL_LIBS}")
diff -wpruN --no-dereference '--exclude=*.orig' a~/acinclude.m4 a/acinclude.m4
--- a~/acinclude.m4 1970-01-01 00:00:00
+++ a/acinclude.m4 1970-01-01 00:00:00
@@ -565,7 +565,6 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [
else
LIBS="$curl_cv_ldap_LIBS $curl_cv_save_LIBS"
fi
- LIBCURL_PC_REQUIRES_PRIVATE="ldap $LIBCURL_PC_REQUIRES_PRIVATE"
AC_MSG_RESULT([$curl_cv_ldap_LIBS])
;;
esac
1 change: 1 addition & 0 deletions build/curl/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tests.patch
ldap.patch
Loading