diff options
| author |   Michael Weber <xmw@gentoo.org> | 2013-06-23 22:19:25 +0000 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2013-06-23 22:19:25 +0000 |
| commit | d58cb41325bef3b50d8c563ea4f880c2e5ef966f (patch) | |
| tree | cf02ace80a2c345622ba0253c5040659a2373075 /dev-libs/yajl/files | |
| parent | Update PIL imports and depend on virtual/python-imaging, bug 471514. (diff) | |
| download | gentoo-2-d58cb41325bef3b50d8c563ea4f880c2e5ef966f.tar.gz gentoo-2-d58cb41325bef3b50d8c563ea4f880c2e5ef966f.tar.bz2 gentoo-2-d58cb41325bef3b50d8c563ea4f880c2e5ef966f.zip | |
Revbump, USE=static-libs (bug 447376, thanks ago), fix multilib test (bug 467808, thanks Alphat-PC). Drop old.
(Portage version: 2.2.0_alpha183/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, 28 insertions, 0 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 new file mode 100644 index 000000000000..4309e5a2ee40 --- /dev/null +++ b/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch @@ -0,0 +1,28 @@ +--- 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) |