mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
dev-libs/jsoncpp: Sync with Gentoo
It's from Gentoo commit 898e14a66e2908724fcfcc4d4b2200d7901416f2.
This commit is contained in:
parent
418660061e
commit
9590093c16
@ -1,2 +1 @@
|
||||
DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
|
||||
DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
From 8d9109992e34cdacd3f2750ada5c2460d346898f Mon Sep 17 00:00:00 2001
|
||||
From: Rui Chen <rui@chenrui.dev>
|
||||
Date: Thu, 19 Sep 2024 15:10:21 -0400
|
||||
Subject: [PATCH] fix(build): remove `check_required_components` for meson
|
||||
build
|
||||
|
||||
Signed-off-by: Rui Chen <rui@chenrui.dev>
|
||||
---
|
||||
jsoncppConfig.cmake.meson.in | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in
|
||||
index 0f4866d6d..be8852d0c 100644
|
||||
--- a/jsoncppConfig.cmake.meson.in
|
||||
+++ b/jsoncppConfig.cmake.meson.in
|
||||
@@ -4,5 +4,3 @@
|
||||
@MESON_STATIC_TARGET@
|
||||
|
||||
include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
|
||||
-
|
||||
-check_required_components(JsonCpp)
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit meson-multilib python-any-r1
|
||||
|
||||
DESCRIPTION="C++ JSON reader and writer"
|
||||
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
|
||||
SRC_URI="
|
||||
https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="|| ( public-domain MIT )"
|
||||
SLOT="0/25"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
# Follow Debian, Ubuntu, Arch convention for headers location
|
||||
# bug #452234
|
||||
--includedir include/jsoncpp
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
meson-multilib_src_compile
|
||||
|
||||
if use doc; then
|
||||
echo "${PV}" > version || die
|
||||
"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
|
||||
HTML_DOCS=( dist/doxygen/jsoncpp*/. )
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# increase test timeout due to failures on slower hardware
|
||||
meson_src_test -t 2
|
||||
}
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
|
||||
inherit meson python-any-r1
|
||||
|
||||
DESCRIPTION="C++ JSON reader and writer"
|
||||
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
|
||||
SRC_URI="
|
||||
https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="|| ( public-domain MIT )"
|
||||
SLOT="0/25"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local emesonargs=(
|
||||
# Follow Debian, Ubuntu, Arch convention for headers location
|
||||
# bug #452234
|
||||
--includedir include/jsoncpp
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
meson_src_compile
|
||||
|
||||
if use doc; then
|
||||
echo "${PV}" > version || die
|
||||
"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
|
||||
HTML_DOCS=( dist/doxygen/jsoncpp*/. )
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# increase test timeout due to failures on slower hardware
|
||||
meson_src_test -t 2
|
||||
}
|
||||
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit meson-multilib python-any-r1
|
||||
|
||||
DESCRIPTION="C++ JSON reader and writer"
|
||||
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
|
||||
SRC_URI="
|
||||
https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="|| ( public-domain MIT )"
|
||||
SLOT="0/26"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
# https://github.com/open-source-parsers/jsoncpp/pull/1570
|
||||
"${FILESDIR}/${P}-cmake.patch"
|
||||
)
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
# Follow Debian, Ubuntu, Arch convention for headers location
|
||||
# bug #452234
|
||||
--includedir include/jsoncpp
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
meson-multilib_src_compile
|
||||
|
||||
if use doc; then
|
||||
echo "${PV}" > version || die
|
||||
"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
|
||||
HTML_DOCS=( dist/doxygen/jsoncpp*/. )
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# increase test timeout due to failures on slower hardware
|
||||
meson_src_test -t 2
|
||||
}
|
||||
@ -16,7 +16,7 @@ SRC_URI="
|
||||
|
||||
LICENSE="|| ( public-domain MIT )"
|
||||
SLOT="0/26"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
|
||||
inherit meson-multilib python-any-r1
|
||||
|
||||
DESCRIPTION="C++ JSON reader and writer"
|
||||
HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
|
||||
SRC_URI="
|
||||
https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
|
||||
-> ${P}.tar.gz
|
||||
"
|
||||
|
||||
LICENSE="|| ( public-domain MIT )"
|
||||
SLOT="0/26"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="doc test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
doc? ( app-text/doxygen )
|
||||
"
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
# Follow Debian, Ubuntu, Arch convention for headers location
|
||||
# bug #452234
|
||||
--includedir include/jsoncpp
|
||||
-Dtests=$(usex test true false)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
meson-multilib_src_compile
|
||||
|
||||
if use doc; then
|
||||
echo "${PV}" > version || die
|
||||
"${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
|
||||
HTML_DOCS=( dist/doxygen/jsoncpp*/. )
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
# increase test timeout due to failures on slower hardware
|
||||
meson_src_test -t 2
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user