CVS commit: pkgsrc/devel/cmake

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Thu Apr 26 17:30:36 UTC 2018

Modified Files:
        pkgsrc/devel/cmake: Makefile distinfo
Added Files:
        pkgsrc/devel/cmake/patches: patch-Source_CMakeLists.txt

Log Message:
devel/cmake: -lcrypto should appear later in the command

This fixes PR pkg/53117.


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 pkgsrc/devel/cmake/Makefile
cvs rdiff -u -r1.117 -r1.118 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/cmake/patches/patch-Source_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/cmake/Makefile
diff -u pkgsrc/devel/cmake/Makefile:1.145 pkgsrc/devel/cmake/Makefile:1.146
--- pkgsrc/devel/cmake/Makefile:1.145   Tue Apr 17 16:28:35 2018
+++ pkgsrc/devel/cmake/Makefile Thu Apr 26 17:30:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.145 2018/04/17 16:28:35 adam Exp $
+# $NetBSD: Makefile,v 1.146 2018/04/26 17:30:36 minskim Exp $
 
 .include "Makefile.version"
 
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=      --system-libs
 # jsoncpp requires cmake to build, so use the one provided with cmake
 CONFIGURE_ARGS+=       --no-system-jsoncpp
 
-LDFLAGS+=              -lcrypto # for rhash
 LDFLAGS.Darwin+=       -framework CoreServices # for LSOpenCFURLRef()
 LDFLAGS.SunOS+=                -lsocket -lnsl
 

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.117 pkgsrc/devel/cmake/distinfo:1.118
--- pkgsrc/devel/cmake/distinfo:1.117   Tue Apr 17 16:28:35 2018
+++ pkgsrc/devel/cmake/distinfo Thu Apr 26 17:30:36 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2018/04/17 16:28:35 adam Exp $
+$NetBSD: distinfo,v 1.118 2018/04/26 17:30:36 minskim Exp $
 
 SHA1 (cmake-3.11.1.tar.gz) = 591fc2fabd44f3612676beef6e15f81fbe5417f7
 RMD160 (cmake-3.11.1.tar.gz) = 8bf925456e778b489301d8e1d5cdb1e93d4ccc5c
@@ -11,6 +11,7 @@ SHA1 (patch-Modules_FindPythonInterp.cma
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 38720e11b7b62cb702e80da19e044f070298f2db
+SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = d7baafe6612b6ac9b0542ed10ffcf90cd8d1df87
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-bootstrap) = 9d99cfe9f9ae826250f94bc297f5a22b8de09e84

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Source_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Source_CMakeLists.txt:1.1
--- /dev/null   Thu Apr 26 17:30:36 2018
+++ pkgsrc/devel/cmake/patches/patch-Source_CMakeLists.txt      Thu Apr 26 17:30:36 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-Source_CMakeLists.txt,v 1.1 2018/04/26 17:30:36 minskim Exp $
+
+librhash requires -lcrypto when statically linked.
+
+--- Source/CMakeLists.txt.orig 2018-04-17 12:28:52.000000000 +0000
++++ Source/CMakeLists.txt
+@@ -763,7 +763,7 @@ target_link_libraries(CMakeLib cmsys
+   ${CMAKE_CURL_LIBRARIES}
+   ${CMAKE_JSONCPP_LIBRARIES}
+   ${CMAKE_LIBUV_LIBRARIES}
+-  ${CMAKE_LIBRHASH_LIBRARIES}
++  ${CMAKE_LIBRHASH_LIBRARIES} -lcrypto
+   ${CMake_KWIML_LIBRARIES}
+   ${CMAKE_THREAD_LIBS_INIT}
+   )