summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-07-31 18:30:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-07-31 18:30:43 +0000
commit39ad72d052b35ea43ba34d3248f3eff276c021e5 (patch)
treee6f864bfadbc7cc636e4e869febe0204892de050 /media-libs/libcuefile/files
parentstable sparc, security bug 278564 (diff)
downloadhistorical-39ad72d052b35ea43ba34d3248f3eff276c021e5.tar.gz
historical-39ad72d052b35ea43ba34d3248f3eff276c021e5.tar.bz2
historical-39ad72d052b35ea43ba34d3248f3eff276c021e5.zip
Forgot to commit this...
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libcuefile/files')
-rw-r--r--media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch34
1 files changed, 28 insertions, 6 deletions
diff --git a/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch b/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
index e23e741e9763..cecc75167499 100644
--- a/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
+++ b/media-libs/libcuefile/files/libcuefile-444-multilib_and_shared.patch
@@ -1,7 +1,23 @@
-diff -ur libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt
+diff -ruN libcuefile-444.orig/CMakeLists.txt libcuefile-444/CMakeLists.txt
+--- libcuefile-444.orig/CMakeLists.txt 2009-07-25 15:58:50.000000000 +0300
++++ libcuefile-444/CMakeLists.txt 2009-07-31 16:35:29.000000000 +0300
+@@ -4,4 +4,7 @@
+
+ set(CMAKE_VERBOSE_MAKEFILE false)
+
++option(SHARED "Use shared libcuefile" OFF)
++
+ add_subdirectory(src)
++add_subdirectory(include)
+diff -ruN libcuefile-444.orig/include/CMakeLists.txt libcuefile-444/include/CMakeLists.txt
+--- libcuefile-444.orig/include/CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
++++ libcuefile-444/include/CMakeLists.txt 2009-07-31 16:37:17.000000000 +0300
+@@ -0,0 +1 @@
++INSTALL(DIRECTORY cuetools DESTINATION include)
+diff -ruN libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.txt
--- libcuefile-444.orig/src/CMakeLists.txt 2009-07-25 15:58:50.000000000 +0300
-+++ libcuefile-444/src/CMakeLists.txt 2009-07-25 16:04:43.000000000 +0300
-@@ -1,3 +1,10 @@
++++ libcuefile-444/src/CMakeLists.txt 2009-07-31 16:36:16.000000000 +0300
+@@ -1,3 +1,16 @@
add_definitions(-DYY_NEVER_INTERACTIVE)
include_directories(${libcuefile_SOURCE_DIR}/include)
-add_library(cuefile STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
@@ -10,7 +26,13 @@ diff -ur libcuefile-444.orig/src/CMakeLists.txt libcuefile-444/src/CMakeLists.tx
+add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
+set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1)
+
-+add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
-+set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
++if(SHARED)
++ add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan)
++ set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0)
++endif(SHARED)
+
-+install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++install(TARGETS cuefile-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++
++if(SHARED)
++ install(TARGETS cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}")
++endif(SHARED)