Fri Nov 21 11:27:31 2008 UTC ()
PKGREVISION++


(bjs)
diff -r1.53 -r1.54 pkgsrc/devel/gmp/Makefile
diff -r1.25 -r1.26 pkgsrc/devel/gmp/distinfo
cvs diff -r1.53 -r1.54 pkgsrc/devel/gmp/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gmp/Makefile 2008/10/09 10:56:16 1.53
+++ pkgsrc/devel/gmp/Makefile 2008/11/21 11:27:31 1.54
@@ -1,64 +1,74 @@ @@ -1,64 +1,74 @@
1# $NetBSD: Makefile,v 1.53 2008/10/09 10:56:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.54 2008/11/21 11:27:31 bjs Exp $
2 2
3DISTNAME= gmp-4.2.4 3DISTNAME= gmp-4.2.4
 4PKGREVISION= 1
4CATEGORIES= devel math 5CATEGORIES= devel math
5MASTER_SITES= ${MASTER_SITE_GNU:=gmp/} 6MASTER_SITES= ${MASTER_SITE_GNU:=gmp/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8#PATCHFILES= 9PATCHFILES= mpf_set_str.c.4.diff
9#PATCH_SITES+= http://www.gmplib.org/patches/ 10PATCHFILES+= mpf_eq.diff
10#PATCH_DIST_STRIP= -p0 11PATCH_SITES+= http://www.gmplib.org/patches/
 12PATCH_DIST_STRIP= -p0
11 13
12MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://gmplib.org/ 15HOMEPAGE= http://gmplib.org/
14COMMENT= Library for arbitrary precision arithmetic 16COMMENT= Library for arbitrary precision arithmetic
15#LICENSE= gnu-lgpl-v3 17#LICENSE= gnu-lgpl-v3
16 18
17PKG_DESTDIR_SUPPORT= user-destdir 19PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 20PKG_INSTALLATION_TYPES= overwrite pkgviews
19 21
20GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
21INFO_FILES= yes 23INFO_FILES= yes
22USE_LANGUAGES= c c++ c99 24USE_LANGUAGES= c c++ c99
23USE_LIBTOOL= yes 25USE_LIBTOOL= yes
24USE_TOOLS+= gm4 autoconf 26USE_TOOLS+= gm4 autoconf makeinfo
25 27
26CONFIGURE_ARGS+= --enable-cxx --without-readline 28CONFIGURE_ARGS+= --enable-cxx --without-readline
27 29
28TEST_TARGET= check 30TEST_TARGET= check
29 31
30.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
31.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI) 33.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
32ABI= o32 34ABI= o32
33.endif 35.endif
34 36
35.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 37.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
36# The configure script thinks gcc 2.95 for ARM is too buggy to use. 38# The configure script thinks gcc 2.95 for ARM is too buggy to use.
37GCC_REQD+= 3.0 39GCC_REQD+= 3.0
38.endif 40.endif
39 41
40.if ${MACHINE_ARCH} == "i386" 42.if ${MACHINE_ARCH} == "i386"
41. if ${OPSYS} == "Darwin" 43. if ${OPSYS} == "Darwin"
42# don't use x86 assembly (it doesn't build) 44# don't use x86 assembly (it doesn't build)
43CONFIGURE_ENV+= MPN_PATH="generic" 45CONFIGURE_ENV+= MPN_PATH="generic"
44. else 46. else
45PKG_OPTIONS_VAR= PKG_OPTIONS.gmp 47PKG_OPTIONS_VAR= PKG_OPTIONS.gmp
46PKG_SUPPORTED_OPTIONS= gmp-fat 48PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd
47#PKG_SUGGESTED_OPTIONS= gmp-fat # XXX could be good for bulk builds (?) 49PKG_SUGGESTED_OPTIONS= gmp-fat
48. include "../../mk/bsd.options.mk" 50. include "../../mk/bsd.options.mk"
49### 51###
50### Support for a "fat" binary on i386. There's CPU autodetection, 52### Support for a "fat" binary on i386. There's CPU autodetection,
51### so we'll be safe and filter out -march/-mcpu, et. al. 53### so we'll be safe and filter out -march/-mcpu, et. al.
52### 54###
 55### XXX Currently, the 'mmx' and 'simd' options imply the same thing,
 56### as cpu detection is done at runtime. Is there a more elegant
 57### way to handle this?
 58###
 59. if empty(PKG_OPTIONS:Mgmp-fat) && \
 60 (!empty(PKG_OPTIONS:Mmmx) || !empty(PKG_OPTIONS:Msimd))
 61PKG_OPTIONS+= gmp-fat
 62. endif
53. if !empty(PKG_OPTIONS:Mgmp-fat) 63. if !empty(PKG_OPTIONS:Mgmp-fat)
54CONFIGURE_ARGS+= --enable-fat 64CONFIGURE_ARGS+= --enable-fat
55BUILDLINK_TRANSFORM+= rm-optarg:-march rm-optarg:-mcpu 65BUILDLINK_TRANSFORM+= rm-optarg:-march rm-optarg:-mcpu
56BUILDLINK_TRANSFORM+= rm:-mmmx rm:-msse rm:-msse2 rm:-msse3 rm:-m3dnow 66BUILDLINK_TRANSFORM+= rm:-mmmx rm:-msse rm:-msse2 rm:-msse3 rm:-m3dnow
57. endif 67. endif
58. endif 68. endif
59.endif 69.endif
60 70
61pre-configure: 71pre-configure:
62 cd ${WRKSRC} && type autoconf && autoconf 72 cd ${WRKSRC} && type autoconf && autoconf
63 73
64.include "../../mk/bsd.pkg.mk" 74.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/devel/gmp/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gmp/distinfo 2008/11/20 16:44:45 1.25
+++ pkgsrc/devel/gmp/distinfo 2008/11/21 11:27:31 1.26
@@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
1$NetBSD: distinfo,v 1.25 2008/11/20 16:44:45 adam Exp $ 1$NetBSD: distinfo,v 1.26 2008/11/21 11:27:31 bjs Exp $
2 2
3SHA1 (gmp-4.2.4.tar.bz2) = bb721f94fbeeb8c609104540b408da6707c370ec 3SHA1 (gmp-4.2.4.tar.bz2) = bb721f94fbeeb8c609104540b408da6707c370ec
4RMD160 (gmp-4.2.4.tar.bz2) = 15c6c40c377088a3bcf9d432bcc27c777991cb12 4RMD160 (gmp-4.2.4.tar.bz2) = 15c6c40c377088a3bcf9d432bcc27c777991cb12
5Size (gmp-4.2.4.tar.bz2) = 1710660 bytes 5Size (gmp-4.2.4.tar.bz2) = 1710660 bytes
 6SHA1 (mpf_eq.diff) = 5fe6dd4dba6574baf3db8f3d2a16fbd73dc295e1
 7RMD160 (mpf_eq.diff) = 52036e74d5d118db1fd0ad844ba871249fdbaefc
 8Size (mpf_eq.diff) = 9252 bytes
 9SHA1 (mpf_set_str.c.4.diff) = b14fc8b7644183e021406f05b5e168589d9acd1d
 10RMD160 (mpf_set_str.c.4.diff) = 03015e15518bdd5887d09f8b3fb12f9c8d2b4beb
 11Size (mpf_set_str.c.4.diff) = 860 bytes
6SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6 12SHA1 (patch-aa) = a53db34c8ecf38d6556a59a0fa7382456c30fab6
7SHA1 (patch-ab) = e768eca25c117871041d12a618e38d9d252f25e5 13SHA1 (patch-ab) = e768eca25c117871041d12a618e38d9d252f25e5
8SHA1 (patch-ac) = 9c7e6817632596bfd6c86a30e3b2d7f78fccd5ff 14SHA1 (patch-ac) = 3120f7d207d65942910f8776786c0dbf6ee4d1b2