sip: rebuild for Python 3.5

Switch to python3-* pkgs.
Convert python3.4-* pkgs into dummy pkgs.
This commit is contained in:
Alessio Sergi 2016-10-17 00:49:35 +02:00
parent 5eab0a9e07
commit cfa3804575
3 changed files with 61 additions and 53 deletions

1
srcpkgs/python3-sip Symbolic link
View File

@ -0,0 +1 @@
sip

1
srcpkgs/python3-sip-devel Symbolic link
View File

@ -0,0 +1 @@
sip

View File

@ -1,9 +1,9 @@
# Template file for 'sip'
pkgname=sip
version=4.18.1
revision=1
revision=2
wrksrc="sip-${version}"
hostmakedepends="python-devel python3.4-devel"
hostmakedepends="python-devel python3-devel"
makedepends="${hostmakedepends}"
short_desc="Python extension module generator for C/C++ libraries"
maintainer="Alessio Sergi <al3hex@gmail.com>"
@ -12,45 +12,41 @@ license="GPL-2, GPL-3, SIP"
distfiles="${SOURCEFORGE_SITE}/pyqt/sip-${version}.tar.gz"
checksum=9bce7a2dbf7f105bf68ad1bab58eebc0ce33087ec40396da756463f086ffa290
_do_sip_build() {
local pyver=${1:-2.7} pysufx=
if [ "$pyver" != "2.7" ]; then
pysufx="m"
fi
python${pyver} configure.py \
CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
INCDIR="${XBPS_CROSS_BASE}/usr/include/python${pyver}${pysufx}"
make ${makejobs}
}
pre_build() {
cp -a ${wrksrc} /tmp/sip-3.4
mv /tmp/sip-3.4 ${wrksrc}
mkdir -p sip-${py2_ver}
mv * sip-${py2_ver} || true
cp -a sip-${py2_ver} sip-${py3_ver}
}
do_build() {
# build python-sip
_do_sip_build
for pyver in $py2_ver $py3_ver; do
if [ "$pyver" != "$py2_ver" ]; then
pyinc="$py3_inc"
else
pyinc="$py2_inc"
fi
# build python3.4-sip
cd ${wrksrc}/sip-3.4
_do_sip_build 3.4
cd ${wrksrc}/sip-${pyver}
python${pyver} configure.py \
CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
LINK="${CXX}" LINK_SHLIB="${CXX}" LFLAGS="${LDFLAGS}" STRIP="" \
INCDIR="${XBPS_CROSS_BASE}/${pyinc}"
make ${makejobs}
done
}
do_install() {
cd ${wrksrc}/sip-${py2_ver}
# install sip
make DESTDIR=${DESTDIR} install -C sipgen
# install python-sip
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 usr/lib/python2.7/site-packages
vinstall sipdistutils.py 644 usr/lib/python2.7/site-packages
vinstall sipconfig.py 644 $py2_sitelib
vinstall sipdistutils.py 644 $py2_sitelib
# install python3.4-sip
cd ${wrksrc}/sip-3.4
# install python3-sip
cd ${wrksrc}/sip-${py3_ver}
make DESTDIR=${DESTDIR} install -C siplib
vinstall sipconfig.py 644 usr/lib/python3.4/site-packages
vinstall sipdistutils.py 644 usr/lib/python3.4/site-packages
vinstall sipconfig.py 644 $py3_sitelib
vinstall sipdistutils.py 644 $py3_sitelib
}
post_install() {
# Remove references to hardening -specs.
@ -65,39 +61,49 @@ python-sip_package() {
pycompile_module="sipconfig.py"
short_desc="Python2 SIP bindings"
pkg_install() {
vmove usr/lib/python2.7/site-packages/sip.so
vmove usr/lib/python2.7/site-packages/sipconfig.py
vmove usr/lib/python2.7/site-packages/sip.pyi
vmove ${py2_sitelib}/sip.so
vmove ${py2_sitelib}/sipconfig.py
vmove ${py2_sitelib}/sip.pyi
}
}
python-sip-devel_package() {
depends="python-sip-${version}_${revision}"
pycompile_module="sipdistutils.py"
short_desc="Python2 SIP bindings (development files)"
short_desc="Python2 SIP bindings - development files"
pkg_install() {
vmove usr/include/python2.7
vmove usr/lib/python2.7/site-packages/sipdistutils.py
vmove ${py2_inc}
vmove ${py2_sitelib}/sipdistutils.py
}
}
python3-sip_package() {
lib32disabled=yes
replaces="python3.4-sip>=0"
depends="${sourcepkg}-${version}_${revision} python3"
pycompile_module="sipconfig.py"
short_desc="Python3 SIP bindings"
pkg_install() {
vmove ${py3_sitelib}/sip.so
vmove ${py3_sitelib}/sipconfig.py
vmove ${py3_sitelib}/sip.pyi
}
}
python3-sip-devel_package() {
replaces="python3.4-sip-devel>=0"
depends="python3-sip-${version}_${revision}"
pycompile_module="sipdistutils.py"
short_desc="Python3 SIP bindings - development files"
pkg_install() {
vmove ${py3_inc}
vmove ${py3_sitelib}/sipdistutils.py
}
}
python3.4-sip_package() {
lib32disabled=yes
depends="${sourcepkg}-${version}_${revision} python3.4"
pycompile_version="3.4"
pycompile_module="sipconfig.py"
short_desc="Python3.4 SIP bindings"
pkg_install() {
vmove usr/lib/python3.4/site-packages/sip.so
vmove usr/lib/python3.4/site-packages/sipconfig.py
vmove usr/lib/python3.4/site-packages/sip.pyi
}
build_style=meta
short_desc="Python3.4 SIP bindings (transitional dummy package)"
depends="python3-sip>=${version}_${revision}"
}
python3.4-sip-devel_package() {
depends="python3.4-sip-${version}_${revision}"
pycompile_version="3.4"
pycompile_module="sipdistutils.py"
short_desc="Python3.4 SIP bindings (development files)"
pkg_install() {
vmove usr/include/python3.4m
vmove usr/lib/python3.4/site-packages/sipdistutils.py
}
build_style=meta
short_desc="Python3.4 SIP bindings - development files (transitional dummy package)"
depends="python3-sip-devel>=${version}_${revision}"
}