Date: Mon, 27 Mar 2017 20:42:05 +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: r437084 - head/audio/amarok-kde4/files Message-ID: <201703272042.v2RKg5IM079090@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rakuco Date: Mon Mar 27 20:42:05 2017 New Revision: 437084 URL: https://svnweb.freebsd.org/changeset/ports/437084 Log: Unbreak after r436971. Ensure libloudmouth-1.so is always passed with a full path to the linker. PR: 212558 Added: head/audio/amarok-kde4/files/patch-cmake_modules_FindLoudmouth.cmake (contents, props changed) Added: head/audio/amarok-kde4/files/patch-cmake_modules_FindLoudmouth.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/amarok-kde4/files/patch-cmake_modules_FindLoudmouth.cmake Mon Mar 27 20:42:05 2017 (r437084) @@ -0,0 +1,27 @@ +Always use find_path() and find_library() to find Loudmouth so that the full +paths are always used in the compiler and linker. +--- cmake/modules/FindLoudmouth.cmake.orig 2017-03-27 19:37:41 UTC ++++ cmake/modules/FindLoudmouth.cmake +@@ -13,13 +13,6 @@ if (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH + SET(LOUDMOUTH_FOUND TRUE) + + else (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH_LIBRARIES) +- if(NOT WIN32) +- # use pkg-config to get the directories and then use these values +- # in the FIND_PATH() and FIND_LIBRARY() calls +- find_package(PkgConfig) +- PKG_SEARCH_MODULE(LOUDMOUTH loudmouth-1.0) +- +- else(NOT WIN32) + + FIND_PATH(LOUDMOUTH_INCLUDE_DIRS loudmouth/loudmouth.h /usr/local/include/loudmouth-1.0 + ${_LOUDMOUTHIncDir} +@@ -30,8 +23,6 @@ else (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOU + ${_LOUDMOUTHLinkDir} + ) + +- endif(NOT WIN32) +- + if (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH_LIBRARIES) + SET(LOUDMOUTH_FOUND TRUE) + else (LOUDMOUTH_INCLUDE_DIRS AND LOUDMOUTH_LIBRARIES)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703272042.v2RKg5IM079090>