From 7c2eed035274a511afcd7823549637b3c3cd5791 Mon Sep 17 00:00:00 2001 From: Steve Prybylski Date: Sun, 13 Sep 2015 14:34:56 -0400 Subject: [PATCH] geany-plugins: fix cross compile for geanypy and markdown plugins --- srcpkgs/geany-plugins/template | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/srcpkgs/geany-plugins/template b/srcpkgs/geany-plugins/template index a57e8210774..a055e370f7d 100644 --- a/srcpkgs/geany-plugins/template +++ b/srcpkgs/geany-plugins/template @@ -1,7 +1,7 @@ # Template file for 'geany-plugins' pkgname=geany-plugins version=1.25 -revision=1 +revision=2 build_style=gnu-configure # XXX: gitchangebar plugin not compatible with libgit2 right now configure_args="--enable-all-plugins --disable-gitchangebar" @@ -17,18 +17,22 @@ homepage="http://plugins.geany.org" distfiles="https://github.com/geany/geany-plugins/archive/1.25.tar.gz" checksum=626e606b5766685c86bae622f78912900b95b4a1c43c086ed9a3862691f8b257 -replaces="geany-plugins<${version}" - -if [ "$CROSS_BUILD" ]; then - # these plugins break cross-compile - configure_args+=" --disable-geanypy --disable-markdown" -fi - pre_configure() { NOCONFIGURE=1 ./autogen.sh + + if [ "$CROSS_BUILD" ]; then + # Use cross prefix for python + sed -e "s;-L\$ac_python_libdir;-L${XBPS_CROSS_BASE}/usr/lib;g" \ + -e "s;PYTHON_CPPFLAGS=\$python_path;PYTHON_CPPFLAGS=-I${XBPS_CROSS_BASE}/usr/include/python2.7;g" -i configure + fi } -# these plugins require extra dependencies +pre_build() { + # XXX: Compile 'leg' for host arch. + make CC=cc CFLAGS="" -C "markdown/peg-markdown/peg-0.1.9" +} + +# These plugins require extra dependencies geany-plugins-extra_package() { short_desc="${_short_desc} - extra plugins" pkg_install() { @@ -44,6 +48,10 @@ geany-plugins-extra_package() { vmove usr/share/doc/geany-plugins/${p} fi done + + vmove usr/lib/geany-plugins/geanylua + vmove usr/lib/geany/geanypy + vmove usr/share/geany/geanypy } }