* [gentoo-commits] gentoo-x86 commit in dev-libs/yajl/files: yajl-2.0.4-remove_static_lib.patch
@ 2013-06-23 22:19 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2013-06-23 22:19 UTC (permalink / raw
To: gentoo-commits
xmw 13/06/23 22:19:25
Added: yajl-2.0.4-remove_static_lib.patch
Log:
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)
Revision Changes Path
1.1 dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/yajl/files/yajl-2.0.4-remove_static_lib.patch?rev=1.1&content-type=text/plain
Index: yajl-2.0.4-remove_static_lib.patch
===================================================================
--- 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)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/yajl/files: yajl-2.0.4-remove_static_lib.patch
@ 2013-06-26 10:28 Michael Weber (xmw)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Weber (xmw) @ 2013-06-26 10:28 UTC (permalink / raw
To: gentoo-commits
xmw 13/06/26 10:28:11
Removed: yajl-2.0.4-remove_static_lib.patch
Log:
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)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-26 10:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-26 10:28 [gentoo-commits] gentoo-x86 commit in dev-libs/yajl/files: yajl-2.0.4-remove_static_lib.patch Michael Weber (xmw)
-- strict thread matches above, loose matches on Subject: below --
2013-06-23 22:19 Michael Weber (xmw)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox