diff --git a/srcpkgs/python-cairo/files/python-config b/srcpkgs/python-cairo/files/python-config deleted file mode 100644 index ee6ce9e04a2..00000000000 --- a/srcpkgs/python-cairo/files/python-config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# python wrapper for cross compilation in xbps -# we simply fake the output of --includes with the cross prefix. -if [ "$1" = "--includes" ]; then - echo "-I${XBPS_CROSS_BASE}/usr/include/python2.7" -fi - -exit 0 diff --git a/srcpkgs/python-cairo/template b/srcpkgs/python-cairo/template index 8c68612ac78..64d65b80d88 100644 --- a/srcpkgs/python-cairo/template +++ b/srcpkgs/python-cairo/template @@ -5,6 +5,7 @@ revision=4 lib32disabled=yes wrksrc="py2cairo-${version}" build_style=gnu-configure +configure_args="PYTHON=python" hostmakedepends="automake libtool pkg-config which python-devel" makedepends="cairo-devel python-devel" depends="python>=2.7" @@ -20,15 +21,9 @@ checksum=d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 pre_configure() { touch ChangeLog NOCONFIGURE=1 autoreconf -fi -} - -do_configure() { if [ "$CROSS_BUILD" ]; then - # create a python-config wrapper to fake --includes - install -m755 ${FILESDIR}/python-config ${wrksrc} - export PATH=${wrksrc}:$PATH + ln -s ${wrksrc}/.xbps/bin/python-config ${wrksrc} fi - env PYTHON=python ./configure ${configure_args} } python-cairo-devel_package() {