Wed Nov 23 13:01:54 2016 UTC ()
Restore explicit CPU selection based on MACHINE_ARCH, needing e.g. on
SmartOS.


(joerg)
diff -r1.17 -r1.18 pkgsrc/security/botan-devel/Makefile
cvs diff -r1.17 -r1.18 pkgsrc/security/botan-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/security/botan-devel/Attic/Makefile 2016/11/11 19:46:05 1.17
+++ pkgsrc/security/botan-devel/Attic/Makefile 2016/11/23 13:01:54 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.17 2016/11/11 19:46:05 joerg Exp $ 1# $NetBSD: Makefile,v 1.18 2016/11/23 13:01:54 joerg Exp $
2 2
3DISTNAME= Botan-1.11.33 3DISTNAME= Botan-1.11.33
4PKGNAME= ${DISTNAME:tl} 4PKGNAME= ${DISTNAME:tl}
5CATEGORIES= security 5CATEGORIES= security
6MASTER_SITES= http://botan.randombit.net/releases/ 6MASTER_SITES= http://botan.randombit.net/releases/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@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
@@ -17,26 +17,38 @@ USE_LANGUAGES= c++ @@ -17,26 +17,38 @@ USE_LANGUAGES= c++
17PYTHON_FOR_BUILD_ONLY= yes 17PYTHON_FOR_BUILD_ONLY= yes
18 18
19CONFIG_SHELL= ${PYTHONBIN} 19CONFIG_SHELL= ${PYTHONBIN}
20CONFIGURE_SCRIPT= ./configure.py 20CONFIGURE_SCRIPT= ./configure.py
21CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost --destdir=${DESTDIR}${PREFIX} 21CONFIGURE_ARGS+= --prefix=${PREFIX} --with-zlib --with-boost --destdir=${DESTDIR}${PREFIX}
22 22
23REPLACE_PYTHON+= *.py src/scripts/*.py 23REPLACE_PYTHON+= *.py src/scripts/*.py
24 24
25.include "../../mk/compiler.mk" 25.include "../../mk/compiler.mk"
26.if !empty(PKGSRC_COMPILER:Mclang) 26.if !empty(PKGSRC_COMPILER:Mclang)
27CONFIGURE_ARGS+= --cc-bin=${CXX} --cc=clang 27CONFIGURE_ARGS+= --cc-bin=${CXX} --cc=clang
28.endif 28.endif
29 29
 30.if ${MACHINE_ARCH} == "x86_64"
 31CONFIGURE_ARGS+= --cpu=amd64
 32.elif ${MACHINE_ARCH} == "i386"
 33CONFIGURE_ARGS+= --cpu=i386
 34.elif ${MACHINE_ARCH} == "powerpc"
 35CONFIGURE_ARGS+= --cpu=ppc
 36.elif ${MACHINE_ARCH} == "powerpc64"
 37CONFIGURE_ARGS+= --cpu=ppc64
 38.elif ${MACHINE_ARCH} == "arm"
 39CONFIGURE_ARGS+= --cpu=arm
 40.endif
 41
30MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q} 42MAKE_FLAGS+= LIB_OPT=${CXXFLAGS:Q}
31 43
32USE_TOOLS+= gmake 44USE_TOOLS+= gmake
33 45
34PY_PATCHPLIST= yes 46PY_PATCHPLIST= yes
35 47
36MAKE_FLAGS.SunOS+= USER_APP_LINKS_TO=-lnsl 48MAKE_FLAGS.SunOS+= USER_APP_LINKS_TO=-lnsl
37 49
38.include "../../devel/zlib/buildlink3.mk" 50.include "../../devel/zlib/buildlink3.mk"
39.include "../../devel/boost-libs/buildlink3.mk" 51.include "../../devel/boost-libs/buildlink3.mk"
40.include "../../lang/python/application.mk" 52.include "../../lang/python/application.mk"
41.include "../../lang/python/extension.mk" 53.include "../../lang/python/extension.mk"
42.include "../../mk/bsd.pkg.mk" 54.include "../../mk/bsd.pkg.mk"