-
Notifications
You must be signed in to change notification settings - Fork 164
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dev-python/cadquery: updating dependencies #1211
Draft
Equidamoid
wants to merge
7
commits into
gentoo:master
Choose a base branch
from
Equidamoid:cadquery-dependencies-2023
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
c09c8b2
dev-libs/lief: bump to 0.12.3
Equidamoid 79b97ad
dev-python/cymbal: python3_11 compat
Equidamoid cd359d7
dev-python/ezdxf: python3_11 compat
Equidamoid c0ae507
dev-python/logzero: python3_11 compat
Equidamoid 3e5be01
dev-python/multimethod: python3_11 compat
Equidamoid ae97f72
dev-python/schema: python3_11 compat
Equidamoid 476457b
dev-python/typish: python3_11 compat
Equidamoid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
DIST lief-0.11.5.tar.gz 15519537 BLAKE2B 87f16a62df6290652ee1d301b7b067e11882c12066a3abaa4eff750c3a7fd19353001fec6a7d7e70273815064b401707f1afcad9a2006a81c2f1d118fb448d17 SHA512 fa215e6193eadd6be3f8cff92b304ca5a03db24fcb7f48b258318b8f674527fc45f6e3765ca3d6055e7a4e9f2672b2d198df02bbfcc4fa96cb36b9255df7c0c4 | ||
DIST lief-0.12.3.tar.gz 15570645 BLAKE2B d8714d73268c1156c7443725acacc01fee0b4d442dc988b082efcd56b6e29a0d5e17f10a8791c1397df7df8c1fb4b931603aa66a9bac3c82676e8bcf6e483ec6 SHA512 3f48978af2d96e9e469aca1fc4adcfd3475576ba32273d451f881e33b0fc062b0c2b625af10c54c2a0b6a9678e5ce7666499c1c36f578250dab217352f4717e0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index eadac9a6..10f1396e 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -674,7 +674,6 @@ endif() | ||
|
||
if(UNIX) | ||
include(GNUInstallDirs) | ||
- set(CMAKE_INSTALL_LIBDIR "lib") | ||
else() | ||
if(WIN32) | ||
set(CMAKE_INSTALL_LIBDIR "lib") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
EAPI=7 | ||
|
||
CMAKE_ECLASS=cmake | ||
PYTHON_COMPAT=( python3_10 pypy3 ) | ||
PYTHON_COMPAT=( python3_11 pypy3 ) | ||
|
||
# Upstream has two alternate approaches to building its Python API: | ||
# 1. A working "CMakeList.txt" only supporting a single Python target. | ||
|
@@ -27,6 +27,8 @@ KEYWORDS="~amd64 ~x86" | |
IUSE="c examples +python static-libs" | ||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} !abi_x86_32 !abi_x86_x32 )" | ||
|
||
PATCHES=( "${FILESDIR}" ) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this here? |
||
|
||
# See "cmake/LIEFDependencies.cmake" for C and C++ dependencies. | ||
BDEPEND=" | ||
python? ( | ||
|
@@ -37,7 +39,11 @@ BDEPEND=" | |
" | ||
#FIXME: Add after bumping to the next stable release: | ||
# >=dev-libs/spdlog-1.8.5[${MULTILIB_USEDEP}] | ||
RDEPEND="python? ( ${PYTHON_DEPS} )" | ||
RDEPEND=" | ||
dev-cpp/nlohmann_json | ||
>=dev-libs/utfcpp-3.2.1 | ||
python? ( ${PYTHON_DEPS} ) | ||
" | ||
DEPEND="${RDEPEND}" | ||
|
||
# LIEF tests are non-trivial (if not infeasible) to run in the general case. | ||
|
@@ -58,10 +64,6 @@ pkg_setup() { | |
#vendored dependency resembling the existing "LIEF_EXTERNAL_SPDLOG" option. | ||
#Note that LIEF patches the vendored "Boost leaf" and "utfcpp" dependencies. | ||
src_prepare() { | ||
# Respect "multilib"-based lib dirnames. | ||
sed -i -e 's~\bDESTINATION lib\(64\)\{0,1\}\b~DESTINATION ${CMAKE_INSTALL_LIBDIR}~' \ | ||
CMakeLists.txt || die | ||
|
||
# Respect "python"-based installation of Python bindings. Upstream | ||
# currently fails to install these bindings, resulting in Gentoo "RUNPATH" | ||
# QA notices at installation time. See also: | ||
|
@@ -91,16 +93,8 @@ multilib_src_configure() { | |
-DLIEF_PROFILING=OFF | ||
-DLIEF_SUPPORT_CXX14=ON | ||
-DLIEF_USE_CCACHE=OFF # Defer to Portage itself for "ccache" support. | ||
|
||
# Disabling LIEF's format options causes build failures. See also: | ||
# https://github.com/lief-project/LIEF/issues/599 | ||
-DLIEF_ELF=ON | ||
-DLIEF_PE=ON | ||
-DLIEF_MACHO=ON | ||
-DLIEF_ART=ON | ||
-DLIEF_DEX=ON | ||
-DLIEF_OAT=ON | ||
-DLIEF_VDEX=ON | ||
-DLIEF_OPT_NLOHMANN_JSON_EXTERNAL=ON | ||
-DLIEF_OPT_UTFCPP_EXTERNAL=ON | ||
|
||
-DBUILD_SHARED_LIBS="$(usex static-libs OFF ON)" | ||
-DLIEF_C_API="$(usex c ON OFF)" | ||
|
@@ -110,11 +104,9 @@ multilib_src_configure() { | |
-DLIEF_INSTALL_PYTHON="$(usex python ON OFF)" | ||
|
||
#FIXME: Add USE flags governing most or all of these options. | ||
-DLIEF_ENABLE_JSON=OFF | ||
-DLIEF_DOC=OFF | ||
-DLIEF_FUZZING=OFF | ||
-DLIEF_INSTALL_COMPILED_EXAMPLES=OFF | ||
-DLIEF_LOGGING=OFF | ||
-DLIEF_LOGGING_DEBUG=OFF | ||
-DLIEF_TESTS=OFF | ||
-DLIEF_ASAN=OFF | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
3.10 doesn't work in this version?