From 5477b714cf3ae74274993fcbb672ada4d0812545 Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Thu, 21 Aug 2014 21:08:10 +0200 Subject: [PATCH] netpbm: use SSE only where available. --- srcpkgs/netpbm/files/config.mk | 1 - srcpkgs/netpbm/template | 27 +++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/srcpkgs/netpbm/files/config.mk b/srcpkgs/netpbm/files/config.mk index 5c98d5f71dd..84c8018b906 100644 --- a/srcpkgs/netpbm/files/config.mk +++ b/srcpkgs/netpbm/files/config.mk @@ -12,4 +12,3 @@ TIFFLIB = libtiff.so JPEGLIB = libjpeg.so ZLIB = libz.so NETPBM_DOCURL = http://netpbm.sourceforge.net/doc/ -WANT_SSE = Y diff --git a/srcpkgs/netpbm/template b/srcpkgs/netpbm/template index 1ee7c0ae575..43a5ad3384b 100644 --- a/srcpkgs/netpbm/template +++ b/srcpkgs/netpbm/template @@ -1,7 +1,7 @@ # Template file for 'netpbm' pkgname=netpbm version=10.66.03 -revision=2 +revision=3 wrksrc=advanced hostmakedepends="pkg-config perl python flex" makedepends="libjpeg-turbo-devel tiff-devel libpng-devel zlib-devel libxml2-devel libX11-devel" @@ -15,23 +15,26 @@ checksum="705551823155dcfebdb6b914447769a62eefd7157efd1dae925b36fb7cc647b1 74bcf840ee643c6917330c382484010cb99c004a3fcf05391bebcac63815acb3" do_configure() { - cat config.mk.in ${FILESDIR}/config.mk >config.mk - sed -i 's|/link|/lib|' lib/Makefile - sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile + cat config.mk.in ${FILESDIR}/config.mk >config.mk + if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + echo "WANT_SSE = Y" >>config.mk + fi + sed -i 's|/link|/lib|' lib/Makefile + sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile } do_build() { - make CC=$CC CFLAGS="$CFLAGS" ${makejobs} - make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \ - -C ../doc -f "${PWD}/buildtools/manpage.mk" manpages + make CC=$CC CFLAGS="$CFLAGS" ${makejobs} + make MAKEMAN="${PWD}/buildtools/makeman" USERGUIDE=. \ + -C ../doc -f "${PWD}/buildtools/manpage.mk" manpages } do_install() { - make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev - rm $DESTDIR/usr/share/man/man?/* - make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" \ - -C ../doc -f "${PWD}/buildtools/manpage.mk" installman - vinstall doc/copyright_summary 644 usr/share/licenses/$pkgname + make pkgdir=$DESTDIR/usr PKGMANDIR=share/man install-run install-dev + rm $DESTDIR/usr/share/man/man?/* + make MAKEMAN="${PWD}/buildtools/makeman" MANDIR="$DESTDIR/usr/share/man" \ + -C ../doc -f "${PWD}/buildtools/manpage.mk" installman + vinstall doc/copyright_summary 644 usr/share/licenses/$pkgname } do_clean() {