diff options
Diffstat (limited to 'dev-libs/yajl')
| -rw-r--r-- | dev-libs/yajl/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch | 40 | ||||
| -rw-r--r-- | dev-libs/yajl/files/yajl-2.1.0-uclibc.patch | 14 | ||||
| -rw-r--r-- | dev-libs/yajl/files/yajl-fix_static_linking.patch | 24 | ||||
| -rw-r--r-- | dev-libs/yajl/yajl-2.1.0-r1.ebuild (renamed from dev-libs/yajl/yajl-2.0.4-r3.ebuild) | 17 |
5 files changed, 23 insertions, 78 deletions
diff --git a/dev-libs/yajl/Manifest b/dev-libs/yajl/Manifest index f1097fe1dcbd..1715af1cd141 100644 --- a/dev-libs/yajl/Manifest +++ b/dev-libs/yajl/Manifest @@ -1,7 +1,5 @@ -AUX yajl-2.0.4-pkgconfig_multilib.patch 1584 BLAKE2B 7fbe24ea90fa7fbc3007538a01b7e643c462404eb23b31e450ed6e6b8fd9f523f9b6d2104e4ce1b26fe2d008d5acb9cb1549ebeb7be47f30a7d05114220d95e4 SHA512 fc0a4d508e48bc8e005e0ad50fb44f3a0dbdd5e8e4eca4784e29a11498a480bd8ffe5558b512be9d54cd2b22bed53399f277796c413230e7c49abbd0dd98530f -AUX yajl-fix_static_linking.patch 1019 BLAKE2B 04a28ef7efa8f8b2dc4da26260bd4c52a172a5798d8b88533b0baa9e66c21e1bf29c5032700474c8ffafeb321e948fd38f06692a6176e8a420d2f0434aa0cc10 SHA512 14e2708d979b59dd5764757f26ad4008a6229fa571c8b40e1fb2b5a4a6a68c5308d97aa78e1e06b274672cbbf6d07195d2d8291d78452c61738585af8142e32b -DIST yajl-2.0.4.tar.gz 82814 BLAKE2B 4a84916c5ba6cd43aa484af559c23c05ea0b36078d1f4489d97c8c47404aa2771f9c2238f6fcbb344cb2e84f8b183b918ff2d95c50c7da8a781731614d88dbf6 SHA512 ab99fdd6b7e6f7add5530fff2d3ac6171ed3698267016d6cd23449742d36c9d848f065ba920dc2abb934488239e11e4ceda571c05fa472ab5d3f0480e9033a13 +AUX yajl-2.1.0-uclibc.patch 487 BLAKE2B 873f1c4d4c53ff155814d960301f0932267ce277bfe772593853234c446ef949a7bd424c7db8f97c9dbc14428b03210b1c740a51b5379dbcebefbb311144a826 SHA512 7d81f13329da5fa81c31b07763b50153197760c93ceaf14d3b87232a377fb0871dc522f73a7d556131d1272496d7e8082eaef8ec968b8004e2d2c5e74987167d DIST yajl-2.1.0.tar.gz 84039 BLAKE2B 53cfa60994a478050ef1ab35ecfe60cc51f166bc101ee81f42122b134cc30afd1277c3c2661f5c03dc8c8117fcfdaab8ec7c6d735a6810ea4700f1afaea60e1a SHA512 671c06081e01584d170b614dc0685f49c6d7448b673d8ed99749ce4e0ca73875af9f62df7787b919ceaecab213668ac1d2a5800b6831731ec146353552f36985 -EBUILD yajl-2.0.4-r3.ebuild 988 BLAKE2B 481a498b4e7b5c49c5fdc4e0588558e34dc86891e6b9ad5f33beae03face25cbedb906ca268c3062bfea10c12ca2373476c6ef52972d2ca48e5fc2818cb11f0e SHA512 544e6bf2d61883fb09882d5ef78ee39246715951e35d0bab41c73c9a783c8a3c28d1e77cc447f990e721e98f12417c081bbdf55047e864b9d9ab14dd3576f552 +EBUILD yajl-2.1.0-r1.ebuild 938 BLAKE2B 643b858c69462911616a1b7aa1cbdd2678dcd74e459a1538017cba672b3158ddb9cdbbdcb9d66c78cd3ac5fd0ff2651ef5276199350f5a1762a6ad04329919bb SHA512 94108784b1245ec434427c3ee9cc99221b452c7b4a15998e73db68e57044c77ac0a87298f19d37a37206e13097917a3e81d0b541599528646309bf4e249ce092 EBUILD yajl-2.1.0.ebuild 894 BLAKE2B b264eef4b077162606be918a7a2af354c7a6ed46b39bf4307649703727b8de7b222d231fd34e9d7c1a234021069c13de5840a18b5b534950da694f1276677411 SHA512 74b0cc65f70342aa512fb7da7322bc06f6e6acd635427d836c383dd42eee55f61af85968d0a624fe72c18aa9e5b19f6f42d49049717e45bc09be06a5b55cfe8a MISC metadata.xml 446 BLAKE2B 84c4b6dc7569e85ba3925a34c96c67c8f7d23a5d8861a296ba4fde89122645cd6e49d0ec8749cb6028d10d9b945735ed732ea4473c98393d8b83874eba9c06ec SHA512 6cbb37575c23168f216682c7f2decadcb18a11d9c0af71e6de531b1002541d913fa84f98ed78f13ad1c995c332b87d61c658ac0f3fbbef39e01fe2786e1da6f9 diff --git a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch b/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch deleted file mode 100644 index 4a01848acd49..000000000000 --- a/dev-libs/yajl/files/yajl-2.0.4-pkgconfig_multilib.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 409098e97292aa1698ddff7f34dd8099db41a550 Mon Sep 17 00:00:00 2001 -From: ksergey <inndie@gmail.com> -Date: Tue, 28 Jan 2014 00:35:36 -0500 -Subject: [PATCH] fixed pkgconfig file path - ---- - src/CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e36b736..27b7c7d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -30,7 +30,7 @@ ADD_DEFINITIONS(-DYAJL_BUILD) - # set up some paths - SET (libDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - SET (incDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/include/yajl) --SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig) -+SET (pkgConfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig) - - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) -@@ -61,7 +61,7 @@ FILE(MAKE_DIRECTORY ${incDir}) - # generate build-time source - SET(dollar $) - CONFIGURE_FILE(api/yajl_version.h.cmake ${incDir}/yajl_version.h) --CONFIGURE_FILE(yajl.pc.cmake ${shareDir}/yajl.pc) -+CONFIGURE_FILE(yajl.pc.cmake ${pkgConfigDir}/yajl.pc) - - # copy public headers to output directory - FOREACH (header ${PUB_HDRS}) -@@ -82,5 +82,5 @@ IF(NOT WIN32) - 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) -+ INSTALL(FILES ${pkgConfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) - ENDIF() --- -1.8.5.5 diff --git a/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch b/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch new file mode 100644 index 000000000000..2e6f176de648 --- /dev/null +++ b/dev-libs/yajl/files/yajl-2.1.0-uclibc.patch @@ -0,0 +1,14 @@ +diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt +index da4032b..d48e218 100644 +--- a/reformatter/CMakeLists.txt ++++ b/reformatter/CMakeLists.txt +@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) + + ADD_EXECUTABLE(json_reformat ${SRCS}) + +-TARGET_LINK_LIBRARIES(json_reformat yajl_s) ++TARGET_LINK_LIBRARIES(json_reformat yajl_s m) + + # copy the binary into the output directory + GET_TARGET_PROPERTY(binPath json_reformat LOCATION) + diff --git a/dev-libs/yajl/files/yajl-fix_static_linking.patch b/dev-libs/yajl/files/yajl-fix_static_linking.patch deleted file mode 100644 index 56bf0e737319..000000000000 --- a/dev-libs/yajl/files/yajl-fix_static_linking.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt lloyd-yajl-f4baae0//reformatter/CMakeLists.txt ---- lloyd-yajl-f4baae0.old//reformatter/CMakeLists.txt 2010-07-22 00:12:15.000000000 +0200 -+++ lloyd-yajl-f4baae0//reformatter/CMakeLists.txt 2011-02-11 19:28:40.006756997 +0100 -@@ -42,7 +42,7 @@ - - ADD_EXECUTABLE(json_reformat ${SRCS}) - --TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+TARGET_LINK_LIBRARIES(json_reformat yajl) - - # copy the binary into the output directory - GET_TARGET_PROPERTY(binPath json_reformat LOCATION) -diff -urN lloyd-yajl-f4baae0.old//verify/CMakeLists.txt lloyd-yajl-f4baae0//verify/CMakeLists.txt ---- lloyd-yajl-f4baae0.old//verify/CMakeLists.txt 2010-07-22 00:12:15.000000000 +0200 -+++ lloyd-yajl-f4baae0//verify/CMakeLists.txt 2011-02-11 19:28:58.296756998 +0100 -@@ -42,7 +42,7 @@ - - ADD_EXECUTABLE(json_verify ${SRCS}) - --TARGET_LINK_LIBRARIES(json_verify yajl_s) -+TARGET_LINK_LIBRARIES(json_verify yajl) - - # copy in the binary - GET_TARGET_PROPERTY(binPath json_verify LOCATION) diff --git a/dev-libs/yajl/yajl-2.0.4-r3.ebuild b/dev-libs/yajl/yajl-2.1.0-r1.ebuild index b0670a2bb73b..b296aac066ca 100644 --- a/dev-libs/yajl/yajl-2.0.4-r3.ebuild +++ b/dev-libs/yajl/yajl-2.1.0-r1.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -inherit eutils cmake-multilib vcs-snapshot +inherit cmake-multilib vcs-snapshot DESCRIPTION="Small event-driven (SAX-style) JSON parser" HOMEPAGE="https://lloyd.github.com/yajl/" SRC_URI="https://github.com/lloyd/yajl/tarball/${PV} -> ${P}.tar.gz" LICENSE="ISC" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +SLOT="0/2" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" -PATCHES=( - "${FILESDIR}"/${PN}-fix_static_linking.patch - "${FILESDIR}"/${P}-pkgconfig_multilib.patch -) +PATCHES=( "${FILESDIR}"/${P}-uclibc.patch ) src_prepare() { cmake-utils_src_prepare @@ -27,7 +24,7 @@ src_prepare() { src_test() { run_test() { - cd "${BUILD_DIR}"/test + cd "${BUILD_DIR}"/test/parsing ./run_tests.sh ./yajl_test || die } multilib_parallel_foreach_abi run_test |