From 0974b760acf3c8dfc5d734cc8866b14574bdb5ad Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 16 Mar 2016 09:52:58 +0100 Subject: [PATCH] fox: force xbps-src CFLAGS, do not build internal strtoll. --- srcpkgs/fox/template | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/srcpkgs/fox/template b/srcpkgs/fox/template index 16cc0ba024f..968d9b89e38 100644 --- a/srcpkgs/fox/template +++ b/srcpkgs/fox/template @@ -1,11 +1,12 @@ # Template file for 'fox' pkgname=fox version=1.6.51 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-release --with-xft=yes --with-opengl=yes --with-xim --with-xshm --with-shape --with-xcursor --with-xrender --with-xrandr - --with-xfixes --with-xinput" + --with-xfixes --with-xinput + ac_cv_func_strtoll=yes" makedepends="zlib-devel bzip2-devel libXcursor-devel libXft-devel libXrandr-devel libXi-devel libpng-devel tiff-devel glu-devel" short_desc="Free Objects for X: GUI Toolkit for C++" @@ -14,10 +15,17 @@ homepage="http://www.fox-toolkit.org/" license="LGPL-2.1, MIT" distfiles="http://ftp.fox-toolkit.org/pub/fox-$version.tar.gz" checksum=15a99792965d933a4936e48b671c039657546bdec6a318c223ab1131624403d1 -broken="http://build.voidlinux.eu/builders/x86_64-musl_builder/builds/9960" CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" +pre_configure() { + sed -i "/strtoll.\(cpp\|obj\)/d; s/strtoll.lo//" src/Makefile.in +} + +pre_build() { + sed -i "s#CXXFLAGS =.*#\0 $CXXFLAGS#" $(find -name Makefile) +} + fox-devel_package() { depends="${makedepends} fox-${version}_${revision}" short_desc+=" - development files"