Skip to content

Commit

Permalink
curl - stop requiring an ldap.pc
Browse files Browse the repository at this point in the history
  • Loading branch information
citrus-it committed Nov 13, 2024
1 parent 8dca799 commit 74c032e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
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

0 comments on commit 74c032e

Please sign in to comment.