Mon Sep 8 09:12:50 2014 UTC ()
Explicitly pass --cpu=amd64 for MACHINE_ARCH=x86_64, fixes build on SunOS.


(jperkin)
diff -r1.32 -r1.33 pkgsrc/security/botan/Makefile
cvs diff -r1.32 -r1.33 pkgsrc/security/botan/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/botan/Attic/Makefile 2014/05/09 07:37:17 1.32
+++ pkgsrc/security/botan/Attic/Makefile 2014/09/08 09:12:50 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.32 2014/05/09 07:37:17 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2014/09/08 09:12:50 jperkin Exp $
2 2
3DISTNAME= Botan-1.8.14 3DISTNAME= Botan-1.8.14
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/ 6MASTER_SITES= http://files.randombit.net/botan/archive/v1.8/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://botan.randombit.net/ 10HOMEPAGE= http://botan.randombit.net/
11COMMENT= Portable, easy to use, and efficient C++ crypto library 11COMMENT= Portable, easy to use, and efficient C++ crypto library
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
@@ -18,26 +18,27 @@ PYTHON_FOR_BUILD_ONLY= yes @@ -18,26 +18,27 @@ PYTHON_FOR_BUILD_ONLY= yes
18PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.8.14; 1.10 is supposedly better 18PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.8.14; 1.10 is supposedly better
19 19
20CONFIG_SHELL= ${PYTHONBIN} 20CONFIG_SHELL= ${PYTHONBIN}
21CONFIGURE_SCRIPT= ./configure.py 21CONFIGURE_SCRIPT= ./configure.py
22CONFIGURE_ARGS+= --prefix=${PREFIX} 22CONFIGURE_ARGS+= --prefix=${PREFIX}
23 23
24MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} 24MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q}
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28PLIST_VARS+= i386 x86 x86_64 ppc arm 28PLIST_VARS+= i386 x86 x86_64 ppc arm
29 29
30.if ${MACHINE_ARCH} == "x86_64" 30.if ${MACHINE_ARCH} == "x86_64"
 31CONFIGURE_ARGS+= --cpu=amd64
31PLIST.x86_64= yes 32PLIST.x86_64= yes
32PLIST.x86= yes 33PLIST.x86= yes
33.elif ${MACHINE_ARCH} == "i386" 34.elif ${MACHINE_ARCH} == "i386"
34CONFIGURE_ARGS+= --cpu=i386 35CONFIGURE_ARGS+= --cpu=i386
35PLIST.i386= yes 36PLIST.i386= yes
36PLIST.x86= yes 37PLIST.x86= yes
37.elif ${MACHINE_ARCH} == "powerpc" 38.elif ${MACHINE_ARCH} == "powerpc"
38CONFIGURE_ARGS+= --cpu=ppc 39CONFIGURE_ARGS+= --cpu=ppc
39PLIST.ppc= yes 40PLIST.ppc= yes
40.elif ${MACHINE_ARCH} == "powerpc64" 41.elif ${MACHINE_ARCH} == "powerpc64"
41CONFIGURE_ARGS+= --cpu=ppc64 42CONFIGURE_ARGS+= --cpu=ppc64
42PLIST.ppc= yes 43PLIST.ppc= yes
43.elif ${MACHINE_ARCH} == "arm" 44.elif ${MACHINE_ARCH} == "arm"