Date: Sat, 17 Mar 2018 09:04:44 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464769 - head/mail/rspamd/files Message-ID: <201803170904.w2H94iZM008755@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Sat Mar 17 09:04:44 2018 New Revision: 464769 URL: https://svnweb.freebsd.org/changeset/ports/464769 Log: - Unbreak patch Submitted by: Anton Yuzhaninov <citrin+pr@citrin.ru> via private email Modified: head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt Modified: head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt ============================================================================== --- head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt Sat Mar 17 09:04:13 2018 (r464768) +++ head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt Sat Mar 17 09:04:44 2018 (r464769) @@ -1,6 +1,6 @@ --- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC +++ contrib/torch/torch7/lib/TH/CMakeLists.txt -@@ -230,22 +230,28 @@ ELSE() +@@ -230,22 +230,26 @@ ELSE() ENDIF() ENDIF() @@ -15,56 +15,8 @@ - ENDIF() -ENDIF(BLAS_FOUND) +IF(WITH_BLAS) -+ MESSAGE(STATUS "XXXC: will find BLAS") + FIND_PACKAGE(BLAS) + IF(BLAS_FOUND) -+ MESSAGE(STATUS "XXXC: BLAS was found") -+ SET(USE_BLAS 1) -+ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -+ IF(BLAS_INFO STREQUAL "mkl") -+ ADD_DEFINITIONS(-DTH_BLAS_MKL) -+ ELSEIF(BLAS_INFO STREQUAL "open") -+ ADD_DEFINITIONS(-DTH_BLAS_OPEN) -+ ENDIF() -+ ENDIF(BLAS_FOUND) -+ENDIF(WITH_BLAS) - --FIND_PACKAGE(LAPACK) --IF(LAPACK_FOUND) -- SET(USE_LAPACK 1) -- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) --ENDIF(LAPACK_FOUND) -+IF(WITH_LAPACK) -+ FIND_PACKAGE(LAPACK) -+ IF(LAPACK_FOUND) -+ SET(USE_LAPACK 1) -+ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) -+ ENDIF(LAPACK_FOUND) -+ENDIF(WITH_LAPACK) - - IF (UNIX AND NOT APPLE) - INCLUDE(CheckLibraryExists) ---- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC -+++ contrib/torch/torch7/lib/TH/CMakeLists.txt -@@ -230,22 +230,28 @@ ELSE() - ENDIF() - ENDIF() - --FIND_PACKAGE(BLAS) --IF(BLAS_FOUND) -- SET(USE_BLAS 1) -- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -- IF(BLAS_INFO STREQUAL "mkl") -- ADD_DEFINITIONS(-DTH_BLAS_MKL) -- ELSEIF(BLAS_INFO STREQUAL "open") -- ADD_DEFINITIONS(-DTH_BLAS_OPEN) -- ENDIF() --ENDIF(BLAS_FOUND) -+IF(WITH_BLAS) -+ MESSAGE(STATUS "XXXC: will find BLAS") -+ FIND_PACKAGE(BLAS) -+ IF(BLAS_FOUND) -+ MESSAGE(STATUS "XXXC: BLAS was found") + SET(USE_BLAS 1) + TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) + IF(BLAS_INFO STREQUAL "mkl")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803170904.w2H94iZM008755>