Merge updates from master

This commit is contained in:
Repository mirror & CI
2023-07-25 15:16:38 +00:00
6 changed files with 161 additions and 140 deletions

View File

@@ -0,0 +1,160 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_11 )
VER="12.2.0_20230208"
CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}"
inherit python-r1
DESCRIPTION="Espressif IoT Development Framework"
HOMEPAGE="https://www.espressif.com/"
# https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip
https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20221002/xtensa-esp-elf-gdb-12.1_20221002-x86_64-linux-gnu.tar.gz"
SRC_URI+=" esp32? ( ${CROSSTOOL_URL}/xtensa-esp32-elf-${VER}-x86_64-linux-gnu.tar.xz )"
SRC_URI+=" esp32s2? ( ${CROSSTOOL_URL}/xtensa-esp32s2-elf-${VER}-x86_64-linux-gnu.tar.xz )"
SRC_URI+=" esp32s3? ( ${CROSSTOOL_URL}/xtensa-esp32s3-elf-${VER}-x86_64-linux-gnu.tar.xz )"
SRC_URI+=" riscv32? ( ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
KEYWORDS="~amd64"
LICENSE="Apache-2.0"
IUSE="+esp32 esp32s2 esp32s3 riscv32"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
SLOT="0"
BDEPEND="app-arch/unzip"
RDEPEND="
${PYTHON_DEPS}
dev-libs/libusb:1
dev-python/click[${PYTHON_USEDEP}]
dev-python/pyserial[${PYTHON_USEDEP}]
dev-python/cryptography[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/pyelftools[${PYTHON_USEDEP}]
dev-embedded/esp-coredump[${PYTHON_USEDEP}]
dev-embedded/esptool
dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}]
dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}]
dev-embedded/esp-idf-size[${PYTHON_USEDEP}]
dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
"
RESTRICT="strip"
QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
QA_PRESTRIPPED="opt/*"
PATCHES=(
"${FILESDIR}/allow-system-install-${PN}-5.0.2.patch"
"${FILESDIR}/pyparsing-${P}.patch"
)
S="${WORKDIR}/${PN}-v${PV}"
install_tool() {
shopt -s globstar
into /opt/${1}
if [[ -d "../${1}/lib" ]]; then
if stat *.so &>/dev/null; then
for i in ../${1}/lib/**/*.so*; do
dolib.so ${i}
done
fi
if stat *.a &>/dev/null; then
for i in ../${1}/lib/**/*.a*; do
dolib.a ${i}
done
fi
insinto /opt/${1}/lib
doins -r ../${1}/lib/*
fi
exeinto /opt/${1}/bin
doexe ../${1}/bin/*
(
cd ../${1}
for i in libexec/**/*; do
exeinto /opt/${1}/$(dirname ${i})
if [[ -x "${i}" && ! -d "${i}" ]]; then
doexe ${i}
fi
done
if [[ -d "include" ]]; then
insinto /opt/${1}
doins -r include
fi
if [[ -d "share" ]]; then
insinto /opt/${1}
doins -r share
fi
)
(
cd "${D}"/opt/${1}/bin/ || die
for i in *; do
dodir /opt/bin
cd "${D}"/opt/bin || die
dosym ../${1}/bin/${i} /opt/bin/${i}
done
)
shopt -u globstar
}
src_install() {
echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf
dobin idf
if use esp32; then
install_tool xtensa-esp32-elf
install_tool xtensa-esp32-elf/xtensa-esp32-elf
fi
if use esp32s2; then
install_tool xtensa-esp32s2-elf
install_tool xtensa-esp32s2-elf/xtensa-esp32s2-elf
fi
if use esp32s3; then
install_tool xtensa-esp32s3-elf
install_tool xtensa-esp32s3-elf/xtensa-esp32s3-elf
fi
if use riscv32; then
install_tool riscv32-esp-elf
install_tool riscv32-esp-elf/riscv32-esp-elf
fi
install_tool openocd-esp32
# Remove unsupported python versions
rm "${WORKDIR}"/xtensa-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{6..10} || die
install_tool xtensa-esp-elf-gdb
echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die
doenvd 99esp-idf
insinto /usr/share/${PN}
rm -r .git || die
find . -name ".git" -exec rm -rf {} \; || die
doins -r .
}

View File

@@ -1,2 +1 @@
DIST dwarfs-0.7.0-RC4.tar.xz 14425176 BLAKE2B fdb2852da81f8d567c19dc83e3f7dd74e0de35e56579d50b6ce9ee6adda2d540bbbc7d5655a499f19ee340a2f904bfe9b2b977b9539e8e99dc9e8667b9b7435e SHA512 1e0d603507f93b6bcb79050877de0ac64eed931b192b43466d3b5e1ee55a759261ad937d33f24d145a61e8b3d431405a35bbd8ff95ead10ccdabe14ba4d840a5
DIST dwarfs-0.7.0.tar.xz 14516672 BLAKE2B c48527f84af0c96ca573af94d1cdc9637ab5bc99934f02b457eec80548399ba362ebc20f6bc5d44d780e29d9538d6045f334a24b4264d49ab02c39fdfddc54bf SHA512 52ea209590a97ee11a902103b3862c55d733a899e199c5e436c4ad5f5278c10f6425c7e35853dd173e260f93e946628e2ac5677706af4ab4486c5af712265f27
DIST dwarfs-0.7.2.tar.xz 15108504 BLAKE2B 85cb90ea7d20c3c067c126dc7f7a65145041f6ef2853f96a89ca425a8a1dab9d49a0a21daa9590037aa0a9fcfc4f11fbb91d4417213318a699472532400017bb SHA512 5f455b4e15ac3ef5fba8cf26295c4bce19b613d5bc09781ed0a0fd77c2ae73b197e50dce411a21b856aababb59a1800e767c40d55f0f86d88badf021042c1fd6

View File

@@ -1,111 +0,0 @@
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
inherit check-reqs cmake flag-o-matic python-single-r1
MY_PV="${PV/_rc/-RC}"
DESCRIPTION="A fast very high compression read-only FUSE file system"
HOMEPAGE="https://github.com/mhx/dwarfs"
SRC_URI="https://github.com/mhx/dwarfs/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64"
IUSE="python +jemalloc test man"
S="${WORKDIR}/dwarfs-${MY_PV}"
PATCHES=(
"${FILESDIR}/dwarfs-0.7.0_rc4-stdexcept.patch"
"${FILESDIR}/dwarfs-0.7.0_rc4-fbthrift-cstdint.patch"
)
RDEPEND="
${PYTHON_DEPS}
app-arch/libarchive
app-arch/lz4
app-arch/snappy
app-arch/xz-utils
app-arch/zstd
dev-cpp/gflags
dev-cpp/glog[gflags]
dev-cpp/parallel-hashmap:=
dev-libs/boost[context,python?]
dev-libs/double-conversion
dev-libs/libevent
dev-libs/libfmt
dev-libs/xxhash
sys-fs/fuse:3
dev-libs/fsst
sys-libs/binutils-libs
sys-libs/libunwind
sys-libs/zlib
!dev-cpp/fbthrift
!dev-cpp/fizz
!dev-cpp/folly
!dev-cpp/wangle
jemalloc? ( >=dev-libs/jemalloc-5.3.0-r1 )
"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/patchelf
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
man? ( app-text/ronn-ng )
test? ( dev-cpp/gtest )
"
DOCS=( "README.md" "CHANGES.md" "TODO" )
RESTRICT="!test? ( test )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
CHECKREQS_DISK_BUILD="1300M"
CMAKE_IN_SOURCE_BUILD=1
CMAKE_WARN_UNUSED_CLI=0
src_prepare(){
rm -r zstd xxHash parallel-hashmap || die
cmake_src_prepare
sed "s/DESTINATION lib/DESTINATION $(get_libdir)/" -i CMakeLists.txt || die
}
src_configure(){
append-cxxflags "-I/usr/include"
mycmakeargs=(
-DUSE_JEMALLOC=$(usex jemalloc ON OFF)
-DWITH_PYTHON=$(usex python ON OFF)
-DWITH_TESTS=$(usex test ON OFF)
-DWITH_MAN_PAGES=$(usex man ON OFF)
-DPREFER_SYSTEM_ZSTD=ON
-DPREFER_SYSTEM_XXHASH=ON
-DPREFER_SYSTEM_GTEST=ON
-DPREFER_SYSTEM_LIBFMT=ON
-DWITH_LEGACY_FUSE=OFF
)
use python && mycmakeargs+=( "-DWITH_PYTHON_VERSION=${EPYTHON#python}" )
cmake_src_configure
}
src_install(){
cmake_src_install
# Remove insecure RPATH from bundled lib
patchelf --remove-rpath libdwarfs.so || die
patchelf --remove-rpath libdwarfs_tool.so || die
dolib.so libdwarfs.so libdwarfs_tool.so libdwarfs_compression.so libthrift_light.so libmetadata_thrift.so
dolib.so folly/libfolly.so folly/libfolly.so.0.58.0-dev
}
pkg_postinst(){
elog "You may find more information in the"
elog "${HOMEPAGE}"
elog "About creating: ${HOMEPAGE}/blob/main/doc/mkdwarfs.md"
elog "About mounting: ${HOMEPAGE}/blob/main/doc/dwarfs.md"
}

View File

@@ -1,13 +0,0 @@
diff --git a/fbthrift/thrift/compiler/generate/json.cc b/fbthrift/thrift/compiler/generate/json.cc
index c4d87a3..015e81f 100644
--- a/fbthrift/thrift/compiler/generate/json.cc
+++ b/fbthrift/thrift/compiler/generate/json.cc
@@ -18,7 +18,7 @@
#include <ostream>
#include <sstream>
-
+#include <cstdint>
namespace apache {
namespace thrift {
namespace compiler {

View File

@@ -1,14 +0,0 @@
diff --git a/folly/folly/system/AtFork.cpp b/folly/folly/system/AtFork.cpp
index e888e52..8c9eee5 100644
--- a/folly/folly/system/AtFork.cpp
+++ b/folly/folly/system/AtFork.cpp
@@ -20,7 +20,8 @@
#include <folly/lang/Exception.h>
#include <folly/portability/PThread.h>
#include <folly/synchronization/SanitizeThread.h>
-
+#include <system_error>
+#include <stdexcept>
namespace folly {
void AtForkList::prepare() noexcept {