diff --git a/build/curl/build.sh b/build/curl/build.sh index 6b434ccbfd..23bb7a8fb1 100755 --- a/build/curl/build.sh +++ b/build/curl/build.sh @@ -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 diff --git a/build/curl/patches/ldap.patch b/build/curl/patches/ldap.patch new file mode 100644 index 0000000000..fc0c36fdee --- /dev/null +++ b/build/curl/patches/ldap.patch @@ -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 diff --git a/build/curl/patches/series b/build/curl/patches/series index 6726658d8d..37cb3c13cc 100644 --- a/build/curl/patches/series +++ b/build/curl/patches/series @@ -1 +1,2 @@ tests.patch +ldap.patch