diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
| commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
| tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-p2p/fms/files | |
| parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) | |
gentoo resync : 24.12.2018
Diffstat (limited to 'net-p2p/fms/files')
| -rw-r--r-- | net-p2p/fms/files/fms | 3 | ||||
| -rw-r--r-- | net-p2p/fms/files/fms-use-system-libs4.patch | 40 |
2 files changed, 42 insertions, 1 deletions
diff --git a/net-p2p/fms/files/fms b/net-p2p/fms/files/fms index 07f1a0551637..d98f3b29e4a8 100644 --- a/net-p2p/fms/files/fms +++ b/net-p2p/fms/files/fms @@ -1,6 +1,7 @@ #!/sbin/openrc-run -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms,v 1.4 2010/03/31 19:19:27 tommy Exp $ # Check for OpenRC/Baselayout 2 - see bug #270646 is_openrc() { diff --git a/net-p2p/fms/files/fms-use-system-libs4.patch b/net-p2p/fms/files/fms-use-system-libs4.patch new file mode 100644 index 000000000000..fc017ce0023b --- /dev/null +++ b/net-p2p/fms/files/fms-use-system-libs4.patch @@ -0,0 +1,40 @@ +--- /CMakeLists.txt 2016-06-04 22:18:20.000000000 +0200 ++++ /CMakeLists.txt.new 2018-11-25 14:05:45.000000000 +0100 +@@ -373,11 +373,17 @@ + ENDIF(AUDIO_CAPTCHA) + + IF(FROST_SUPPORT OR FCP_SSL_SUPPORT) +- ADD_SUBDIRECTORY(libs/mbedtls) +- TARGET_LINK_LIBRARIES(fms mbedtls) +- TARGET_LINK_LIBRARIES(fms mbedcrypto) +- TARGET_LINK_LIBRARIES(fms mbedx509) +- INCLUDE_DIRECTORIES(libs/mbedtls/include) ++ FIND_LIBRARY(MBEDTLS_LIBRARY NAMES mbedtls ) ++ FIND_LIBRARY(MBEDCRYPTO_LIBRARY NAMES mbedcrypto mbedx509) ++ FIND_LIBRARY(MBEDX509_LIBRARY NAMES mbedx509) ++ ++ IF(MBEDTLS_LIBRARY) ++ TARGET_LINK_LIBRARIES(fms ${MBEDTLS_LIBRARY}) ++ TARGET_LINK_LIBRARIES(fms ${MBEDCRYPTO_LIBRARY}) ++ TARGET_LINK_LIBRARIES(fms ${MBEDX509_LIBRARY}) ++ ELSE(MBEDTLS_LIBRARY) ++ MESSAGE(FATAL ERROR: "Could not find mbedtls library.") ++ ENDIF(MBEDTLS_LIBRARY) + + IF(FROST_SUPPORT) + ADD_DEFINITIONS(-DFROST_SUPPORT) +@@ -405,3 +411,14 @@ + IF(BUILD_PLUGIN) + ADD_SUBDIRECTORY(plugin) + ENDIF(BUILD_PLUGIN) ++ ++MESSAGE(STATUS "<<< Gentoo configuration >>> ++Build type ${CMAKE_BUILD_TYPE} ++Install path ${CMAKE_INSTALL_PREFIX} ++Compiler flags: ++C ${CMAKE_C_FLAGS} ++C++ ${CMAKE_CXX_FLAGS} ++Linker flags: ++Executable ${CMAKE_EXE_LINKER_FLAGS} ++Module ${CMAKE_MODULE_LINKER_FLAGS} ++Shared ${CMAKE_SHARED_LINKER_FLAGS}\n") |