Date: Tue, 9 Jul 2013 21:36:23 +0000 (UTC) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322583 - head/chinese/fcitx/files Message-ID: <201307092136.r69LaN5t051861@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Tue Jul 9 21:36:23 2013 New Revision: 322583 URL: http://svnweb.freebsd.org/changeset/ports/322583 Log: Add patch fixing the behavior of FindLibkvm.cmake to prepare for CMake 2.8.11.2. CMake >= 2.8.11 includes a bug fix [1] that ends up showing a problem with the current FindLibkvm.cmake that makes the port fail to build. Apply my upstream fix [2] to make everything work across all CMake versions. [1] http://public.kitware.com/Bug/view.php?id=13755 [2] https://github.com/fcitx/fcitx/pull/119 Approved by: portmgr (bapt) Added: head/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake (contents, props changed) Added: head/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/chinese/fcitx/files/patch-cmake_modules_FindLibkvm.cmake Tue Jul 9 21:36:23 2013 (r322583) @@ -0,0 +1,34 @@ +diff --git a/cmake/FindLibkvm.cmake b/cmake/FindLibkvm.cmake +index a66b85d..4453fd4 100644 +--- cmake/FindLibkvm.cmake ++++ cmake/FindLibkvm.cmake +@@ -5,23 +5,11 @@ + # LIBKVM_INCLUDE_DIR - Libkvm include directory + # LIBKVM_LIBRARIES - Libraries needed to use Libkvm + # +- +-if(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND) +- set(Libkvm_FIND_QUIETLY TRUE) +-endif(LIBKVM_INCLUDE_DIR AND LIBKVM_FOUND) +- ++ + find_path(LIBKVM_INCLUDE_DIR kvm.h) +- +-set(LIBKVM_FOUND FALSE) +- +-if(LIBKVM_INCLUDE_DIR) +- find_library(LIBKVM_LIBRARIES NAMES kvm) +- if(LIBKVM_LIBRARIES) +- set(LIBKVM_FOUND TRUE) +- endif(LIBKVM_LIBRARIES) +-endif(LIBKVM_INCLUDE_DIR) +- ++find_library(LIBKVM_LIBRARIES NAMES kvm) ++ + include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(Libkvm DEFAULT_MSG LIBKVM_INCLUDE_DIR LIBKVM_FOUND) +- +-mark_as_advanced(LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES LIBKVM_LIBC_HAS_KVM_OPEN LIBKVM_FOUND) ++find_package_handle_standard_args(Libkvm DEFAULT_MSG LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES) ++ ++mark_as_advanced(LIBKVM_INCLUDE_DIR LIBKVM_LIBRARIES)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307092136.r69LaN5t051861>