From owner-svn-ports-all@freebsd.org Sat Mar 17 09:04:45 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8DED0F54547; Sat, 17 Mar 2018 09:04:45 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 39E786FCFC; Sat, 17 Mar 2018 09:04:45 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34D27105F4; Sat, 17 Mar 2018 09:04:45 +0000 (UTC) (envelope-from vsevolod@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2H94itp008756; Sat, 17 Mar 2018 09:04:44 GMT (envelope-from vsevolod@FreeBSD.org) Received: (from vsevolod@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2H94iZM008755; Sat, 17 Mar 2018 09:04:44 GMT (envelope-from vsevolod@FreeBSD.org) Message-Id: <201803170904.w2H94iZM008755@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: vsevolod set sender to vsevolod@FreeBSD.org using -f From: Vsevolod Stakhov Date: Sat, 17 Mar 2018 09:04:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464769 - head/mail/rspamd/files X-SVN-Group: ports-head X-SVN-Commit-Author: vsevolod X-SVN-Commit-Paths: head/mail/rspamd/files X-SVN-Commit-Revision: 464769 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Mar 2018 09:04:45 -0000 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 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")