diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-04 22:11:49 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-04-04 22:11:49 +0000 |
| commit | 308f2cf72df49c19e2a23aa2a8c82aeb8387e44d (patch) | |
| tree | 1bbbd62bd3d3595a9f58283d31c6eb56aed54153 /dev-libs | |
| parent | sys-process/nmon: Version bump thanks to Alexander Miroshnichenko (bug #132948). (diff) | |
| download | sunrise-308f2cf72df49c19e2a23aa2a8c82aeb8387e44d.tar.gz sunrise-308f2cf72df49c19e2a23aa2a8c82aeb8387e44d.tar.bz2 sunrise-308f2cf72df49c19e2a23aa2a8c82aeb8387e44d.zip | |
Fixup yajl cmakelist files.
svn path=/sunrise/; revision=10397
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/yajl/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-libs/yajl/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/yajl/files/yajl-fix_cmakelists.patch | 23 | ||||
| -rw-r--r-- | dev-libs/yajl/files/yajl-fix_tests.patch | 15 | ||||
| -rw-r--r-- | dev-libs/yajl/yajl-1.0.9.ebuild | 12 |
5 files changed, 56 insertions, 4 deletions
diff --git a/dev-libs/yajl/ChangeLog b/dev-libs/yajl/ChangeLog index 20dc3b0ab..29de17c0c 100644 --- a/dev-libs/yajl/ChangeLog +++ b/dev-libs/yajl/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Apr 2010; Tomáš Chvátal <scarabeus@gentoo.org> yajl-1.0.9.ebuild, + +files/yajl-fix_cmakelists.patch, +files/yajl-fix_tests.patch: + Fixup yajl cmakelist files. + 26 Mar 2010; Ondrej Sukup (mimi_vx) <mimi.vx@gmail.com> +yajl-9999.ebuild: Add live ebuild. Thx chithead diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest index dc0631f9a..c121cb179 100644 --- a/dev-libs/yajl/Manifest +++ b/dev-libs/yajl/Manifest @@ -1,5 +1,7 @@ +AUX yajl-fix_cmakelists.patch 985 RMD160 58dec7495750fdb332ef118dcc626ed0250217c7 SHA1 f439886bcf312845a1d9416b52e86a686bb68d7d SHA256 3beb59e69200fa000e198888b93384c604510afb0d90f5edb321e4762fb95b76 +AUX yajl-fix_tests.patch 696 RMD160 924578fd3beba63e90e64fac0599a98928add5dc SHA1 a6ca752e0a8a09faddc73e6f8a8b47dd8f5ec279 SHA256 90a5239c9fc5424ca2837c4d7c1cf83e6d7de589daef80f2431fe35758045429 DIST yajl-1.0.9.tar.gz 53098 RMD160 d66335786123ad62d439da2aab760d734b0397ec SHA1 2e80be084cd1cbb537f85196872aef93bd1dd76a SHA256 d338c420ce1d94f41db304f100e87b78b6c53a5986bc429812bdc756e1f7959a -EBUILD yajl-1.0.9.ebuild 432 RMD160 2dd7e43dcf4040910e9ab50ad6d3e5b23bb307d6 SHA1 f353ff4c5fc2e6176a4e13951c7bd231a57d639f SHA256 89cb54b11f8f97f0a6a564b1dc7a3201a6390ecf3ebd5cee6e426724769ec577 +EBUILD yajl-1.0.9.ebuild 527 RMD160 fe25940efa8f5cbe262c1bae7816ea7389709849 SHA1 e75459757f3877ff24311774052c81eb299ac65a SHA256 c16e63fafaf8beb9e11384a9b919bd4ba52d90f51d8ee2bb045a0aaec6676d10 EBUILD yajl-9999.ebuild 356 RMD160 fc0903c900a82803bc104d19688c8eefe2013cd5 SHA1 6c7917422a46059ded6d52c0c9aa69c49425d951 SHA256 e185ae029c685e54e5a6100cead9d41d2a258e971b7502ff46f0624dffd7329e -MISC ChangeLog 407 RMD160 4858e645bc6fc1ab65b55d171576881f4f30ef1f SHA1 671f4ced33eab5bbc95c298d0d03931e4391554a SHA256 e8b10437a154c7eaa5f61922f251ed279b619cc12e497ddc6db7e514998cafe2 +MISC ChangeLog 577 RMD160 d82bcc73225011a8ea90ab4f6831537cf2b3c828 SHA1 f2e04105f55bf0635e8b323a8b5081b8fc8791f9 SHA256 6e1f6975fd47af4c6743c11a73afb33a9be9de9d665523a4db1f3a7d24efc71b MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/dev-libs/yajl/files/yajl-fix_cmakelists.patch b/dev-libs/yajl/files/yajl-fix_cmakelists.patch new file mode 100644 index 000000000..95e794dfd --- /dev/null +++ b/dev-libs/yajl/files/yajl-fix_cmakelists.patch @@ -0,0 +1,23 @@ +diff -urN lloyd-yajl-9c15d72//src/CMakeLists.txt lloyd-yajl-9c15d72.new//src/CMakeLists.txt +--- lloyd-yajl-9c15d72//src/CMakeLists.txt 2010-01-08 18:05:11.000000000 +0100 ++++ lloyd-yajl-9c15d72.new//src/CMakeLists.txt 2010-04-04 23:49:02.000000000 +0200 +@@ -42,7 +42,7 @@ + ADD_DEFINITIONS(-DYAJL_BUILD) + + # set up some paths +-SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) ++SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib${LIB_SUFFIX}) + SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl) + + # set the output path for libraries +@@ -77,8 +77,8 @@ + INCLUDE_DIRECTORIES(${incDir}/..) + + IF(NOT WIN32) +- INSTALL(TARGETS yajl LIBRARY DESTINATION lib) +- INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib) ++ INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX}) ++ INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY api/ DESTINATION include/yajl + FILES_MATCHING PATTERN "*.h") + ENDIF() diff --git a/dev-libs/yajl/files/yajl-fix_tests.patch b/dev-libs/yajl/files/yajl-fix_tests.patch new file mode 100644 index 000000000..b4a6498ce --- /dev/null +++ b/dev-libs/yajl/files/yajl-fix_tests.patch @@ -0,0 +1,15 @@ +diff -urN lloyd-yajl-9c15d72.old/test/run_tests.sh lloyd-yajl-9c15d72//test/run_tests.sh +--- lloyd-yajl-9c15d72.old/test/run_tests.sh 2010-04-04 23:59:51.000000000 +0200 ++++ lloyd-yajl-9c15d72//test/run_tests.sh 2010-04-05 00:00:26.000000000 +0200 +@@ -8,9 +8,9 @@ + # find test binary on both platforms. allow the caller to force a + # particular test binary (useful for non-cmake build systems). + if [ -z "$testBin" ]; then +- testBin="../build/test/Debug/yajl_test.exe" ++ testBin="./yajl_test.exe" + if [[ ! -x $testBin ]] ; then +- testBin="../build/test/yajl_test" ++ testBin="./yajl_test" + if [[ ! -x $testBin ]] ; then + echo "cannot execute test binary: '$testBin'" + exit 1; diff --git a/dev-libs/yajl/yajl-1.0.9.ebuild b/dev-libs/yajl/yajl-1.0.9.ebuild index 90fb1d3b5..74c6a1f88 100644 --- a/dev-libs/yajl/yajl-1.0.9.ebuild +++ b/dev-libs/yajl/yajl-1.0.9.ebuild @@ -16,7 +16,15 @@ KEYWORDS="~amd64 ~x86" IUSE="" +CMAKE_IN_SOURCE_BUILD="1" + src_prepare() { - cd "${WORKDIR}"/lloyd-yajl-* + cd "${WORKDIR}"/lloyd-${PN}-* S=$(pwd) -}
\ No newline at end of file + + epatch "${FILESDIR}"/${PN}-* +} + +src_test() { + emake test || die +} |