From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/
Date: Sat, 20 Apr 2024 19:47:39 +0000 (UTC) [thread overview]
Message-ID: <1713642445.64a76907fb19980476a40fd2ae8230af2fe9126b.ceamac@gentoo> (raw)
commit: 64a76907fb19980476a40fd2ae8230af2fe9126b
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 19:36:33 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 19:47:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a76907
dev-embedded/libftdi: enable py3.12
Require >=dev-lang/swig-4.2.0 because that's where they added support
for Python 3.12 in swig. In this case this is not strictly required,
because swig-4.1.1 generates the same files, so the requirement can
be relaxed if needed.
Closes: https://bugs.gentoo.org/929394
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
...{libftdi-9999.ebuild => libftdi-0.20-r3.ebuild} | 63 +++++++++++-----------
.../{libftdi-9999.ebuild => libftdi-1.5-r6.ebuild} | 5 +-
dev-embedded/libftdi/libftdi-9999.ebuild | 4 +-
3 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-0.20-r3.ebuild
similarity index 60%
copy from dev-embedded/libftdi/libftdi-9999.ebuild
copy to dev-embedded/libftdi/libftdi-0.20-r3.ebuild
index bb804f1f7033..da4a55f0c65e 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-0.20-r3.ebuild
@@ -3,80 +3,79 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1
-MY_P="${PN}1-${PV}"
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
else
- SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
- S="${WORKDIR}/${MY_P}"
-
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
- PATCHES=(
- "${FILESDIR}"/${P}-tests-no-cxx.patch
- "${FILESDIR}"/${P}-cmake-cxx.patch
- )
+ SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
DESCRIPTION="Userspace access to FTDI USB interface chips"
HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
LICENSE="LGPL-2"
-SLOT="1"
-IUSE="cxx doc examples python test tools"
-RESTRICT="!test? ( test )"
+SLOT="0"
+IUSE="cxx doc examples python static-libs"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
- virtual/libusb:1
+ virtual/libusb:0
cxx? ( dev-libs/boost )
+ doc? ( !dev-embedded/libftdi:1[doc] )
python? ( ${PYTHON_DEPS} )
- tools? ( dev-libs/confuse:= )
-"
-DEPEND="${RDEPEND}
- test? ( dev-libs/boost )
"
+DEPEND="${RDEPEND}"
BDEPEND="
doc? ( app-text/doxygen )
- python? ( dev-lang/swig )
+ python? ( >=dev-lang/swig-4.2.0 )
"
+PATCHES=(
+ "${FILESDIR}"/${P}-cmake-include.patch
+ "${FILESDIR}"/${P}-cmake-version.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
+src_prepare() {
+ if use python; then
+ sed -i \
+ -e "s:[$]{PYTHON_LIB_INSTALL}/../site-packages:$(python_get_sitedir):" \
+ bindings/CMakeLists.txt || die
+ fi
+ sed -i \
+ -e '/SET(LIB_SUFFIX /d' \
+ CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
src_configure() {
local mycmakeargs=(
-DFTDIPP=$(usex cxx)
-DDOCUMENTATION=$(usex doc)
-DEXAMPLES=$(usex examples)
-DPYTHON_BINDINGS=$(usex python)
- -DBUILD_TESTS=$(usex test)
- -DFTDI_EEPROM=$(usex tools)
-DCMAKE_SKIP_BUILD_RPATH=ON
- -DSTATICLIBS=OFF
)
- cmake_src_configure
-}
-src_test() {
- cd "${BUILD_DIR}/test" || die
- LD_LIBRARY_PATH="${BUILD_DIR}/src" ./test_libftdi1 -l all || die
+ cmake_src_configure
}
src_install() {
cmake_src_install
-
use python && python_optimize
- dodoc AUTHORS ChangeLog README TODO
+ dodoc ChangeLog README
if use doc ; then
# Clean up man pages with too generic names. #356369
- rm -vf "${BUILD_DIR}"/doc/man/man3/_* || die
+ rm -vf "${BUILD_DIR}"/doc/man/man3/{_,usb_,deprecated}* || die
doman "${BUILD_DIR}"/doc/man/man3/*
dodoc -r "${BUILD_DIR}"/doc/html
@@ -86,4 +85,6 @@ src_install() {
docinto examples
dodoc examples/*.c
fi
+
+ use static-libs || rm "${ED}"/usr/$(get_libdir)/${PN}.a || die
}
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
similarity index 94%
copy from dev-embedded/libftdi/libftdi-9999.ebuild
copy to dev-embedded/libftdi/libftdi-1.5-r6.ebuild
index bb804f1f7033..267cb1a06ce6 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r6.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1
MY_P="${PN}1-${PV}"
@@ -34,6 +34,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
virtual/libusb:1
cxx? ( dev-libs/boost )
+ doc? ( !dev-embedded/libftdi:0[doc] )
python? ( ${PYTHON_DEPS} )
tools? ( dev-libs/confuse:= )
"
@@ -42,7 +43,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
doc? ( app-text/doxygen )
- python? ( dev-lang/swig )
+ python? ( >=dev-lang/swig-4.2.0 )
"
pkg_setup() {
diff --git a/dev-embedded/libftdi/libftdi-9999.ebuild b/dev-embedded/libftdi/libftdi-9999.ebuild
index bb804f1f7033..0430681351f7 100644
--- a/dev-embedded/libftdi/libftdi-9999.ebuild
+++ b/dev-embedded/libftdi/libftdi-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit cmake python-single-r1
MY_P="${PN}1-${PV}"
@@ -42,7 +42,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="
doc? ( app-text/doxygen )
- python? ( dev-lang/swig )
+ python? ( >=dev-lang/swig-4.2.0 )
"
pkg_setup() {
next reply other threads:[~2024-04-20 19:47 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-20 19:47 Viorel Munteanu [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-24 15:03 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/libftdi/ Arthur Zamarin
2024-09-24 15:03 Arthur Zamarin
2024-08-09 17:45 Arthur Zamarin
2024-08-09 17:43 Arthur Zamarin
2024-07-02 10:02 Sam James
2024-07-02 10:02 Sam James
2024-06-19 13:20 Sam James
2024-06-19 13:18 Sam James
2024-06-08 7:12 Sam James
2024-06-08 6:35 Arthur Zamarin
2024-06-08 5:51 Arthur Zamarin
2024-06-08 5:40 Arthur Zamarin
2024-05-29 14:43 Jakov Smolić
2024-05-29 14:43 Jakov Smolić
2024-05-29 11:47 Sam James
2024-05-29 11:47 Sam James
2023-08-20 9:33 Viorel Munteanu
2023-08-20 9:33 Viorel Munteanu
2023-04-19 11:14 Viorel Munteanu
2023-04-19 11:14 Viorel Munteanu
2023-04-19 11:07 Sam James
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19 10:16 Arthur Zamarin
2023-04-19 9:47 Arthur Zamarin
2023-04-19 9:45 Sam James
2023-04-19 9:45 Sam James
2023-04-19 9:43 Sam James
2023-04-19 9:43 Sam James
2023-04-19 9:43 Sam James
2023-04-19 9:43 Sam James
2023-04-19 9:41 Arthur Zamarin
2023-03-31 19:48 Viorel Munteanu
2023-03-31 19:48 Viorel Munteanu
2023-03-31 19:48 Viorel Munteanu
2022-12-02 18:44 WANG Xuerui
2022-11-10 5:28 Sam James
2022-11-10 5:10 Sam James
2022-04-29 19:06 Sam James
2022-04-29 19:06 Sam James
2022-02-02 4:44 Craig Andrews
2021-08-22 0:07 Marek Szuba
2021-08-22 0:07 Marek Szuba
2021-05-06 21:20 Sam James
2021-05-01 14:06 Sam James
2021-04-30 23:39 Sam James
2021-04-30 23:37 Sam James
2021-04-30 23:29 Sam James
2021-04-30 20:28 Sergei Trofimovich
2021-04-30 15:23 Agostino Sarubbo
2021-02-26 13:55 Sam James
2021-02-25 18:34 Sergei Trofimovich
2021-02-25 8:32 Sam James
2021-02-25 7:31 Sam James
2021-02-25 1:41 Sam James
2021-02-24 20:25 Sam James
2021-02-24 20:24 Sam James
2021-02-05 7:23 Sam James
2021-01-27 18:33 Sam James
2021-01-27 18:25 Sam James
2021-01-27 18:25 Sam James
2020-12-28 15:17 David Seifert
2020-12-28 15:17 David Seifert
2020-12-28 8:22 Sam James
2020-12-27 21:40 Sam James
2020-12-27 20:48 Sam James
2020-12-27 20:46 Sam James
2020-12-27 20:34 Sam James
2020-12-27 20:27 Sam James
2020-12-27 20:19 Sam James
2020-07-10 11:53 Andreas Sturmlechner
2020-06-09 13:53 Agostino Sarubbo
2020-06-09 13:51 Agostino Sarubbo
2020-06-09 13:50 Agostino Sarubbo
2020-06-09 13:49 Agostino Sarubbo
2020-06-09 13:47 Agostino Sarubbo
2020-06-09 13:45 Agostino Sarubbo
2020-06-08 17:29 Matt Turner
2020-06-08 16:34 Mart Raudsepp
2020-02-10 11:54 Michał Górny
2018-07-26 0:44 Mikle Kolyada
2018-07-23 18:42 Sergei Trofimovich
2018-07-20 3:58 Jeroen Roovers
2018-07-15 10:25 Sergei Trofimovich
2018-05-01 7:41 Markus Meier
2018-04-03 21:43 Sergei Trofimovich
2017-12-25 10:43 David Seifert
2017-11-22 10:24 Jeroen Roovers
2017-06-26 10:03 Alexis Ballier
2017-05-19 15:31 David Seifert
2017-05-18 22:38 Michael Weber
2017-05-12 14:55 Agostino Sarubbo
2017-05-06 7:27 Markus Meier
2017-05-01 13:37 Agostino Sarubbo
2017-02-18 10:32 Michał Górny
2016-06-24 7:47 Mike Frysinger
2016-06-24 7:47 Mike Frysinger
2016-06-11 16:44 Agostino Sarubbo
2016-06-08 19:29 Markus Meier
2015-12-31 13:11 Sven Wegener
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1713642445.64a76907fb19980476a40fd2ae8230af2fe9126b.ceamac@gentoo \
--to=ceamac@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox