[pkgsrc/trunk]: pkgsrc/devel/gmp Disable C++ and fat binary support when usin...

[sketch <sketch%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d08fe9f0f99
branches:  trunk
changeset: 553408:6d08fe9f0f99
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Tue Jan 20 17:51:12 2009 +0000

description:
Disable C++ and fat binary support when using Sun Studio, they don't build.

diffstat:

 devel/gmp/Makefile |  14 +++++++++++---
 devel/gmp/PLIST    |   6 +++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 85d6eec99b1e -r 6d08fe9f0f99 devel/gmp/Makefile
--- a/devel/gmp/Makefile        Tue Jan 20 17:26:38 2009 +0000
+++ b/devel/gmp/Makefile        Tue Jan 20 17:51:12 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2008/11/21 11:27:31 bjs Exp $
+# $NetBSD: Makefile,v 1.55 2009/01/20 17:51:12 sketch Exp $
 
 DISTNAME=      gmp-4.2.4
 PKGREVISION=   1
@@ -25,11 +25,19 @@
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gm4 autoconf makeinfo
 
-CONFIGURE_ARGS+=       --enable-cxx --without-readline
+CONFIGURE_ARGS+=       --without-readline
 
 TEST_TARGET=           check
 
+PLIST_VARS+=           cxx
+
 .include "../../mk/bsd.prefs.mk"
+
+.if empty(PKGSRC_COMPILER:Msunpro)
+CONFIGURE_ARGS+=       --enable-cxx
+PLIST.cxx=             yes
+.endif
+
 .if !empty(MACHINE_PLATFORM:MIRIX-5*) && !empty(ABI)
 ABI=                   o32
 .endif
@@ -40,7 +48,7 @@
 .endif
 
 .if ${MACHINE_ARCH} == "i386"
-.  if ${OPSYS} == "Darwin"
+.  if ${OPSYS} == "Darwin" || !empty(PKGSRC_COMPILER:Msunpro)
 # don't use x86 assembly (it doesn't build)
 CONFIGURE_ENV+=                MPN_PATH="generic"
 .  else
diff -r 85d6eec99b1e -r 6d08fe9f0f99 devel/gmp/PLIST
--- a/devel/gmp/PLIST   Tue Jan 20 17:26:38 2009 +0000
+++ b/devel/gmp/PLIST   Tue Jan 20 17:51:12 2009 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2006/03/30 03:44:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/01/20 17:51:12 sketch Exp $
 include/gmp.h
-include/gmpxx.h
+${PLIST.cxx}include/gmpxx.h
 info/gmp.info
 lib/libgmp.la
-lib/libgmpxx.la
+${PLIST.cxx}lib/libgmpxx.la