Skip to content
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.

Sign up for GitHub

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

Jump to bottom

dev-libs/capstone: drop 4.0.2-r2, various maintenance #36470

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+21 −110
Open

dev-libs/capstone: drop 4.0.2-r2, various maintenance #36470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
155e996
dev-libs/capstone: remove 'distutils_enable_tests setup.py'
hamarituc Apr 28, 2024
62fd9c3
dev-libs/capstone: fix patch for upstream changes
hamarituc Apr 28, 2024
630989b
dev-libs/capstone: add missing RESTRICT
hamarituc Apr 28, 2024
2395545
dev-libs/capstone: drop 4.0.2-r2
hamarituc Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions dev-libs/capstone/capstone-5.0.1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ DEPEND="${RDEPEND}
BDEPEND="${DISTUTILS_DEPS}"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

distutils_enable_tests setup.py

if [[ ${PV} == *_rc* ]]; then
# Upstream doesn't flag release candidates (bug 858350)
QA_PKGCONFIG_VERSION=""
Expand Down Expand Up @@ -90,3 +88,7 @@ src_install() {
find "${ED}" -name '*.a' -delete || die
fi
}

python_test() {
emake check
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at the Makefile, this isn't going to work, as this target doesn't fail if tests fail.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't confuse Makefile with bindings/python/Makefile. The check target in the former one indeed discards all errors (but luckily the checks are executed through CMake as well):

check: $(TESTS)

test_%:
        ./tests/$@ > /dev/null && echo OK || echo FAILED

python_test is executed in bindings/python so the check target of the latter Makefile applies:

check:
        @for t in $(TESTS); do \
                echo Check $$t ... ; \
                ./$$t > /dev/null; \
                if [ $$? -eq 0 ]; then echo OK; else echo FAILED; exit 1; fi \
        done

This target fails if the first check fails.

}
8 changes: 5 additions & 3 deletions dev-libs/capstone/capstone-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8
Expand Down Expand Up @@ -42,8 +42,6 @@ PATCHES=(
"${FILESDIR}/${P}-werror.patch"
)

distutils_enable_tests setup.py

if [[ ${PV} == *_rc* ]]; then
# Upstream doesn't flag release candidates (bug 858350)
QA_PKGCONFIG_VERSION=""
Expand Down Expand Up @@ -97,3 +95,7 @@ src_install() {
find "${ED}" -name '*.a' -delete || die
fi
}

python_test() {
emake check
}