Sat Apr 22 08:23:17 2017 UTC ()
Remove SunOS too.  Unbreaks build.


(jperkin)
diff -r1.83 -r1.84 pkgsrc/devel/gmp/Makefile
cvs diff -r1.83 -r1.84 pkgsrc/devel/gmp/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gmp/Makefile 2017/04/22 07:01:07 1.83
+++ pkgsrc/devel/gmp/Makefile 2017/04/22 08:23:17 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.83 2017/04/22 07:01:07 adam Exp $ 1# $NetBSD: Makefile,v 1.84 2017/04/22 08:23:17 jperkin Exp $
2 2
3DISTNAME= gmp-6.1.2 3DISTNAME= gmp-6.1.2
4CATEGORIES= devel math 4CATEGORIES= devel math
5MASTER_SITES= https://gmplib.org/download/gmp/ 5MASTER_SITES= https://gmplib.org/download/gmp/
6MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/} 6MASTER_SITES+= ${MASTER_SITE_GNU:=gmp/}
7# Use .tar.bz2 distfile so that no extra dependency on archivers/xz 7# Use .tar.bz2 distfile so that no extra dependency on archivers/xz
8# is needed when building lang/gcc* with option gcc-inplace-math. 8# is needed when building lang/gcc* with option gcc-inplace-math.
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://gmplib.org/ 12HOMEPAGE= http://gmplib.org/
13COMMENT= Library for arbitrary precision arithmetic 13COMMENT= Library for arbitrary precision arithmetic
14LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2 14LICENSE= gnu-lgpl-v3 OR gnu-gpl-v2
@@ -37,28 +37,27 @@ CONFIGURE_ARGS+= --enable-cxx @@ -37,28 +37,27 @@ CONFIGURE_ARGS+= --enable-cxx
37PLIST.cxx= yes 37PLIST.cxx= yes
38.endif 38.endif
39 39
40.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI) 40.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
41ABI= o32 41ABI= o32
42.endif 42.endif
43 43
44.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 44.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
45# The configure script thinks gcc 2.95 for ARM is too buggy to use. 45# The configure script thinks gcc 2.95 for ARM is too buggy to use.
46GCC_REQD+= 3.0 46GCC_REQD+= 3.0
47.endif 47.endif
48 48
49.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" 49.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
50# XXX SunOS should work, but currently bombs in mpn/fat.c 50. if !empty(PKGSRC_COMPILER:Msunpro)
51. if ${OPSYS} == "SunOS" || !empty(PKGSRC_COMPILER:Msunpro) 
52# don't use x86 assembly (it doesn't build) 51# don't use x86 assembly (it doesn't build)
53CONFIGURE_ENV+= MPN_PATH="generic" 52CONFIGURE_ENV+= MPN_PATH="generic"
54. else 53. else
55PKG_OPTIONS_VAR= PKG_OPTIONS.gmp 54PKG_OPTIONS_VAR= PKG_OPTIONS.gmp
56PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd 55PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd
57PKG_SUGGESTED_OPTIONS= gmp-fat 56PKG_SUGGESTED_OPTIONS= gmp-fat
58. include "../../mk/bsd.options.mk" 57. include "../../mk/bsd.options.mk"
59### 58###
60### Support for a "fat" binary on i386, with CPU autodetection. 59### Support for a "fat" binary on i386, with CPU autodetection.
61### 60###
62### XXX Currently, the 'mmx' and 'simd' options imply the same thing, 61### XXX Currently, the 'mmx' and 'simd' options imply the same thing,
63### as cpu detection is done at runtime. Is there a more elegant 62### as cpu detection is done at runtime. Is there a more elegant
64### way to handle this? 63### way to handle this?