svn commit: r480162 - head/lang/rust/files

Jan Beich jbeich at FreeBSD.org
Thu Sep 20 10:07:38 UTC 2018


Author: jbeich
Date: Thu Sep 20 10:07:37 2018
New Revision: 480162
URL: https://svnweb.freebsd.org/changeset/ports/480162

Log:
  lang/rust: unbreak if ssl != base
  
    [ 13%] Building C object src/CMakeFiles/libssh2.dir/channel.c.o
    /usr/bin/cc -DLIBSSH2_CLEAR_MEMORY -DLIBSSH2_DH_GEX_NEW=1 -DLIBSSH2_HAVE_ZLIB=1 -DLIBSSH2_OPENSSL -I/usr/local/include -Isrc/vendor/libssh2-sys/libssh2/include -Ibuild/x86_64-unknown-freebsd/stage2-tools/x86_64-unknown-freebsd/release/build/libssh2-sys-149db94635ec1367/out/build/src  -ffunction-sections -fdata-sections -fPIC -ffunction-sections -fdata-sections -fPIC -m64 -m64 -O3 -DNDEBUG   -std=gnu90 -o CMakeFiles/libssh2.dir/channel.c.o   -c src/vendor/libssh2-sys/libssh2/src/channel.c
    src/vendor/libssh2-sys/libssh2/src/channel.c:2262:44: error: use of undeclared identifier 'LIBSSH2_ERROR_CHANNEL_WINDOW_FULL'
  	      return _libssh2_error(session, LIBSSH2_ERROR_CHANNEL_WINDOW_FULL,
  					     ^
  
  PR:		231411
  Reported by:	many
  Obtained from:	upstream (libssh2)
  Approved by:	portmgr blanket

Added:
  head/lang/rust/files/patch-src_vendor_libssh2-sys_libssh2_src_CMakeLists.txt   (contents, props changed)

Added: head/lang/rust/files/patch-src_vendor_libssh2-sys_libssh2_src_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/rust/files/patch-src_vendor_libssh2-sys_libssh2_src_CMakeLists.txt	Thu Sep 20 10:07:37 2018	(r480162)
@@ -0,0 +1,13 @@
+https://github.com/libssh2/libssh2/commit/54bef4c5dad868a9d45fdbfca9729b191c0abab5
+
+--- src/vendor/libssh2-sys/libssh2/src/CMakeLists.txt.orig	2018-09-11 04:49:50.000000000 +0000
++++ src/vendor/libssh2-sys/libssh2/src/CMakeLists.txt
+@@ -217,7 +217,7 @@ set_target_properties(libssh2 PROPERTIES PREFIX "")
+ 
+ target_compile_definitions(libssh2 PRIVATE ${PRIVATE_COMPILE_DEFINITIONS})
+ target_include_directories(libssh2
+-  PRIVATE ${PRIVATE_INCLUDE_DIRECTORIES}
++  PRIVATE "${PROJECT_SOURCE_DIR}/include/" ${PRIVATE_INCLUDE_DIRECTORIES}
+   PUBLIC
+     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+     $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>)


More information about the svn-ports-head mailing list