libpeas: disable tests during cross instead of force linking against py2&3.

Simply linking against both python versions doesn't work, we get the error
'Attempting to mix incompatible Python versions' upon loading Python plugins.
Also enables glade catalog generation while we're at it.
This commit is contained in:
Rasmus Thomsen 2019-03-27 23:49:10 +01:00 committed by maxice8
parent 3846115aac
commit 2fddcc7f5d

View file

@ -1,27 +1,32 @@
# Template file for 'libpeas' # Template file for 'libpeas'
pkgname=libpeas pkgname=libpeas
version=1.22.0 version=1.22.0
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
build_helper="gir" build_helper="gir"
hostmakedepends="pkg-config intltool glib-devel" hostmakedepends="pkg-config intltool glib-devel python python3 lua51"
makedepends="vala-devel gtk+3-devel python-gobject-devel makedepends="vala-devel gtk+3-devel python3-gobject-devel python-gobject-devel
python3-gobject-devel" glade3-devel lua51-devel"
depends="python-gobject hicolor-icon-theme gjs>=1.38" depends="python3-gobject hicolor-icon-theme gjs>=1.38
$(vopt_if python2 python-gobject)"
short_desc="Gobject-based plugins engine" short_desc="Gobject-based plugins engine"
maintainer="Enno Boland <gottox@voidlinux.org>" maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2" license="LGPL-2.1-or-later"
homepage="http://www.gtk.org/" homepage="https://wiki.gnome.org/Projects/Libpeas"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962 checksum=5b2fc0f53962b25bca131a5ec0139e6fef8e254481b6e777975f7a1d2702a962
LDFLAGS="-lpython2.7 -lpython3.6m"
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in
i686-musl|x86_64-musl) ;; i686-musl|x86_64-musl) ;;
*-musl) broken="gobject-introspection" ;; *-musl) broken="gobject-introspection" ;;
esac esac
pre_build() {
if [ "$CROSS_BUILD" ]; then
vsed 's|tests||g' -i Makefile
fi
}
post_install() { post_install() {
# Remove demo. # Remove demo.
rm -rf ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/peas-demo rm -rf ${DESTDIR}/usr/bin ${DESTDIR}/usr/lib/peas-demo
@ -37,5 +42,6 @@ libpeas-devel_package() {
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
vmove usr/share/gir-1.0 vmove usr/share/gir-1.0
vmove usr/share/gtk-doc vmove usr/share/gtk-doc
vmove usr/share/glade
} }
} }