mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 08:56:58 +02:00
dev-lang/python-oem: Apply Flatcar modifications
Apply Flatcar modifications. Unlike python <= 3.9.12, it is now unnecessary to replace virtual/awk with app-alternatives/awk, because the upstream python ebuild already has app-alternatives/awk. Based on 32b448f8ccbf5f814739f834151803532272b1f9.
This commit is contained in:
parent
ba76a751c5
commit
ce6bdc5915
@ -4,7 +4,7 @@
|
|||||||
EAPI="7"
|
EAPI="7"
|
||||||
WANT_LIBTOOL="none"
|
WANT_LIBTOOL="none"
|
||||||
|
|
||||||
inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
|
inherit autotools check-reqs flag-o-matic multiprocessing
|
||||||
inherit prefix python-utils-r1 toolchain-funcs verify-sig
|
inherit prefix python-utils-r1 toolchain-funcs verify-sig
|
||||||
|
|
||||||
MY_PV=${PV/_rc/rc}
|
MY_PV=${PV/_rc/rc}
|
||||||
@ -29,46 +29,21 @@ S="${WORKDIR}/${MY_P}"
|
|||||||
LICENSE="PSF-2"
|
LICENSE="PSF-2"
|
||||||
SLOT="${PYVER}"
|
SLOT="${PYVER}"
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||||
IUSE="
|
IUSE="hardened"
|
||||||
bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
|
|
||||||
+readline +sqlite +ssl test tk valgrind +xml
|
|
||||||
"
|
|
||||||
RESTRICT="!test? ( test )"
|
|
||||||
|
|
||||||
# Do not add a dependency on dev-lang/python to this ebuild.
|
# Do not add a dependency on dev-lang/python to this ebuild.
|
||||||
# If you need to apply a patch which requires python for bootstrapping, please
|
# If you need to apply a patch which requires python for bootstrapping, please
|
||||||
# run the bootstrap code on your dev box and include the results in the
|
# run the bootstrap code on your dev box and include the results in the
|
||||||
# patchset. See bug 447752.
|
# patchset. See bug 447752.
|
||||||
|
|
||||||
RDEPEND="
|
DEPEND="
|
||||||
app-arch/bzip2:=
|
app-arch/bzip2:=
|
||||||
app-arch/xz-utils:=
|
app-arch/xz-utils:=
|
||||||
dev-lang/python-exec[python_targets_python3_9(-)]
|
dev-lang/python-exec[python_targets_python3_9(-)]
|
||||||
dev-libs/libffi:=
|
|
||||||
sys-apps/util-linux:=
|
sys-apps/util-linux:=
|
||||||
>=sys-libs/zlib-1.1.3:=
|
>=sys-libs/zlib-1.1.3:=
|
||||||
virtual/libcrypt:=
|
virtual/libcrypt:=
|
||||||
virtual/libintl
|
virtual/libintl
|
||||||
ensurepip? ( dev-python/ensurepip-wheels )
|
|
||||||
gdbm? ( sys-libs/gdbm:=[berkdb] )
|
|
||||||
ncurses? ( >=sys-libs/ncurses-5.2:= )
|
|
||||||
readline? ( >=sys-libs/readline-4.1:= )
|
|
||||||
sqlite? ( >=dev-db/sqlite-3.3.8:3= )
|
|
||||||
ssl? ( >=dev-libs/openssl-1.1.1:= )
|
|
||||||
tk? (
|
|
||||||
>=dev-lang/tcl-8.0:=
|
|
||||||
>=dev-lang/tk-8.0:=
|
|
||||||
dev-tcltk/blt:=
|
|
||||||
dev-tcltk/tix
|
|
||||||
)
|
|
||||||
xml? ( >=dev-libs/expat-2.1:= )
|
|
||||||
"
|
|
||||||
# bluetooth requires headers from bluez
|
|
||||||
DEPEND="
|
|
||||||
${RDEPEND}
|
|
||||||
bluetooth? ( net-wireless/bluez )
|
|
||||||
test? ( app-arch/xz-utils[extra-filters(+)] )
|
|
||||||
valgrind? ( dev-util/valgrind )
|
|
||||||
"
|
"
|
||||||
# autoconf-archive needed to eautoreconf
|
# autoconf-archive needed to eautoreconf
|
||||||
BDEPEND="
|
BDEPEND="
|
||||||
@ -77,9 +52,6 @@ BDEPEND="
|
|||||||
virtual/pkgconfig
|
virtual/pkgconfig
|
||||||
verify-sig? ( sec-keys/openpgp-keys-python )
|
verify-sig? ( sec-keys/openpgp-keys-python )
|
||||||
"
|
"
|
||||||
RDEPEND+="
|
|
||||||
!build? ( app-misc/mime-types )
|
|
||||||
"
|
|
||||||
|
|
||||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
|
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
|
||||||
|
|
||||||
@ -88,14 +60,6 @@ CHECKREQS_DISK_BUILD=5500M
|
|||||||
|
|
||||||
QA_PKGCONFIG_VERSION=${PYVER}
|
QA_PKGCONFIG_VERSION=${PYVER}
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
use test && check-reqs_pkg_pretend
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
use test && check-reqs_pkg_setup
|
|
||||||
}
|
|
||||||
|
|
||||||
src_unpack() {
|
src_unpack() {
|
||||||
if use verify-sig; then
|
if use verify-sig; then
|
||||||
verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
|
verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
|
||||||
@ -104,10 +68,6 @@ src_unpack() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
# Ensure that internal copies of expat and libffi are not used.
|
|
||||||
rm -r Modules/expat || die
|
|
||||||
rm -r Modules/_ctypes/libffi* || die
|
|
||||||
|
|
||||||
local PATCHES=(
|
local PATCHES=(
|
||||||
"${WORKDIR}/${PATCHSET}"
|
"${WORKDIR}/${PATCHSET}"
|
||||||
)
|
)
|
||||||
@ -128,25 +88,15 @@ src_prepare() {
|
|||||||
|
|
||||||
src_configure() {
|
src_configure() {
|
||||||
# disable automagic bluetooth headers detection
|
# disable automagic bluetooth headers detection
|
||||||
if ! use bluetooth; then
|
export ac_cv_header_bluetooth_bluetooth_h=no
|
||||||
local -x ac_cv_header_bluetooth_bluetooth_h=no
|
disable+=" gdbm"
|
||||||
fi
|
disable+=" _curses _curses_panel"
|
||||||
local disable
|
disable+=" readline"
|
||||||
use gdbm || disable+=" gdbm"
|
disable+=" _sqlite3"
|
||||||
use ncurses || disable+=" _curses _curses_panel"
|
export PYTHON_DISABLE_SSL="1"
|
||||||
use readline || disable+=" readline"
|
disable+=" _tkinter"
|
||||||
use sqlite || disable+=" _sqlite3"
|
|
||||||
use ssl || export PYTHON_DISABLE_SSL="1"
|
|
||||||
use tk || disable+=" _tkinter"
|
|
||||||
use xml || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
|
|
||||||
export PYTHON_DISABLE_MODULES="${disable}"
|
export PYTHON_DISABLE_MODULES="${disable}"
|
||||||
|
|
||||||
if ! use xml; then
|
|
||||||
ewarn "You have configured Python without XML support."
|
|
||||||
ewarn "This is NOT a recommended configuration as you"
|
|
||||||
ewarn "may face problems parsing any XML documents."
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
|
if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
|
||||||
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
|
einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
|
||||||
fi
|
fi
|
||||||
@ -159,42 +109,17 @@ src_configure() {
|
|||||||
append-cflags $(test-flags-CC -ffat-lto-objects)
|
append-cflags $(test-flags-CC -ffat-lto-objects)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if tc-is-cross-compiler; then
|
||||||
|
# Force some tests that try to poke fs paths.
|
||||||
|
export ac_cv_file__dev_ptc=no
|
||||||
|
export ac_cv_file__dev_ptmx=yes
|
||||||
|
fi
|
||||||
|
|
||||||
# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
|
# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
|
||||||
# PKG_CONFIG needed for cross.
|
# PKG_CONFIG needed for cross.
|
||||||
tc-export CXX PKG_CONFIG
|
tc-export CXX PKG_CONFIG
|
||||||
|
|
||||||
local dbmliborder=
|
local dbmliborder=
|
||||||
if use gdbm; then
|
|
||||||
dbmliborder+="${dbmliborder:+:}gdbm"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use pgo; then
|
|
||||||
local profile_task_flags=(
|
|
||||||
-m test
|
|
||||||
"-j$(makeopts_jobs)"
|
|
||||||
--pgo-extended
|
|
||||||
-x test_gdb
|
|
||||||
-u-network
|
|
||||||
|
|
||||||
# All of these seem to occasionally hang for PGO inconsistently
|
|
||||||
# They'll even hang here but be fine in src_test sometimes.
|
|
||||||
# bug #828535 (and related: bug #788022)
|
|
||||||
-x test_asyncio
|
|
||||||
-x test_httpservers
|
|
||||||
-x test_logging
|
|
||||||
-x test_multiprocessing_fork
|
|
||||||
-x test_socket
|
|
||||||
-x test_xmlrpc
|
|
||||||
)
|
|
||||||
|
|
||||||
if has_version "app-arch/rpm" ; then
|
|
||||||
# Avoid sandbox failure (attempts to write to /var/lib/rpm)
|
|
||||||
profile_task_flags+=(
|
|
||||||
-x test_distutils
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
local -x PROFILE_TASK="${profile_task_flags[*]}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
local myeconfargs=(
|
local myeconfargs=(
|
||||||
# glibc-2.30 removes it; since we can't cleanly force-rebuild
|
# glibc-2.30 removes it; since we can't cleanly force-rebuild
|
||||||
@ -202,22 +127,22 @@ src_configure() {
|
|||||||
# a chance for users rebuilding python before glibc
|
# a chance for users rebuilding python before glibc
|
||||||
ac_cv_header_stropts_h=no
|
ac_cv_header_stropts_h=no
|
||||||
|
|
||||||
--enable-shared
|
--prefix=/usr/share/oem/python
|
||||||
|
--with-platlibdir=$(get_libdir)
|
||||||
|
--disable-shared
|
||||||
--enable-ipv6
|
--enable-ipv6
|
||||||
--infodir='${prefix}/share/info'
|
--infodir='/discard/info'
|
||||||
--mandir='${prefix}/share/man'
|
--mandir='/discard/man'
|
||||||
|
--includedir='/discard/include'
|
||||||
--with-computed-gotos
|
--with-computed-gotos
|
||||||
--with-dbmliborder="${dbmliborder}"
|
--with-dbmliborder="${dbmliborder}"
|
||||||
--with-libc=
|
--with-libc=
|
||||||
--enable-loadable-sqlite-extensions
|
--enable-loadable-sqlite-extensions
|
||||||
--without-ensurepip
|
--without-ensurepip
|
||||||
--with-system-expat
|
--without-system-expat
|
||||||
--with-system-ffi
|
--without-system-ffi
|
||||||
--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
|
--without-lto
|
||||||
|
--disable-optimizations
|
||||||
$(use_with lto)
|
|
||||||
$(use_enable pgo optimizations)
|
|
||||||
$(use_with valgrind)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# disable implicit optimization/debugging flags
|
# disable implicit optimization/debugging flags
|
||||||
@ -288,11 +213,6 @@ src_configure() {
|
|||||||
local -x LDFLAGS_NODIST=${LDFLAGS}
|
local -x LDFLAGS_NODIST=${LDFLAGS}
|
||||||
local -x CFLAGS= LDFLAGS=
|
local -x CFLAGS= LDFLAGS=
|
||||||
|
|
||||||
# Fix implicit declarations on cross and prefix builds. Bug #674070.
|
|
||||||
if use ncurses; then
|
|
||||||
append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
|
|
||||||
fi
|
|
||||||
|
|
||||||
hprefixify setup.py
|
hprefixify setup.py
|
||||||
econf "${myeconfargs[@]}"
|
econf "${myeconfargs[@]}"
|
||||||
|
|
||||||
@ -319,157 +239,33 @@ src_compile() {
|
|||||||
# bug #831897
|
# bug #831897
|
||||||
local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
|
local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
|
||||||
|
|
||||||
if use pgo ; then
|
|
||||||
# bug 660358
|
|
||||||
local -x COLUMNS=80
|
|
||||||
local -x PYTHONDONTWRITEBYTECODE=
|
|
||||||
|
|
||||||
addpredict "/usr/lib/python${PYVER}/site-packages"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# also need to clear the flags explicitly here or they end up
|
# also need to clear the flags explicitly here or they end up
|
||||||
# in _sysconfigdata*
|
# in _sysconfigdata*
|
||||||
emake CPPFLAGS= CFLAGS= LDFLAGS=
|
emake CPPFLAGS= CFLAGS= LDFLAGS=
|
||||||
|
|
||||||
# Restore saved value from above.
|
# Restore saved value from above.
|
||||||
local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
|
local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
|
||||||
|
|
||||||
# Work around bug 329499. See also bug 413751 and 457194.
|
|
||||||
if has_version dev-libs/libffi[pax-kernel]; then
|
|
||||||
pax-mark E python
|
|
||||||
else
|
|
||||||
pax-mark m python
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
# Tests will not work when cross compiling.
|
|
||||||
if tc-is-cross-compiler; then
|
|
||||||
elog "Disabling tests due to crosscompiling."
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
local test_opts=(
|
|
||||||
-u-network
|
|
||||||
-j "$(makeopts_jobs)"
|
|
||||||
|
|
||||||
# fails
|
|
||||||
-x test_gdb
|
|
||||||
)
|
|
||||||
|
|
||||||
if use sparc ; then
|
|
||||||
# bug #788022
|
|
||||||
test_opts+=(
|
|
||||||
-x test_multiprocessing_fork
|
|
||||||
-x test_multiprocessing_forkserver
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
# workaround docutils breaking tests
|
|
||||||
cat > Lib/docutils.py <<-EOF || die
|
|
||||||
raise ImportError("Thou shalt not import!")
|
|
||||||
EOF
|
|
||||||
|
|
||||||
# bug 660358
|
|
||||||
local -x COLUMNS=80
|
|
||||||
local -x PYTHONDONTWRITEBYTECODE=
|
|
||||||
|
|
||||||
nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
|
|
||||||
CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
|
|
||||||
local ret=${?}
|
|
||||||
|
|
||||||
rm Lib/docutils.py || die
|
|
||||||
|
|
||||||
[[ ${ret} -eq 0 ]] || die "emake test failed"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
src_install() {
|
src_install() {
|
||||||
local libdir=${ED}/usr/lib/python${PYVER}
|
local prefix=/usr/share/oem/python
|
||||||
|
local eprefix="${ED}${prefix}"
|
||||||
|
local elibdir="${eprefix}/$(get_libdir)"
|
||||||
|
local epythonplatlibdir="${elibdir}/python${PYVER}"
|
||||||
|
local bindir="${prefix}/bin"
|
||||||
|
local ebindir="${eprefix}/bin"
|
||||||
|
|
||||||
emake DESTDIR="${D}" altinstall
|
emake DESTDIR="${D}" altinstall
|
||||||
|
|
||||||
# Remove static library
|
# Remove static library
|
||||||
rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
|
rm "${elibdir}"/libpython*.a || die
|
||||||
|
|
||||||
# Fix collisions between different slots of Python.
|
rm -r "${epythonplatlibdir}/"{sqlite3,test/test_sqlite*} || die
|
||||||
rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
|
rm -r "${ebindir}/idle${PYVER}" "${epythonplatlibdir}/"{idlelib,tkinter,test/test_tk*} || die
|
||||||
|
|
||||||
# Cheap hack to get version with ABIFLAGS
|
# create a simple versionless 'python' symlink
|
||||||
local abiver=$(cd "${ED}/usr/include"; echo python*)
|
dosym "python${PYVER}" "${bindir}/python"
|
||||||
if [[ ${abiver} != python${PYVER} ]]; then
|
dosym "python${PYVER}" "${bindir}/python3"
|
||||||
# Replace python3.X with a symlink to python3.Xm
|
|
||||||
rm "${ED}/usr/bin/python${PYVER}" || die
|
|
||||||
dosym "${abiver}" "/usr/bin/python${PYVER}"
|
|
||||||
# Create python3.X-config symlink
|
|
||||||
dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
|
|
||||||
# Create python-3.5m.pc symlink
|
|
||||||
dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# python seems to get rebuilt in src_install (bug 569908)
|
rm -r "${ED}/discard" || die
|
||||||
# Work around it for now.
|
|
||||||
if has_version dev-libs/libffi[pax-kernel]; then
|
|
||||||
pax-mark E "${ED}/usr/bin/${abiver}"
|
|
||||||
else
|
|
||||||
pax-mark m "${ED}/usr/bin/${abiver}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -r "${libdir}"/ensurepip/_bundled || die
|
|
||||||
if ! use ensurepip; then
|
|
||||||
rm -r "${libdir}"/ensurepip || die
|
|
||||||
fi
|
|
||||||
if ! use sqlite; then
|
|
||||||
rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
|
|
||||||
fi
|
|
||||||
if ! use tk; then
|
|
||||||
rm -r "${ED}/usr/bin/idle${PYVER}" || die
|
|
||||||
rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
dodoc Misc/{ACKS,HISTORY,NEWS}
|
|
||||||
|
|
||||||
if use examples; then
|
|
||||||
docinto examples
|
|
||||||
find Tools -name __pycache__ -exec rm -fr {} + || die
|
|
||||||
dodoc -r Tools
|
|
||||||
fi
|
|
||||||
insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
|
|
||||||
local libname=$(
|
|
||||||
printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
|
|
||||||
emake --no-print-directory -s -f - 2>/dev/null
|
|
||||||
)
|
|
||||||
newins Tools/gdb/libpython.py "${libname}"-gdb.py
|
|
||||||
|
|
||||||
newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
|
|
||||||
newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
|
|
||||||
sed \
|
|
||||||
-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
|
|
||||||
-e "s:@PYDOC@:pydoc${PYVER}:" \
|
|
||||||
-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
|
|
||||||
"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
|
|
||||||
|
|
||||||
# python-exec wrapping support
|
|
||||||
local pymajor=${PYVER%.*}
|
|
||||||
local EPYTHON=python${PYVER}
|
|
||||||
local scriptdir=${D}$(python_get_scriptdir)
|
|
||||||
mkdir -p "${scriptdir}" || die
|
|
||||||
# python and pythonX
|
|
||||||
ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
|
|
||||||
ln -s "python${pymajor}" "${scriptdir}/python" || die
|
|
||||||
# python-config and pythonX-config
|
|
||||||
# note: we need to create a wrapper rather than symlinking it due
|
|
||||||
# to some random dirname(argv[0]) magic performed by python-config
|
|
||||||
cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
|
|
||||||
#!/bin/sh
|
|
||||||
exec "${abiver}-config" "\${@}"
|
|
||||||
EOF
|
|
||||||
chmod +x "${scriptdir}/python${pymajor}-config" || die
|
|
||||||
ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
|
|
||||||
# 2to3, pydoc
|
|
||||||
ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
|
|
||||||
ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
|
|
||||||
# idle
|
|
||||||
if use tk; then
|
|
||||||
ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user