diff options
| author |   Thomas Sachau <tommy@gentoo.org> | 2017-01-12 18:46:23 +0100 |
|---|---|---|
| committer | Thomas Sachau <tommy@gentoo.org> | 2017-01-12 18:46:23 +0100 |
| commit | b4b64a7f95944638c36228267b2743d5bb7614c7 (patch) | |
| tree | fac00fecb65ac50af37199d9a111d0ab078fb9d3 /net-p2p/fms/files | |
| parent | sys-block/targetcli-fb: version bump to 2.1.45 (diff) | |
| download | gentoo-b4b64a7f95944638c36228267b2743d5bb7614c7.tar.gz gentoo-b4b64a7f95944638c36228267b2743d5bb7614c7.tar.bz2 gentoo-b4b64a7f95944638c36228267b2743d5bb7614c7.zip | |
Version bump, drop old
Package-Manager: portage-2.2.27
Diffstat (limited to 'net-p2p/fms/files')
| -rw-r--r-- | net-p2p/fms/files/fms-use-system-libs2.patch | 22 | ||||
| -rw-r--r-- | net-p2p/fms/files/fms-use-system-libs3.patch | 41 |
2 files changed, 41 insertions, 22 deletions
diff --git a/net-p2p/fms/files/fms-use-system-libs2.patch b/net-p2p/fms/files/fms-use-system-libs2.patch deleted file mode 100644 index 39e62e341794..000000000000 --- a/net-p2p/fms/files/fms-use-system-libs2.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt 2012-03-04 13:01:24.000000000 +0100 -+++ CMakeLists.txt.new 2012-03-08 22:14:27.000000000 +0100 -@@ -353,9 +353,16 @@ - ENDIF(AUDIO_CAPTCHA)
-
- IF(FROST_SUPPORT)
-- ADD_SUBDIRECTORY(libs/polarssl)
-- TARGET_LINK_LIBRARIES(fms polarssl)
-- INCLUDE_DIRECTORIES(libs/polarssl/include)
-+
-+ FIND_LIBRARY(POLARSSL_LIBRARY NAMES polarssl libpolarssl)
-+
-+ IF(POLARSSL_LIBRARY)
-+ TARGET_LINK_LIBRARIES(fms ${POLARSSL_LIBRARY})
-+ ELSE(POLARSSL_LIBRARY)
-+ ADD_SUBDIRECTORY(libs/polarssl)
-+ TARGET_LINK_LIBRARIES(fms polarssl)
-+ INCLUDE_DIRECTORIES(libs/polarssl/include)
-+ ENDIF(POLARSSL_LIBRARY)
-
- ADD_DEFINITIONS(-DFROST_SUPPORT)
-
diff --git a/net-p2p/fms/files/fms-use-system-libs3.patch b/net-p2p/fms/files/fms-use-system-libs3.patch new file mode 100644 index 000000000000..32a702511d53 --- /dev/null +++ b/net-p2p/fms/files/fms-use-system-libs3.patch @@ -0,0 +1,41 @@ +--- CMakeLists.txt 2016-06-04 21:18:20.000000000 +0200 ++++ CMakeLists.txt.new 2017-01-12 17:12:10.000000000 +0100 +@@ -373,11 +373,18 @@ + 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 +412,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")
|