1 |
ssuominen 09/07/31 18:30:44 |
2 |
|
3 |
Modified: libcuefile-444-multilib_and_shared.patch |
4 |
Log: |
5 |
Forgot to commit this... |
6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: libcuefile-444-multilib_and_shared.patch |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- libcuefile-444-multilib_and_shared.patch 25 Jul 2009 13:25:39 -0000 1.1 |
22 |
+++ libcuefile-444-multilib_and_shared.patch 31 Jul 2009 18:30:43 -0000 1.2 |
23 |
@@ -1,7 +1,23 @@ |
24 |
-diff -ur libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt |
25 |
+diff -ruN libcuefile-444.orig/CMakeLists.txt libcuefile-444/CMakeLists.txt |
26 |
+--- libcuefile-444.orig/CMakeLists.txt 2009-07-25 15:58:50.000000000 +0300 |
27 |
++++ libcuefile-444/CMakeLists.txt 2009-07-31 16:35:29.000000000 +0300 |
28 |
+@@ -4,4 +4,7 @@ |
29 |
+ |
30 |
+ set(CMAKE_VERBOSE_MAKEFILE false) |
31 |
+ |
32 |
++option(SHARED "Use shared libcuefile" OFF) |
33 |
++ |
34 |
+ add_subdirectory(src) |
35 |
++add_subdirectory(include) |
36 |
+diff -ruN libcuefile-444.orig/include/CMakeLists.txt libcuefile-444/include/CMakeLists.txt |
37 |
+--- libcuefile-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 |
38 |
++++ libcuefile-444/include/CMakeLists.txt 2009-07-31 16:37:17.000000000 +0300 |
39 |
+@@ -0,0 +1 @@ |
40 |
++INSTALL(DIRECTORY cuetools DESTINATION include) |
41 |
+diff -ruN libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt |
42 |
--- libcuefile-444.orig/src/CMakeLists.txt 2009-07-25 15:58:50.000000000 +0300 |
43 |
-+++ libcuefile-444/src/CMakeLists.txt 2009-07-25 16:04:43.000000000 +0300 |
44 |
-@@ -1,3 +1,10 @@ |
45 |
++++ libcuefile-444/src/CMakeLists.txt 2009-07-31 16:36:16.000000000 +0300 |
46 |
+@@ -1,3 +1,16 @@ |
47 |
add_definitions(-DYY_NEVER_INTERACTIVE) |
48 |
include_directories(${libcuefile_SOURCE_DIR}/include) |
49 |
-add_library(cuefile STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) |
50 |
@@ -10,7 +26,13 @@ |
51 |
+add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) |
52 |
+set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1) |
53 |
+ |
54 |
-+add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) |
55 |
-+set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0) |
56 |
++if(SHARED) |
57 |
++ add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) |
58 |
++ set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0) |
59 |
++endif(SHARED) |
60 |
+ |
61 |
-+install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
62 |
++install(TARGETS cuefile-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
63 |
++ |
64 |
++if(SHARED) |
65 |
++ install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") |
66 |
++endif(SHARED) |