parent
10517a04df
commit
ebdb057c37
Binary file not shown.
Binary file not shown.
@ -0,0 +1,56 @@
|
|||||||
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=8
|
||||||
|
|
||||||
|
PYTHON_COMPAT=( python3_{8..10} )
|
||||||
|
inherit bash-completion-r1 distutils-r1
|
||||||
|
|
||||||
|
DESCRIPTION="Universal Command Line Environment for AWS"
|
||||||
|
HOMEPAGE="https://pypi.org/project/awscli/"
|
||||||
|
#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
|
||||||
|
SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
S="${WORKDIR}/aws-cli-${PV}"
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||||
|
|
||||||
|
# botocore is x.(y+1).z
|
||||||
|
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||||
|
dev-python/colorama[${PYTHON_USEDEP}]
|
||||||
|
dev-python/docutils[${PYTHON_USEDEP}]
|
||||||
|
dev-python/rsa[${PYTHON_USEDEP}]
|
||||||
|
>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
|
||||||
|
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||||
|
"
|
||||||
|
|
||||||
|
distutils_enable_tests --install pytest
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# do not rely on bundled deps in botocore (sic!)
|
||||||
|
find -name '*.py' -exec sed -i \
|
||||||
|
-e 's:from botocore[.]vendored import:import:' \
|
||||||
|
-e 's:from botocore[.]vendored[.]:from :' \
|
||||||
|
{} + || die
|
||||||
|
distutils-r1_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
python_test() {
|
||||||
|
distutils_install_for_testing
|
||||||
|
# integration tests require AWS credentials and Internet access
|
||||||
|
epytest tests/{functional,unit}
|
||||||
|
}
|
||||||
|
|
||||||
|
python_install_all() {
|
||||||
|
newbashcomp bin/aws_bash_completer aws
|
||||||
|
|
||||||
|
insinto /usr/share/zsh/site-functions
|
||||||
|
newins bin/aws_zsh_completer.sh _aws
|
||||||
|
|
||||||
|
distutils-r1_python_install_all
|
||||||
|
|
||||||
|
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
|||||||
DIST librime-lua-20201011103348.tar.gz 21600 BLAKE2B f7046d1eb23391ca70543aa64c52092081cef51a69ac3a282f2f1392eaf760515186f063e9d469c5c41ac9f495ace814ab741a0821d1a635b9ad1f4faa7a3912 SHA512 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c
|
DIST librime-lua-20201011103348.tar.gz 21600 BLAKE2B f7046d1eb23391ca70543aa64c52092081cef51a69ac3a282f2f1392eaf760515186f063e9d469c5c41ac9f495ace814ab741a0821d1a635b9ad1f4faa7a3912 SHA512 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c
|
||||||
|
DIST librime-lua-20211030072627.tar.gz 27894 BLAKE2B a527e865a9945aa7d56cce3905bc80156b60ebf6323828ca40999cb73ebe8d8f66ddf6b0a1d6d5904f2bc754b5f8fe6ac1f5ecdc56351c2222a21429a0c2b701 SHA512 b15f85b0a18e5e05fa691a84aef7cf3689b4a5271a1d5b6f78ea42488f6dbe4dfc56a91fa547ca3636269b9c898d646d24d3a160096ace9927901f9fdba06e9c
|
||||||
|
@ -0,0 +1,53 @@
|
|||||||
|
# Copyright 2020-2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI="7"
|
||||||
|
LUA_COMPAT=(lua{5-3,5-4})
|
||||||
|
|
||||||
|
inherit cmake lua-single
|
||||||
|
|
||||||
|
if [[ "${PV}" == "99999999999999" ]]; then
|
||||||
|
inherit git-r3
|
||||||
|
|
||||||
|
EGIT_REPO_URI="https://github.com/hchunhui/librime-lua"
|
||||||
|
else
|
||||||
|
LIBRIME_LUA_GIT_REVISION="67ef681a9fd03262c49cc7f850cc92fc791b1e85"
|
||||||
|
fi
|
||||||
|
|
||||||
|
DESCRIPTION="Lua module for RIME"
|
||||||
|
HOMEPAGE="https://github.com/hchunhui/librime-lua"
|
||||||
|
if [[ "${PV}" == "99999999999999" ]]; then
|
||||||
|
SRC_URI=""
|
||||||
|
else
|
||||||
|
SRC_URI="https://github.com/hchunhui/${PN}/archive/${LIBRIME_LUA_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
|
||||||
|
fi
|
||||||
|
|
||||||
|
LICENSE="BSD MIT"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||||
|
IUSE=""
|
||||||
|
REQUIRED_USE="${LUA_REQUIRED_USE}"
|
||||||
|
|
||||||
|
BDEPEND=""
|
||||||
|
RDEPEND=">=app-i18n/librime-1.6:0=
|
||||||
|
${LUA_DEPS}"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
dev-libs/boost:0"
|
||||||
|
|
||||||
|
if [[ "${PV}" != "99999999999999" ]]; then
|
||||||
|
S="${WORKDIR}/${PN}-${LIBRIME_LUA_GIT_REVISION}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed \
|
||||||
|
-e "1icmake_minimum_required(VERSION 3.0)\nproject(${PN})\n" \
|
||||||
|
-e "s/ PARENT_SCOPE//" \
|
||||||
|
-e "\$a\\\n" \
|
||||||
|
-e "\$aadd_library(\${plugin_modules} MODULE \${plugin_objs})" \
|
||||||
|
-e "\$aset_target_properties(\${plugin_modules} PROPERTIES PREFIX \"\")" \
|
||||||
|
-e "\$atarget_link_libraries(\${plugin_modules} rime \${plugin_deps})" \
|
||||||
|
-e "\$ainstall(TARGETS \${plugin_modules} DESTINATION $(get_libdir)/rime-plugins)" \
|
||||||
|
-i CMakeLists.txt || die
|
||||||
|
|
||||||
|
cmake_src_prepare
|
||||||
|
}
|
Binary file not shown.
@ -1 +1,2 @@
|
|||||||
DIST filebus-0.3.2.tar.gz 17310 BLAKE2B 0f30aabcd316f52ea12d12b136befe643085dff5e283f65edf2a459b127cd3e2d48c472ae0dd8f302bb7211e4da5541a6fc7ac274573631ab03fc246bc8b566f SHA512 88ce3cd2d8aec7afd30d16315a6a8a37dee1b21d882571ef87c7dca56251e737d6500a5fad0124c62aea6383aae5ec30abd8abf86c2fac5d582f8fe96049eaa6
|
DIST filebus-0.3.2.tar.gz 17310 BLAKE2B 0f30aabcd316f52ea12d12b136befe643085dff5e283f65edf2a459b127cd3e2d48c472ae0dd8f302bb7211e4da5541a6fc7ac274573631ab03fc246bc8b566f SHA512 88ce3cd2d8aec7afd30d16315a6a8a37dee1b21d882571ef87c7dca56251e737d6500a5fad0124c62aea6383aae5ec30abd8abf86c2fac5d582f8fe96049eaa6
|
||||||
|
DIST filebus-0.3.4.tar.gz 17404 BLAKE2B cf6a3fef2e7f3d69fb73df3f9134666e5d1d09d02cc94cd73c2818b1fc92132fafeb8b3b6f904316ab57a3aab4fa01ba00e0e5bfabf9a9c5194de3d6a8666417 SHA512 0619eda926ca77730558600d29a1b7811972b411b86d6c5374f1ccbcd0a4901f70eb87df7577690d72bb7eec4a4191f3b7b4bca237317352bdc0f0ce0f36f120
|
||||||
|
@ -0,0 +1,68 @@
|
|||||||
|
# Copyright 2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
DISTUTILS_OPTIONAL=1
|
||||||
|
DISTUTILS_USE_SETUPTOOLS=manual
|
||||||
|
PYTHON_COMPAT=( python3_{7,8,9,10} )
|
||||||
|
|
||||||
|
inherit distutils-r1
|
||||||
|
|
||||||
|
DESCRIPTION="A user space multicast named pipe implementation backed by a regular file"
|
||||||
|
HOMEPAGE="https://github.com/pipebus/filebus"
|
||||||
|
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
SLOT="0"
|
||||||
|
IUSE="+inotify python test"
|
||||||
|
RESTRICT="!test? ( test )"
|
||||||
|
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||||
|
RDEPEND="
|
||||||
|
python? (
|
||||||
|
${PYTHON_DEPS}
|
||||||
|
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||||
|
dev-python/filelock[${PYTHON_USEDEP}]
|
||||||
|
inotify? ( dev-python/watchdog[${PYTHON_USEDEP}] )
|
||||||
|
)"
|
||||||
|
BDEPEND="${RDEPEND}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
if use python; then
|
||||||
|
distutils-r1_src_prepare
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
if use python; then
|
||||||
|
distutils-r1_src_compile
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
src_test() {
|
||||||
|
"${BASH}" ./lib/bash/filebus-test.bash test || die
|
||||||
|
|
||||||
|
if use python; then
|
||||||
|
distutils-r1_src_test
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
python_test() {
|
||||||
|
python test/test_filebus.py || die "tests failed for ${EPYTHON}"
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
if use python; then
|
||||||
|
distutils-r1_src_install
|
||||||
|
else
|
||||||
|
insinto /usr/libexec/filebus
|
||||||
|
doins lib/bash/*.bash
|
||||||
|
cat <<-EOF > "${T}/filebus"
|
||||||
|
#!/bin/sh
|
||||||
|
exec bash "${EPREFIX}/usr/libexec/filebus/filebus.bash" "\$@"
|
||||||
|
EOF
|
||||||
|
dobin "${T}/filebus"
|
||||||
|
dosym filebus /usr/bin/pipebus
|
||||||
|
fi
|
||||||
|
}
|
Binary file not shown.
@ -0,0 +1,52 @@
|
|||||||
|
From 1809d10663ae3d8f69c04138b66f9b4e66ee14f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Neui <neuisen@googlemail.com>
|
||||||
|
Date: Mon, 15 Nov 2021 01:53:40 +0100
|
||||||
|
Subject: [PATCH] Revert meson plugin translation apply thing
|
||||||
|
|
||||||
|
Since meson 0.60, the `build_always_stale` option was removed:
|
||||||
|
https://github.com/mesonbuild/meson/commit/6b1a80024c79876dc3b75f2b525be24ca8fe671a
|
||||||
|
|
||||||
|
However, meson doesn't make such files depend on the translation .po
|
||||||
|
files, which is a known bug:
|
||||||
|
https://github.com/mesonbuild/meson/issues/2621
|
||||||
|
|
||||||
|
So with that option taken away, I tried passing a list to the input
|
||||||
|
which includes all .po files, since I saw it only uses the first element
|
||||||
|
for the translations, but that fails when trying to generate po files.
|
||||||
|
|
||||||
|
Since it seems you can't dynamically add dependencies after the fact,
|
||||||
|
this seems like a dead end, so I am reverting this for now to make it
|
||||||
|
compile on meson 0.60.
|
||||||
|
---
|
||||||
|
GTG/plugins/meson.build | 4 +---
|
||||||
|
docs/contributors/translating.md | 3 +++
|
||||||
|
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/GTG/plugins/meson.build b/GTG/plugins/meson.build
|
||||||
|
index eb20f0b85..556885280 100644
|
||||||
|
--- a/GTG/plugins/meson.build
|
||||||
|
+++ b/GTG/plugins/meson.build
|
||||||
|
@@ -24,9 +24,7 @@ foreach plugin : gtg_plugins
|
||||||
|
install_dir: plugin_install_dir,
|
||||||
|
type: 'desktop',
|
||||||
|
args: ['--keyword=name', '--keyword=short-description', '--keyword=description'],
|
||||||
|
- build_by_default: true,
|
||||||
|
- build_always_stale: true
|
||||||
|
- # build always because otherwise new translations won't be applied
|
||||||
|
+ build_by_default: true
|
||||||
|
)
|
||||||
|
subdir(plugin.underscorify())
|
||||||
|
endforeach
|
||||||
|
diff --git a/docs/contributors/translating.md b/docs/contributors/translating.md
|
||||||
|
index 0af3e5f19..184f98843 100644
|
||||||
|
--- a/docs/contributors/translating.md
|
||||||
|
+++ b/docs/contributors/translating.md
|
||||||
|
@@ -75,5 +75,8 @@ Make sure to this AFTER COMMITING YOUR CHANGES!
|
||||||
|
* During launching, it might complain about certain files not being found in [`po/POTFILES.in`][POTFILES.IN].
|
||||||
|
It is safe to remove the lines from that file and re-run until it works.
|
||||||
|
It would be useful to comment about that if you're submitting your translation, just in case.
|
||||||
|
+* Plugin related strings don't update after updating the translation.
|
||||||
|
+ The cause is unknown, but you can delete the plugin files to re-generate
|
||||||
|
+ them using the new translations: `rm -f .local_build/GTG/plugins/*.gtg-plugin`
|
||||||
|
|
||||||
|
[POTFILES.IN]: ../../po/POTFILES.in
|
Binary file not shown.
Binary file not shown.
@ -1,57 +0,0 @@
|
|||||||
# Copyright 2008-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
JAVA_PKG_IUSE="doc source"
|
|
||||||
MAVEN_ID="com.google.protobuf:protobuf-java:3.15.8"
|
|
||||||
|
|
||||||
inherit java-pkg-2 java-pkg-simple
|
|
||||||
|
|
||||||
if [[ "${PV}" == "9999" ]]; then
|
|
||||||
inherit git-r3
|
|
||||||
|
|
||||||
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
|
|
||||||
EGIT_SUBMODULES=()
|
|
||||||
fi
|
|
||||||
|
|
||||||
DESCRIPTION="Google's Protocol Buffers - Java bindings"
|
|
||||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
|
||||||
if [[ "${PV}" == "9999" ]]; then
|
|
||||||
SRC_URI=""
|
|
||||||
else
|
|
||||||
SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0/26"
|
|
||||||
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
|
|
||||||
IUSE=""
|
|
||||||
|
|
||||||
BDEPEND="~dev-libs/protobuf-${PV}
|
|
||||||
>=virtual/jdk-1.7"
|
|
||||||
DEPEND=">=virtual/jdk-1.7"
|
|
||||||
RDEPEND=">=virtual/jre-1.7"
|
|
||||||
|
|
||||||
S="${WORKDIR}/protobuf-${PV}/java"
|
|
||||||
|
|
||||||
if [[ "${PV}" == "9999" ]]; then
|
|
||||||
EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
|
|
||||||
eapply_user
|
|
||||||
popd > /dev/null || die
|
|
||||||
|
|
||||||
java-pkg-2_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
"${BROOT}/usr/bin/protoc" --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto || die
|
|
||||||
JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_compile
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
JAVA_SRC_DIR="core/src/main/java" JAVA_JAR_FILENAME="protobuf.jar" java-pkg-simple_src_install
|
|
||||||
}
|
|
Binary file not shown.
@ -0,0 +1,32 @@
|
|||||||
|
https://github.com/JuliaLang/julia/commit/09a49c6b57fbde109f0f0c2aa9aa05cef2c1dd40
|
||||||
|
https://bugs.gentoo.org/824486
|
||||||
|
|
||||||
|
From: t-bltg <13423344+t-bltg@users.noreply.github.com>
|
||||||
|
Date: Thu, 12 Aug 2021 21:36:18 +0200
|
||||||
|
Subject: [PATCH] MINSIGSTKSZ is no longer constant in glibc (#41860)
|
||||||
|
|
||||||
|
MINSIGSTKSZ is redefined to sysconf(_SC_MINSIGSTKSZ) starting from glibc 2.34
|
||||||
|
|
||||||
|
Co-authored-by: t-bltg <t-bltg@users.noreply.github.com>
|
||||||
|
(cherry picked from commit f19b9a20dde2688c642b7dd709b5d9446e4df2f6)
|
||||||
|
--- a/src/task.c
|
||||||
|
+++ b/src/task.c
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <signal.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <inttypes.h>
|
||||||
|
#include "julia.h"
|
||||||
|
@@ -75,8 +76,8 @@ static inline void tsan_switch_to_ctx(jl_ucontext_t *ctx) {}
|
||||||
|
|
||||||
|
// empirically, jl_finish_task needs about 64k stack space to infer/run
|
||||||
|
// and additionally, gc-stack reserves 64k for the guard pages
|
||||||
|
-#if defined(MINSIGSTKSZ) && MINSIGSTKSZ > 131072
|
||||||
|
-#define MINSTKSZ MINSIGSTKSZ
|
||||||
|
+#if defined(MINSIGSTKSZ)
|
||||||
|
+#define MINSTKSZ (MINSIGSTKSZ > 131072 ? MINSIGSTKSZ : 131072)
|
||||||
|
#else
|
||||||
|
#define MINSTKSZ 131072
|
||||||
|
#endif
|
Binary file not shown.
@ -1 +1,2 @@
|
|||||||
DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
|
DIST libffcall-2.1.tar.gz 943235 BLAKE2B ae82663174db084e830b6ff77ceedf8641b3edeb7800952ac4e2772d9033da3e45f46159e6fdae86615dc69fceba39f48d6c75e6cbd41be98f1986fa69d50b3b SHA512 da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
|
||||||
|
DIST libffcall-2.4.tar.gz 1253767 BLAKE2B 669bf556f082b533eb7d71ebc6fadeac464b1a6054ac8078c9315678929bcfb8ad4b7376b345bcfbb5d2caf9d45179012d4bb5a08ad675f475f58570ae96b7ae SHA512 c9451662764a888e3be21499c29673bfb0e1df4915814da3506db5d395a2b00ea2f0c08d1c9dffebf030179f9347794876ec6ec9e6710b4fc70fd760960335e6
|
||||||
|
@ -0,0 +1,61 @@
|
|||||||
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=8
|
||||||
|
|
||||||
|
inherit flag-o-matic
|
||||||
|
|
||||||
|
MY_PV="libffcall-${PV}"
|
||||||
|
|
||||||
|
DESCRIPTION="Build foreign function call interfaces in embedded interpreter"
|
||||||
|
HOMEPAGE="https://www.gnu.org/software/libffcall/"
|
||||||
|
SRC_URI="mirror://gnu/libffcall/${MY_PV}.tar.gz"
|
||||||
|
S="${WORKDIR}"/${MY_PV}
|
||||||
|
|
||||||
|
# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep
|
||||||
|
# or in derivate works of GNUstep, the included parts of ffcall are
|
||||||
|
# under GNU LGPL." -ffcall author
|
||||||
|
LICENSE="GPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
# The build system is a strange mix of autogenerated
|
||||||
|
# files and manual tweaks on top. Uses $CFLAGS / $LDFLAGS randomly.
|
||||||
|
# We are adding them consistently here and a bit over the top:
|
||||||
|
# bugs: #334581
|
||||||
|
local mfi
|
||||||
|
for mfi in {,*/,*/*/,}Makefile.in ; do
|
||||||
|
einfo "Patching '${mfi}'"
|
||||||
|
# usually uses only assembler here, but -march=
|
||||||
|
# and -Wa, are a must to pass here.
|
||||||
|
sed -e 's/$(CC) /&$(CFLAGS) /g' \
|
||||||
|
-i "${mfi}" || die
|
||||||
|
done
|
||||||
|
|
||||||
|
eapply_user
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
append-flags -fPIC
|
||||||
|
|
||||||
|
# Doc goes in datadir
|
||||||
|
econf \
|
||||||
|
--datadir="${EPREFIX}"/usr/share/doc/${PF} \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-static
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
# TODO. Remove -j1
|
||||||
|
emake -j1
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
dodoc NEWS README
|
||||||
|
dodir /usr/share/man
|
||||||
|
|
||||||
|
default
|
||||||
|
|
||||||
|
find "${ED}" -name '*.la' -delete || die
|
||||||
|
}
|
@ -1,240 +0,0 @@
|
|||||||
https://github.com/protocolbuffers/protobuf/pull/235
|
|
||||||
|
|
||||||
--- /src/google/protobuf/compiler/command_line_interface.cc
|
|
||||||
+++ /src/google/protobuf/compiler/command_line_interface.cc
|
|
||||||
@@ -1109,6 +1109,28 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
|
|
||||||
+ bool success = false;
|
|
||||||
+ int in_fd = STDIN_FILENO;
|
|
||||||
+ int out_fd = STDOUT_FILENO;
|
|
||||||
+
|
|
||||||
+ if (!protobuf_in_path_.empty()) {
|
|
||||||
+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY);
|
|
||||||
+ if (in_fd == -1) {
|
|
||||||
+ std::cerr << protobuf_in_path_ << ": error: failed to open file." << std::endl;
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ if (!protobuf_out_path_.empty()) {
|
|
||||||
+ out_fd = open(protobuf_out_path_.c_str(),
|
|
||||||
+ O_WRONLY | O_CREAT | O_TRUNC,
|
|
||||||
+ 0644);
|
|
||||||
+ if (out_fd == -1) {
|
|
||||||
+ std::cerr << protobuf_out_path_ << ": error: failed to open file." << std::endl;
|
|
||||||
+ close(in_fd);
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (codec_type_.empty()) {
|
|
||||||
// HACK: Define an EmptyMessage type to use for decoding.
|
|
||||||
DescriptorPool pool;
|
|
||||||
@@ -1117,13 +1139,20 @@
|
|
||||||
file.add_message_type()->set_name("EmptyMessage");
|
|
||||||
GOOGLE_CHECK(pool.BuildFile(file) != NULL);
|
|
||||||
codec_type_ = "EmptyMessage";
|
|
||||||
- if (!EncodeOrDecode(&pool)) {
|
|
||||||
- return 1;
|
|
||||||
- }
|
|
||||||
+ success = EncodeOrDecode(&pool, in_fd, out_fd);
|
|
||||||
} else {
|
|
||||||
- if (!EncodeOrDecode(descriptor_pool.get())) {
|
|
||||||
- return 1;
|
|
||||||
- }
|
|
||||||
+ success = EncodeOrDecode(descriptor_pool.get(), in_fd, out_fd);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (in_fd != STDIN_FILENO) {
|
|
||||||
+ close(in_fd);
|
|
||||||
+ }
|
|
||||||
+ if (out_fd != STDOUT_FILENO) {
|
|
||||||
+ close(out_fd);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!success) {
|
|
||||||
+ return 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1161,6 +1190,11 @@
|
|
||||||
for (int i = 0; i < proto_path_.size(); i++) {
|
|
||||||
source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
|
|
||||||
}
|
|
||||||
+ if (mode_ == MODE_COMPILE &&
|
|
||||||
+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) {
|
|
||||||
+ std::cerr << "--protobuf_in and --protobuf_out are only valid with "
|
|
||||||
+ << "decode operations. Ignoring.";
|
|
||||||
+ }
|
|
||||||
|
|
||||||
// Map input files to virtual paths if possible.
|
|
||||||
if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
|
|
||||||
@@ -1892,6 +1926,12 @@
|
|
||||||
} else if (name == "--deterministic_output") {
|
|
||||||
deterministic_output_ = true;
|
|
||||||
|
|
||||||
+ } else if (name == "--protobuf_in") {
|
|
||||||
+ protobuf_in_path_ = value;
|
|
||||||
+
|
|
||||||
+ } else if (name == "--protobuf_out") {
|
|
||||||
+ protobuf_out_path_ = value;
|
|
||||||
+
|
|
||||||
} else if (name == "--error_format") {
|
|
||||||
if (value == "gcc") {
|
|
||||||
error_format_ = ERROR_FORMAT_GCC;
|
|
||||||
@@ -2019,22 +2059,38 @@
|
|
||||||
--version Show version info and exit.
|
|
||||||
-h, --help Show this text and exit.
|
|
||||||
--encode=MESSAGE_TYPE Read a text-format message of the given type
|
|
||||||
- from standard input and write it in binary
|
|
||||||
- to standard output. The message type must
|
|
||||||
+ from input protobuf file and write it in binary
|
|
||||||
+ to output protobuf file. The message type must
|
|
||||||
be defined in PROTO_FILES or their imports.
|
|
||||||
+ The input/output protobuf files are specified
|
|
||||||
+ using the --protobuf_in and --protobuf_out
|
|
||||||
+ command line flags.
|
|
||||||
--deterministic_output When using --encode, ensure map fields are
|
|
||||||
deterministically ordered. Note that this order
|
|
||||||
is not canonical, and changes across builds or
|
|
||||||
releases of protoc.
|
|
||||||
--decode=MESSAGE_TYPE Read a binary message of the given type from
|
|
||||||
- standard input and write it in text format
|
|
||||||
- to standard output. The message type must
|
|
||||||
+ input protobuf file and write it in text format
|
|
||||||
+ to output protobuf file. The message type must
|
|
||||||
be defined in PROTO_FILES or their imports.
|
|
||||||
+ The input/output protobuf files are specified
|
|
||||||
+ using the --protobuf_in and --protobuf_out
|
|
||||||
+ command line flags.
|
|
||||||
--decode_raw Read an arbitrary protocol message from
|
|
||||||
- standard input and write the raw tag/value
|
|
||||||
- pairs in text format to standard output. No
|
|
||||||
+ input protobuf file and write the raw tag/value
|
|
||||||
+ pairs in text format to output protobuf file. No
|
|
||||||
PROTO_FILES should be given when using this
|
|
||||||
- flag.
|
|
||||||
+ flag. The input/output protobuf files are
|
|
||||||
+ specified using the --protobuf_in and
|
|
||||||
+ --protobuf_out command line flags.
|
|
||||||
+ --protobuf_in=FILE Absolute path to the protobuf file from which
|
|
||||||
+ input of encoding/decoding operation will be
|
|
||||||
+ read. If omitted, input will be read from
|
|
||||||
+ standard input.
|
|
||||||
+ --protobuf_out=FILE Absolute path to the protobuf file to which
|
|
||||||
+ output of encoding/decoding operation will be
|
|
||||||
+ written. If omitted, output will be written to
|
|
||||||
+ standard output.
|
|
||||||
--descriptor_set_in=FILES Specifies a delimited list of FILES
|
|
||||||
each containing a FileDescriptorSet (a
|
|
||||||
protocol buffer defined in descriptor.proto).
|
|
||||||
@@ -2341,7 +2397,9 @@
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
|
|
||||||
+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool,
|
|
||||||
+ int in_fd,
|
|
||||||
+ int out_fd) {
|
|
||||||
// Look up the type.
|
|
||||||
const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
|
|
||||||
if (type == NULL) {
|
|
||||||
@@ -2353,15 +2411,15 @@
|
|
||||||
std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
|
|
||||||
|
|
||||||
if (mode_ == MODE_ENCODE) {
|
|
||||||
- SetFdToTextMode(STDIN_FILENO);
|
|
||||||
- SetFdToBinaryMode(STDOUT_FILENO);
|
|
||||||
+ SetFdToTextMode(in_fd);
|
|
||||||
+ SetFdToBinaryMode(out_fd);
|
|
||||||
} else {
|
|
||||||
- SetFdToBinaryMode(STDIN_FILENO);
|
|
||||||
- SetFdToTextMode(STDOUT_FILENO);
|
|
||||||
+ SetFdToBinaryMode(in_fd);
|
|
||||||
+ SetFdToTextMode(out_fd);
|
|
||||||
}
|
|
||||||
|
|
||||||
- io::FileInputStream in(STDIN_FILENO);
|
|
||||||
- io::FileOutputStream out(STDOUT_FILENO);
|
|
||||||
+ io::FileInputStream in(in_fd);
|
|
||||||
+ io::FileOutputStream out(out_fd);
|
|
||||||
|
|
||||||
if (mode_ == MODE_ENCODE) {
|
|
||||||
// Input is text.
|
|
||||||
--- /src/google/protobuf/compiler/command_line_interface.h
|
|
||||||
+++ /src/google/protobuf/compiler/command_line_interface.h
|
|
||||||
@@ -296,7 +296,9 @@
|
|
||||||
GeneratorContext* generator_context, std::string* error);
|
|
||||||
|
|
||||||
// Implements --encode and --decode.
|
|
||||||
- bool EncodeOrDecode(const DescriptorPool* pool);
|
|
||||||
+ bool EncodeOrDecode(const DescriptorPool* pool,
|
|
||||||
+ int in_fd,
|
|
||||||
+ int out_fd);
|
|
||||||
|
|
||||||
// Implements the --descriptor_set_out option.
|
|
||||||
bool WriteDescriptorSet(
|
|
||||||
@@ -428,6 +430,13 @@
|
|
||||||
// parsed FileDescriptorSets to be used for loading protos. Otherwise, empty.
|
|
||||||
std::vector<std::string> descriptor_set_in_names_;
|
|
||||||
|
|
||||||
+ // When using --encode / --decode / --decode_raw absolute path to the output
|
|
||||||
+ // file. (Empty string indicates write to STDOUT).
|
|
||||||
+ std::string protobuf_out_path_;
|
|
||||||
+ // When using --encode / --decode / --decode_raw, absolute path to the input
|
|
||||||
+ // file. (Empty string indicates read from STDIN).
|
|
||||||
+ std::string protobuf_in_path_;
|
|
||||||
+
|
|
||||||
// If --descriptor_set_out was given, this is the filename to which the
|
|
||||||
// FileDescriptorSet should be written. Otherwise, empty.
|
|
||||||
std::string descriptor_set_out_name_;
|
|
||||||
--- /src/google/protobuf/compiler/command_line_interface_unittest.cc
|
|
||||||
+++ /src/google/protobuf/compiler/command_line_interface_unittest.cc
|
|
||||||
@@ -97,7 +97,7 @@
|
|
||||||
virtual void SetUp();
|
|
||||||
virtual void TearDown();
|
|
||||||
|
|
||||||
- // Runs the CommandLineInterface with the given command line. The
|
|
||||||
+ // Run the CommandLineInterface with the given command line. The
|
|
||||||
// command is automatically split on spaces, and the string "$tmpdir"
|
|
||||||
// is replaced with TestTempDir().
|
|
||||||
void Run(const std::string& command);
|
|
||||||
@@ -2596,6 +2596,17 @@
|
|
||||||
std::string::npos);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ void ExpectBinaryFilesMatch(const string &expected_file,
|
|
||||||
+ const string &actual_file) {
|
|
||||||
+ string expected_output, actual_output;
|
|
||||||
+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output));
|
|
||||||
+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output));
|
|
||||||
+
|
|
||||||
+ // Don't use EXPECT_EQ because we don't want to print raw binary data to
|
|
||||||
+ // stdout on failure.
|
|
||||||
+ EXPECT_TRUE(expected_output == actual_output);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
private:
|
|
||||||
void WriteUnittestProtoDescriptorSet() {
|
|
||||||
unittest_proto_descriptor_set_filename_ =
|
|
||||||
@@ -2719,6 +2730,19 @@
|
|
||||||
"Can only use --deterministic_output with --encode.\n");
|
|
||||||
}
|
|
||||||
|
|
||||||
+TEST_P(EncodeDecodeTest, RedirectInputOutput) {
|
|
||||||
+ string out_file = TestTempDir() + "/golden_message_out.pbf";
|
|
||||||
+ EXPECT_TRUE(
|
|
||||||
+ Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
|
|
||||||
+ " --encode=protobuf_unittest.TestAllTypes" +
|
|
||||||
+ " --protobuf_in=" + TestUtil::GetTestDataPath(
|
|
||||||
+ "net/proto2/internal/"
|
|
||||||
+ "testdata/text_format_unittest_data_oneof_implemented.txt") +
|
|
||||||
+ " --protobuf_out=" + out_file));
|
|
||||||
+ ExpectBinaryFilesMatch(out_file, TestUtil::GetTestDataPath(
|
|
||||||
+ "net/proto2/internal/testdata/golden_message_oneof_implemented"));
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
|
|
||||||
testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
|
|
||||||
} // anonymous namespace
|
|
@ -1,121 +0,0 @@
|
|||||||
--- /Makefile.am
|
|
||||||
+++ /Makefile.am
|
|
||||||
@@ -11,28 +11,10 @@
|
|
||||||
# Always include third_party directories in distributions.
|
|
||||||
DIST_SUBDIRS = src conformance benchmarks third_party/googletest
|
|
||||||
|
|
||||||
-# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
|
|
||||||
-# because then "make check" would also build and run all of gmock's own tests,
|
|
||||||
-# which takes a lot of time and is generally not useful to us. Also, we don't
|
|
||||||
-# want "make install" to recurse into gmock since we don't want to overwrite
|
|
||||||
-# the installed version of gmock if there is one.
|
|
||||||
check-local:
|
|
||||||
- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
|
|
||||||
- @cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
|
|
||||||
- @cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
|
|
||||||
|
|
||||||
-# We would like to clean gmock when "make clean" is invoked. But we have to
|
|
||||||
-# be careful because clean-local is also invoked during "make distclean", but
|
|
||||||
-# "make distclean" already recurses into gmock because it's listed among the
|
|
||||||
-# DIST_SUBDIRS. distclean will delete gmock/Makefile, so if we then try to
|
|
||||||
-# cd to the directory again and "make clean" it will fail. So, check that the
|
|
||||||
-# Makefile exists before recursing.
|
|
||||||
clean-local:
|
|
||||||
- @if test -e third_party/googletest/Makefile; then \
|
|
||||||
- echo "Making clean in googletest"; \
|
|
||||||
- cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
|
|
||||||
- fi; \
|
|
||||||
- if test -e conformance/Makefile; then \
|
|
||||||
+ @if test -e conformance/Makefile; then \
|
|
||||||
echo "Making clean in conformance"; \
|
|
||||||
cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
|
|
||||||
fi; \
|
|
||||||
--- /configure.ac
|
|
||||||
+++ /configure.ac
|
|
||||||
@@ -223,12 +223,5 @@
|
|
||||||
esac
|
|
||||||
AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
|
|
||||||
|
|
||||||
-# HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
|
|
||||||
-# since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
|
|
||||||
-# too.
|
|
||||||
-export CFLAGS
|
|
||||||
-export CXXFLAGS
|
|
||||||
-AC_CONFIG_SUBDIRS([third_party/googletest])
|
|
||||||
-
|
|
||||||
AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
|
|
||||||
AC_OUTPUT
|
|
||||||
--- /src/Makefile.am
|
|
||||||
+++ /src/Makefile.am
|
|
||||||
@@ -703,19 +703,11 @@
|
|
||||||
google/protobuf/testing/file.cc \
|
|
||||||
google/protobuf/testing/file.h
|
|
||||||
|
|
||||||
-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
|
|
||||||
-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
|
|
||||||
-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
|
|
||||||
-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
|
|
||||||
check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
|
|
||||||
protobuf-lite-test test_plugin protobuf-lite-arena-test \
|
|
||||||
$(GZCHECKPROGRAMS)
|
|
||||||
protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
|
||||||
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
||||||
-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
|
|
||||||
- -I$(GOOGLEMOCK_SRC_DIR)/include
|
|
||||||
+ -lgtest -lgmock -lgmock_main
|
|
||||||
# Disable optimization for tests unless the user explicitly asked for it,
|
|
||||||
# since test_util.cc takes forever to compile with optimization (with GCC).
|
|
||||||
# See configure.ac for more info.
|
|
||||||
@@ -807,12 +799,8 @@
|
|
||||||
# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
|
|
||||||
protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
|
|
||||||
libprotoc.la \
|
|
||||||
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
||||||
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
||||||
- -I$(GOOGLETEST_SRC_DIR)/include \
|
|
||||||
- -DPROTOBUF_TEST_NO_DESCRIPTORS
|
|
||||||
+ -lgtest -lgmock -lgmock_main
|
|
||||||
+protobuf_lazy_descriptor_test_CPPFLAGS = -DPROTOBUF_TEST_NO_DESCRIPTORS
|
|
||||||
protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
||||||
protobuf_lazy_descriptor_test_SOURCES = \
|
|
||||||
google/protobuf/compiler/cpp/cpp_unittest.cc \
|
|
||||||
@@ -833,11 +821,7 @@
|
|
||||||
# full runtime and we want to make sure this test builds without full
|
|
||||||
# runtime.
|
|
||||||
protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
|
|
||||||
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
||||||
-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
||||||
- -I$(GOOGLETEST_SRC_DIR)/include
|
|
||||||
+ -lgtest -lgmock -lgmock_main
|
|
||||||
protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
||||||
protobuf_lite_test_SOURCES = \
|
|
||||||
google/protobuf/lite_unittest.cc \
|
|
||||||
@@ -849,11 +833,7 @@
|
|
||||||
# gtest when building the test internally our memory sanitizer doesn't detect
|
|
||||||
# memory leaks (don't know why).
|
|
||||||
protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
|
|
||||||
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
|
|
||||||
- $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
|
|
||||||
-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
|
|
||||||
- -I$(GOOGLETEST_SRC_DIR)/include
|
|
||||||
+ -lgtest -lgmock -lgmock_main
|
|
||||||
protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
|
|
||||||
protobuf_lite_arena_test_SOURCES = \
|
|
||||||
google/protobuf/lite_arena_unittest.cc \
|
|
||||||
@@ -863,8 +843,7 @@
|
|
||||||
|
|
||||||
# Test plugin binary.
|
|
||||||
test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
|
|
||||||
- $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
|
|
||||||
-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
|
|
||||||
+ -lgtest
|
|
||||||
test_plugin_SOURCES = \
|
|
||||||
google/protobuf/compiler/mock_code_generator.cc \
|
|
||||||
google/protobuf/testing/file.cc \
|
|
@ -1,140 +0,0 @@
|
|||||||
# Copyright 2008-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI="7"
|
|
||||||
|
|
||||||
inherit autotools elisp-common flag-o-matic multilib-minimal toolchain-funcs
|
|
||||||
|
|
||||||
if [[ "${PV}" == "9999" ]]; then
|
|
||||||
inherit git-r3
|
|
||||||
|
|
||||||
EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
|
|
||||||
EGIT_SUBMODULES=()
|
|
||||||
fi
|
|
||||||
|
|
||||||
DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
|
|
||||||
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
|
|
||||||
if [[ "${PV}" == "9999" ]]; then
|
|
||||||
SRC_URI=""
|
|
||||||
else
|
|
||||||
SRC_URI="https://github.com/protocolbuffers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
fi
|
|
||||||
|
|
||||||
LICENSE="BSD"
|
|
||||||
SLOT="0/26"
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
|
|
||||||
IUSE="emacs examples static-libs test zlib"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
BDEPEND="emacs? ( app-editors/emacs:* )"
|
|
||||||
DEPEND="test? ( >=dev-cpp/gtest-1.9[${MULTILIB_USEDEP}] )
|
|
||||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
|
||||||
RDEPEND="emacs? ( app-editors/emacs:* )
|
|
||||||
zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )"
|
|
||||||
|
|
||||||
PATCHES=(
|
|
||||||
"${FILESDIR}/${PN}-3.15.0-disable_no-warning-test.patch"
|
|
||||||
"${FILESDIR}/${PN}-3.15.0-system_libraries.patch"
|
|
||||||
"${FILESDIR}/${PN}-3.15.0-protoc_input_output_files.patch"
|
|
||||||
)
|
|
||||||
|
|
||||||
DOCS=(CHANGES.txt CONTRIBUTORS.txt README.md)
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
# https://github.com/protocolbuffers/protobuf/issues/7413
|
|
||||||
sed -e "/^AC_PROG_CXX_FOR_BUILD$/d" -i configure.ac || die
|
|
||||||
|
|
||||||
# https://github.com/protocolbuffers/protobuf/issues/8082
|
|
||||||
sed -e "/^TEST_F(IoTest, LargeOutput) {$/,/^}$/d" -i src/google/protobuf/io/zero_copy_stream_unittest.cc || die
|
|
||||||
|
|
||||||
# https://github.com/protocolbuffers/protobuf/issues/8459
|
|
||||||
sed \
|
|
||||||
-e "/^TEST(ArenaTest, BlockSizeSmallerThanAllocation) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
|
|
||||||
-e "/^TEST(ArenaTest, SpaceAllocated_and_Used) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" \
|
|
||||||
-i src/google/protobuf/arena_unittest.cc || die
|
|
||||||
|
|
||||||
# https://github.com/protocolbuffers/protobuf/issues/8460
|
|
||||||
sed -e "/^TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {$/a\\ if (sizeof(void*) == 4) {\n GTEST_SKIP();\n }" -i src/google/protobuf/any_test.cc || die
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI
|
|
||||||
|
|
||||||
if tc-ld-is-gold; then
|
|
||||||
# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
|
|
||||||
tc-ld-disable-gold
|
|
||||||
fi
|
|
||||||
|
|
||||||
multilib-minimal_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
local options=(
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
$(use_with zlib)
|
|
||||||
)
|
|
||||||
|
|
||||||
if tc-is-cross-compiler; then
|
|
||||||
# Build system uses protoc when building, so protoc copy runnable on host is needed.
|
|
||||||
mkdir -p "${WORKDIR}/build" || die
|
|
||||||
pushd "${WORKDIR}/build" > /dev/null || die
|
|
||||||
ECONF_SOURCE="${S}" econf_build "${options[@]}"
|
|
||||||
options+=(--with-protoc="$(pwd)/src/protoc")
|
|
||||||
popd > /dev/null || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
ECONF_SOURCE="${S}" econf "${options[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
multilib-minimal_src_compile
|
|
||||||
|
|
||||||
if use emacs; then
|
|
||||||
elisp-compile editors/protobuf-mode.el
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
if tc-is-cross-compiler; then
|
|
||||||
emake -C "${WORKDIR}/build/src" protoc
|
|
||||||
fi
|
|
||||||
|
|
||||||
default
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_test() {
|
|
||||||
emake check
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
find "${ED}" -name "*.la" -delete || die
|
|
||||||
|
|
||||||
insinto /usr/share/vim/vimfiles/syntax
|
|
||||||
doins editors/proto.vim
|
|
||||||
insinto /usr/share/vim/vimfiles/ftdetect
|
|
||||||
doins "${FILESDIR}/proto.vim"
|
|
||||||
|
|
||||||
if use emacs; then
|
|
||||||
elisp-install ${PN} editors/protobuf-mode.el*
|
|
||||||
elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use examples; then
|
|
||||||
DOCS+=(examples)
|
|
||||||
docompress -x /usr/share/doc/${PF}/examples
|
|
||||||
fi
|
|
||||||
|
|
||||||
einstalldocs
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postrm() {
|
|
||||||
use emacs && elisp-site-regen
|
|
||||||
}
|
|
@ -1,2 +1,2 @@
|
|||||||
DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
|
|
||||||
DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
|
DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
|
||||||
|
DIST re2-2021-11-01.tar.gz 408934 BLAKE2B 31662b1e9cdfec67347cbe146763a29cc8970683d545965e649a5f54ac318c40cd6daf553b6098fae7024a944f73914641b05970f1274511fac6766abe6b9130 SHA512 9ea04638b7a8667fa9a9d9894c543417c86dde21a93bd4508ae8a43fdd21384092866a3f55e93249942f36488c165e93bee18c61bab3cf138a920654563b8122
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
|||||||
DIST MooX-HandlesVia-0.001008.tar.gz 24385 BLAKE2B 9d6a72a9b9bc3bd99a145904e4148bb2c4bce6150b67431402d409ddb81b732a57a11935a10f2ddf2184b0fb8a93d57f6482fdde61508f73b8867fbc92e24c4f SHA512 ad5dd6c5a05d6f44788e31a74d595c3a6c1b8bf62f51d59bab2d65f6963c2995205ad64f6930b103026d3497d3d2a83bd192b7566228c31bf944265e060703c0
|
|
||||||
DIST MooX-HandlesVia-0.001009.tar.gz 24754 BLAKE2B 965da8297cb22e266b43c8bb79248db7122fca51e2ab98f6ef038463919b0e6128f0328cc3b02245031dbe3a3805963e3bf231c3ee5e959108fa8e821d500b4a SHA512 ea3521bf04c52db09068d4fa7cedd3642fd54fc40b5c88cde9340f0a3bb0da03f2aabbe22788a4f33ffedc628fc510c4fb57bdf3f7c9ce1b9316dd1408c2dd40
|
DIST MooX-HandlesVia-0.001009.tar.gz 24754 BLAKE2B 965da8297cb22e266b43c8bb79248db7122fca51e2ab98f6ef038463919b0e6128f0328cc3b02245031dbe3a3805963e3bf231c3ee5e959108fa8e821d500b4a SHA512 ea3521bf04c52db09068d4fa7cedd3642fd54fc40b5c88cde9340f0a3bb0da03f2aabbe22788a4f33ffedc628fc510c4fb57bdf3f7c9ce1b9316dd1408c2dd40
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=6
|
|
||||||
|
|
||||||
DIST_AUTHOR=MATTP
|
|
||||||
DIST_VERSION=0.001008
|
|
||||||
inherit perl-module
|
|
||||||
|
|
||||||
DESCRIPTION="NativeTrait-like behavior for Moo"
|
|
||||||
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
|
|
||||||
IUSE="test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-perl/Class-Method-Modifiers
|
|
||||||
>=dev-perl/Data-Perl-0.2.6
|
|
||||||
dev-perl/Module-Runtime
|
|
||||||
>=dev-perl/Moo-1.3.0
|
|
||||||
dev-perl/Role-Tiny
|
|
||||||
"
|
|
||||||
DEPEND="${RDEPEND}
|
|
||||||
virtual/perl-ExtUtils-MakeMaker
|
|
||||||
test? (
|
|
||||||
>=dev-perl/MooX-Types-MooseLike-0.230.0
|
|
||||||
dev-perl/Test-Exception
|
|
||||||
dev-perl/Test-Fatal
|
|
||||||
virtual/perl-Test-Simple
|
|
||||||
)
|
|
||||||
"
|
|
@ -1,2 +1 @@
|
|||||||
DIST MooX-StrictConstructor-0.010.tar.gz 14817 BLAKE2B d013ab60dd467d598a4617b3bc354df329d22114e2b4ee53a1f62af99c5ec7797bd8a48056cb43236429d97c74f6f576c2fa764e3c527c9a056f815675a5177f SHA512 17748ee05c1679d3cbade89b40a6f884bafc45244298f1dfcc5441dc81ab807394e6aafce483e302da8441ccb954aa1c7438b4449fcc373ecdcf81ad9e7cd864
|
|
||||||
DIST MooX-StrictConstructor-0.011.tar.gz 14954 BLAKE2B 2cb96ddc05a646133ab4406ad572a0369afd5a307e385f663ef24d4c06549a8e4578ed6bb91706b4b8e70f631a31bc0de87646b3dfea1d27783e1f38b5217d0d SHA512 9f977795ae3c746b8dd65573b8cc8ea69c8fcb13a8cc6725069bcf2479b96ea2954d5531a7c92189c5523218a9e66e431f510956472248c5f0795d952ee58eb1
|
DIST MooX-StrictConstructor-0.011.tar.gz 14954 BLAKE2B 2cb96ddc05a646133ab4406ad572a0369afd5a307e385f663ef24d4c06549a8e4578ed6bb91706b4b8e70f631a31bc0de87646b3dfea1d27783e1f38b5217d0d SHA512 9f977795ae3c746b8dd65573b8cc8ea69c8fcb13a8cc6725069bcf2479b96ea2954d5531a7c92189c5523218a9e66e431f510956472248c5f0795d952ee58eb1
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
# Copyright 2020 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
DIST_AUTHOR=HARTZELL
|
|
||||||
DIST_VERSION=0.010
|
|
||||||
inherit perl-module
|
|
||||||
|
|
||||||
DESCRIPTION="Make your Moo-based object constructors blow up on unknown attributes"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="test"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
RDEPEND="
|
|
||||||
dev-perl/Class-Method-Modifiers
|
|
||||||
>=dev-perl/Moo-1.1.0
|
|
||||||
dev-perl/strictures
|
|
||||||
"
|
|
||||||
BDEPEND="${RDEPEND}
|
|
||||||
virtual/perl-ExtUtils-MakeMaker
|
|
||||||
test? (
|
|
||||||
virtual/perl-File-Spec
|
|
||||||
virtual/perl-File-Temp
|
|
||||||
virtual/perl-IO
|
|
||||||
dev-perl/Test-Fatal
|
|
||||||
>=virtual/perl-Test-Simple-0.880.0
|
|
||||||
)
|
|
||||||
"
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue