diff --git a/srcpkgs/python/template b/srcpkgs/python/template index c12f9a4481..167823697d 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -24,10 +24,10 @@ _confargs="--with-threads --enable-ipv6 --with-signal-module --enable-shared if [ "$XBPS_CROSS_BUILD" ]; then # cross build; have to build it in 2 stages: native and host. - do_build() { + do_configure() { # Native build env CC=gcc LD=ld AS=as RANLIB=ranlib CFLAGS= LDFLAGS= OPT="-Os" \ - ./configure && make ${makejobs} python Parser/pgen || return 1 + ./configure && make ${makejobs} python Parser/pgen mv python hostpython mv Parser/pgen Parser/hostpgen make distclean @@ -38,13 +38,14 @@ if [ "$XBPS_CROSS_BUILD" ]; then CFLAGS="$CFLAGS -I$XBPS_CROSS_BASE/include" \ LDFLAGS="$LDFLAGS -L$XBPS_CROSS_BASE/lib" \ ./configure ${CONFIGURE_SHARED_ARGS} \ - ${_confargs} ac_cv_buggy_getaddrinfo=no || return 1 + ${_confargs} ac_cv_buggy_getaddrinfo=no + } + do_build() { make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen \ BLDSHARED="${XBPS_CROSS_TRIPLET}-gcc -shared" \ CROSS_COMPILE=$XBPS_CROSS_TARGET CROSS_COMPILE_TARGET=yes \ HOSTARCH=$XBPS_CROSS_TRIPLET BUILDARCH=$XBPS_MACHINE-unknown-linux-gnu \ - PYTHON_XCOMPILE_DEPENDENCIES_PREFIX="$XBPS_CROSS_BASE" \ - ${makejobs} || return 1 + PYTHON_XCOMPILE_DEPENDENCIES_PREFIX="$XBPS_CROSS_BASE" ${makejobs} } do_install() { # cross install