1 |
tommy 09/08/02 21:26:00 |
2 |
|
3 |
Modified: fms-use-system-libs.patch |
4 |
Log: |
5 |
Version bump, drop old versions |
6 |
(Portage version: 2.2_rc33-r5/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 net-p2p/fms/files/fms-use-system-libs.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: fms-use-system-libs.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- fms-use-system-libs.patch 8 Apr 2009 14:07:25 -0000 1.1 |
22 |
+++ fms-use-system-libs.patch 2 Aug 2009 21:26:00 -0000 1.2 |
23 |
@@ -1,15 +1,18 @@ |
24 |
---- CMakeLists.txt 2009-04-04 16:20:16.000000000 +0200 |
25 |
-+++ CMakeLists.txt.new 2009-04-08 15:42:06.000000000 +0200 |
26 |
-@@ -294,10 +294,15 @@ |
27 |
+--- CMakeLists.txt 2009-07-24 20:32:12.000000000 +0200 |
28 |
++++ CMakeLists.txt.new 2009-08-02 21:46:18.048387609 +0200 |
29 |
+@@ -315,12 +315,17 @@ |
30 |
+ TARGET_LINK_LIBRARIES(fms tommath) |
31 |
INCLUDE_DIRECTORIES(libs/libtommath) |
32 |
ENDIF(TOMMATH_LIBRARY) |
33 |
- |
34 |
+- |
35 |
- # Force use of bundled tomcrypt, as the system library may have been compiled without the features we need |
36 |
- ADD_SUBDIRECTORY(libs/libtomcrypt) |
37 |
- TARGET_LINK_LIBRARIES(fms tomcrypt) |
38 |
- INCLUDE_DIRECTORIES(libs/libtomcrypt/headers) |
39 |
+- |
40 |
++ |
41 |
+ FIND_LIBRARY(TOMCRYPT_LIBRARY NAMES tomcrypt libtomcrypt) |
42 |
-+ |
43 |
++ |
44 |
+ IF(TOMCRYPT_LIBRARY) |
45 |
+ TARGET_LINK_LIBRARIES(fms ${TOMCRYPT_LIBRARY}) |
46 |
+ ELSE(TOMCRYPT_LIBRARY) |
47 |
@@ -17,6 +20,7 @@ |
48 |
+ TARGET_LINK_LIBRARIES(fms tomcrypt) |
49 |
+ INCLUDE_DIRECTORIES(libs/libtomcrypt/headers) |
50 |
+ ENDIF(TOMCRYPT_LIBRARY) |
51 |
- |
52 |
- |
53 |
++ |
54 |
ADD_DEFINITIONS(-DFROST_SUPPORT) |
55 |
+ |
56 |
+ ENDIF(FROST_SUPPORT) |