[Tarantool-patches] [PATCH] build: install curl headers

[Tarantool-patches] [PATCH] build: install curl headers

[Roman Khabibov]

Ship curl headers to system path include/tarantool.
---

Issue: https://github.com/tarantool/smtp/issues/24
Bracnh: https://github.com/tarantool/tarantool/tree/romanhabibov/curl-headers

 cmake/BuildLibCURL.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake
index 39a1d62fd..8fd063454 100644
--- a/cmake/BuildLibCURL.cmake
+++ b/cmake/BuildLibCURL.cmake
@@ -178,6 +178,11 @@ macro(curl_build)
         set(CURL_LIBRARIES ${CURL_LIBRARIES} rt)
     endif()
 
+    # Install headers.
+    install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl"
+            DESTINATION ${MODULE_FULL_INCLUDEDIR}
+            FILES_MATCHING PATTERN "*.h")
+
     unset(FOUND_ZLIB_ROOT_DIR)
     unset(FOUND_OPENSSL_ROOT_DIR)
     unset(LIBCURL_INSTALL_DIR)
-- 
2.24.3 (Apple Git-128)

Re: [Tarantool-patches] [PATCH] build: install curl headers

[Sergey Bronnikov]

Hi,

thanks for the patch!

On 22.12.2020 19:17, Roman Khabibov via Tarantool-patches wrote:
> Ship curl headers to system path include/tarantool.

1. could you add issue number to the commit message?

> ---
>
> Issue: https://github.com/tarantool/smtp/issues/24
2. looks like this patch is only a part of a task, is it so?
> Bracnh: https://github.com/tarantool/tarantool/tree/romanhabibov/curl-headers
>
>   cmake/BuildLibCURL.cmake | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/cmake/BuildLibCURL.cmake b/cmake/BuildLibCURL.cmake
> index 39a1d62fd..8fd063454 100644
> --- a/cmake/BuildLibCURL.cmake
> +++ b/cmake/BuildLibCURL.cmake
> @@ -178,6 +178,11 @@ macro(curl_build)
>           set(CURL_LIBRARIES ${CURL_LIBRARIES} rt)
>       endif()
>   
> +    # Install headers.
> +    install(DIRECTORY "${CURL_INCLUDE_DIRS}/curl"
> +            DESTINATION ${MODULE_FULL_INCLUDEDIR}
> +            FILES_MATCHING PATTERN "*.h")
> +
>       unset(FOUND_ZLIB_ROOT_DIR)
>       unset(FOUND_OPENSSL_ROOT_DIR)
>       unset(LIBCURL_INSTALL_DIR)


I build tarantool with custom PREFIX dirs:

cmake --install /home/s.bronnikov/work/tarantool_prefix_path \

-DCMAKE_PREFIX_PATH=/home/s.bronnikov/work/tarantool_prefix_path \

-DCMAKE_INSTALL_PREFIX=/home/s.bronnikov/work/tarantool_prefix_path ..

and it seems set of installed headers are the same as in libcurl-devel 
package:

[s.bronnikov@tarantool-core-dev-mcs1 build]$ find 
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl 
-name "*.h"
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/mprintf.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/system.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/multi.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/curl.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/urlapi.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/stdcheaders.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/curlver.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/typecheck-gcc.h
/home/s.bronnikov/work/tarantool_prefix_path/include/tarantool/curl/easy.h

[s.bronnikov@tarantool-core-dev-mcs1 build]$ rpm -ql 
libcurl-devel.x86_64 | grep "/usr/include/"
/usr/include/curl
/usr/include/curl/curl.h
/usr/include/curl/curlver.h
/usr/include/curl/easy.h
/usr/include/curl/mprintf.h
/usr/include/curl/multi.h
/usr/include/curl/stdcheaders.h
/usr/include/curl/system.h
/usr/include/curl/typecheck-gcc.h
/usr/include/curl/urlapi.h

Re: [Tarantool-patches] [PATCH] build: install curl headers

[Alexander Turenko via Tarantool-patches]

On Thu, Dec 24, 2020 at 02:28:40PM +0300, Sergey Bronnikov via Tarantool-patches wrote:
> Hi,
> 
> thanks for the patch!
> 
> On 22.12.2020 19:17, Roman Khabibov via Tarantool-patches wrote:
> > Ship curl headers to system path include/tarantool.
> 
> 1. could you add issue number to the commit message?

It is part of https://github.com/tarantool/smtp/issues/24

However I don't see SMTP enabling, that's strange. Roman?

> 
> > ---
> > 
> > Issue: https://github.com/tarantool/smtp/issues/24
> 2. looks like this patch is only a part of a task, is it so?

Yep.

> I build tarantool with custom PREFIX dirs:
> 
> cmake --install /home/s.bronnikov/work/tarantool_prefix_path \
> 
> -DCMAKE_PREFIX_PATH=/home/s.bronnikov/work/tarantool_prefix_path \
> 
> -DCMAKE_INSTALL_PREFIX=/home/s.bronnikov/work/tarantool_prefix_path ..
> 
> and it seems set of installed headers are the same as in libcurl-devel
> package:

That's expected result. We want to ship curl headers in
'/usr/include/tarantool/curl/*.h'.