From d8260a3ec330c29f0e1a1e9e374295671482b7dd Mon Sep 17 00:00:00 2001 From: obache Date: Thu, 25 Dec 2014 06:27:57 +0000 Subject: Define COMPILER_SPECIFIC_HEADER with pkgsrc way, and prepare PLIST. Own detection in configure script with compiler name basisis is not good enough, and required header file may not be installed. resolve PR pkg/49496 by Sevan Janiyan. --- math/blitz++/Makefile | 24 ++++++++++++++++++++++-- math/blitz++/PLIST | 3 ++- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'math') diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile index 71148490505..582b6029c1e 100644 --- a/math/blitz++/Makefile +++ b/math/blitz++/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2013/04/06 20:27:24 rodent Exp $ +# $NetBSD: Makefile,v 1.19 2014/12/25 06:27:57 obache Exp $ DISTNAME= blitz-0.8 PKGNAME= blitz++-0.8 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= math devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blitz/} @@ -17,4 +17,24 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-doxygen INFO_FILES= yes +.include "../../mk/compiler.mk" + +.if !empty(CC_VERSION:MIntel*) +COMPILER_SPECIFIC_HEADER= intel +.elif !empty(CC_VERSION:MIBM*) +COMPILER_SPECIFIC_HEADER= ibm +.elif !empty(CC_VERSION:MCCC*) +COMPILER_SPECIFIC_HEADER= compaq +.elif !empty(CC_VERSION:Mhp*) +COMPILER_SPECIFIC_HEADER= hp +.elif !empty(CC_VERSION:MMIPSpro*) +COMPILER_SPECIFIC_HEADER= sgi +.elif !empty(CC_VERSION:Mgcc*) +COMPILER_SPECIFIC_HEADER= gnu +.endif +.ifdef COMPILER_SPECIFIC_HEADER +CONFIGURE_ENV+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER}/bzconfig.h +.endif +PLIST_SUBST+=COMPILER_SPECIFIC_HEADER=${COMPILER_SPECIFIC_HEADER:Dinclude/blitz/${COMPILER_SPECIFIC_HEADER}/bzconfig.h:U@comment} + .include "../../mk/bsd.pkg.mk" diff --git a/math/blitz++/PLIST b/math/blitz++/PLIST index 1e9ba8cb4c7..6a81faa3599 100644 --- a/math/blitz++/PLIST +++ b/math/blitz++/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:05:41 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/12/25 06:27:57 obache Exp $ +${COMPILER_SPECIFIC_HEADER} include/blitz/applics.h include/blitz/array-impl.h include/blitz/array-old.h -- cgit v1.2.3