Wed Oct 2 15:13:46 2013 UTC ()
Oops.. switched back to .tar.bz2


(adam)
diff -r1.71 -r1.72 pkgsrc/devel/gmp/Makefile
diff -r1.43 -r1.44 pkgsrc/devel/gmp/distinfo
cvs diff -r1.71 -r1.72 pkgsrc/devel/gmp/Makefile (switch to unified diff)

--- pkgsrc/devel/gmp/Makefile 2013/10/02 15:10:55 1.71
+++ pkgsrc/devel/gmp/Makefile 2013/10/02 15:13:46 1.72
@@ -1,81 +1,81 @@ @@ -1,81 +1,81 @@
1# $NetBSD: Makefile,v 1.71 2013/10/02 15:10:55 adam Exp $ 1# $NetBSD: Makefile,v 1.72 2013/10/02 15:13:46 adam Exp $
2 2
3DISTNAME= gmp-5.1.3 3DISTNAME= gmp-5.1.3
4CATEGORIES= devel math 4CATEGORIES= devel math
5MASTER_SITES= ftp://ftp.gmplib.org/pub/${DISTNAME}/ 5MASTER_SITES= ftp://ftp.gmplib.org/pub/${DISTNAME}/
6# Use .tar.bz2 distfile so that no extra dependency on archivers/xz 6# Use .tar.bz2 distfile so that no extra dependency on archivers/xz
7# is needed when building lang/gcc* with option gcc-inplace-math. 7# is needed when building lang/gcc* with option gcc-inplace-math.
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://gmplib.org/ 11HOMEPAGE= http://gmplib.org/
12COMMENT= Library for arbitrary precision arithmetic 12COMMENT= Library for arbitrary precision arithmetic
13LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3 13LICENSE= gnu-lgpl-v3 AND gnu-gpl-v3
14 14
15PKG_INSTALLATION_TYPES= overwrite pkgviews 15PKG_INSTALLATION_TYPES= overwrite pkgviews
16 16
17INFO_FILES= yes 17INFO_FILES= yes
18USE_LANGUAGES= c c++ c99 18USE_LANGUAGES= c c++ c99
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20USE_TOOLS+= gm4 autoconf makeinfo 20USE_TOOLS+= gm4 autoconf makeinfo
21GNU_CONFIGURE= yes 21GNU_CONFIGURE= yes
22CONFIGURE_ARGS+= --without-readline 22CONFIGURE_ARGS+= --without-readline
23 23
24TEST_TARGET= check 24TEST_TARGET= check
25 25
26PLIST_VARS+= cxx 26PLIST_VARS+= cxx
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29 29
30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 30.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
31CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 31CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
32.endif 32.endif
33 33
34.if empty(PKGSRC_COMPILER:Msunpro) 34.if empty(PKGSRC_COMPILER:Msunpro)
35CONFIGURE_ARGS+= --enable-cxx 35CONFIGURE_ARGS+= --enable-cxx
36PLIST.cxx= yes 36PLIST.cxx= yes
37.endif 37.endif
38 38
39.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI) 39.if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
40ABI= o32 40ABI= o32
41.endif 41.endif
42 42
43.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 43.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
44# The configure script thinks gcc 2.95 for ARM is too buggy to use. 44# The configure script thinks gcc 2.95 for ARM is too buggy to use.
45GCC_REQD+= 3.0 45GCC_REQD+= 3.0
46.endif 46.endif
47 47
48.if ${MACHINE_ARCH} == "i386" 48.if ${MACHINE_ARCH} == "i386"
49# XXX SunOS should work, but currently bombs in mpn/fat.c 49# XXX SunOS should work, but currently bombs in mpn/fat.c
50. if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" || !empty(PKGSRC_COMPILER:Msunpro) 50. if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS" || !empty(PKGSRC_COMPILER:Msunpro)
51# don't use x86 assembly (it doesn't build) 51# don't use x86 assembly (it doesn't build)
52CONFIGURE_ENV+= MPN_PATH="generic" 52CONFIGURE_ENV+= MPN_PATH="generic"
53. else 53. else
54PKG_OPTIONS_VAR= PKG_OPTIONS.gmp 54PKG_OPTIONS_VAR= PKG_OPTIONS.gmp
55PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd 55PKG_SUPPORTED_OPTIONS= gmp-fat mmx simd
56PKG_SUGGESTED_OPTIONS= gmp-fat 56PKG_SUGGESTED_OPTIONS= gmp-fat
57. include "../../mk/bsd.options.mk" 57. include "../../mk/bsd.options.mk"
58### 58###
59### Support for a "fat" binary on i386. There's CPU autodetection, 59### Support for a "fat" binary on i386. There's CPU autodetection,
60### so we'll be safe and filter out -march/-mcpu, et. al. 60### so we'll be safe and filter out -march/-mcpu, et. al.
61### 61###
62### XXX Currently, the 'mmx' and 'simd' options imply the same thing, 62### XXX Currently, the 'mmx' and 'simd' options imply the same thing,
63### as cpu detection is done at runtime. Is there a more elegant 63### as cpu detection is done at runtime. Is there a more elegant
64### way to handle this? 64### way to handle this?
65### 65###
66. if empty(PKG_OPTIONS:Mgmp-fat) && \ 66. if empty(PKG_OPTIONS:Mgmp-fat) && \
67 (!empty(PKG_OPTIONS:Mmmx) || !empty(PKG_OPTIONS:Msimd)) 67 (!empty(PKG_OPTIONS:Mmmx) || !empty(PKG_OPTIONS:Msimd))
68PKG_OPTIONS+= gmp-fat 68PKG_OPTIONS+= gmp-fat
69. endif 69. endif
70. if !empty(PKG_OPTIONS:Mgmp-fat) 70. if !empty(PKG_OPTIONS:Mgmp-fat)
71CONFIGURE_ARGS+= --enable-fat 71CONFIGURE_ARGS+= --enable-fat
72BUILDLINK_TRANSFORM+= rm-optarg:-march rm-optarg:-mcpu 72BUILDLINK_TRANSFORM+= rm-optarg:-march rm-optarg:-mcpu
73BUILDLINK_TRANSFORM+= rm:-mmmx rm:-msse rm:-msse2 rm:-msse3 rm:-m3dnow 73BUILDLINK_TRANSFORM+= rm:-mmmx rm:-msse rm:-msse2 rm:-msse3 rm:-m3dnow
74. endif 74. endif
75. endif 75. endif
76.endif 76.endif
77 77
78pre-configure: 78pre-configure:
79 cd ${WRKSRC} && type autoconf && autoconf 79 cd ${WRKSRC} && type autoconf && autoconf
80 80
81.include "../../mk/bsd.pkg.mk" 81.include "../../mk/bsd.pkg.mk"
cvs diff -r1.43 -r1.44 pkgsrc/devel/gmp/distinfo (switch to unified diff)

--- pkgsrc/devel/gmp/distinfo 2013/10/02 15:10:55 1.43
+++ pkgsrc/devel/gmp/distinfo 2013/10/02 15:13:46 1.44
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.43 2013/10/02 15:10:55 adam Exp $ 1$NetBSD: distinfo,v 1.44 2013/10/02 15:13:46 adam Exp $
2 2
3SHA1 (gmp-5.1.3.tar.xz) = 12cfe0911d64fcbd85835df9ddc18c99af8f9a45 3SHA1 (gmp-5.1.3.tar.bz2) = b35928e2927b272711fdfbf71b7cfd5f86a6b165
4RMD160 (gmp-5.1.3.tar.xz) = 09f274b178b5ef120eed8df36f44997df30090ba 4RMD160 (gmp-5.1.3.tar.bz2) = 5c1815d794e0d67e351f312dee4f78004b27053e
5Size (gmp-5.1.3.tar.xz) = 1818812 bytes 5Size (gmp-5.1.3.tar.bz2) = 2196480 bytes
6SHA1 (patch-aa) = ce0eefbbffe426aee5025e0d304c34954573609b 6SHA1 (patch-aa) = ce0eefbbffe426aee5025e0d304c34954573609b
7SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c 7SHA1 (patch-ab) = 829812822a72a4926ea4cf6e8ffafdcd13a0f76c
8SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8 8SHA1 (patch-ac) = 6f7de0a285bec2c2645479d3090dc0276580f3d8
9SHA1 (patch-mpn_arm_invert__limb.asm) = 0d4c4af299b846834bb13277844df364824d3a09 9SHA1 (patch-mpn_arm_invert__limb.asm) = 0d4c4af299b846834bb13277844df364824d3a09