diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-06-26 10:28:11 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-06-26 10:28:11 +0000 |
| commit | 92d369481f1d81ee880fcd00dd62a3465a2ff7c2 (patch) | |
| tree | a5b313455cf101118d16766fabd6bff1873ec846 /dev-libs/yajl/files | |
| parent | old (diff) | |
| download | gentoo-2-92d369481f1d81ee880fcd00dd62a3465a2ff7c2.tar.gz gentoo-2-92d369481f1d81ee880fcd00dd62a3465a2ff7c2.tar.bz2 gentoo-2-92d369481f1d81ee880fcd00dd62a3465a2ff7c2.zip | |
fix USE=-static-libs (patch did not work, just remove .a after build/install, bug 474814 by patrick), fix src_test.
(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
Diffstat (limited to 'dev-libs/yajl/files')
| -rw-r--r-- | dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch b/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch deleted file mode 100644 index 4309e5a2ee40..000000000000 --- a/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- yajl-2.0.4/src/CMakeLists.txt -+++ yajl-2.0.4/src/CMakeLists.txt -@@ -35,8 +35,6 @@ - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) - --ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) -- - ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) - - #### setup shared library version number -@@ -69,8 +67,6 @@ - - EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) - -- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) - ENDFOREACH (header ${PUB_HDRS}) - - INCLUDE_DIRECTORIES(${incDir}/..) -@@ -79,7 +75,6 @@ - # at build time you may specify the cmake variable LIB_SUFFIX to handle - # 64-bit systems which use 'lib64' - INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX}) -- INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) - INSTALL(FILES ${shareDir}/yajl.pc DESTINATION share/pkgconfig) |