pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/gnutls Disable the C++ library on Darwin to a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eef078cac762
branches:  trunk
changeset: 524239:eef078cac762
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Jan 21 18:13:55 2007 +0000

description:
Disable the C++ library on Darwin to avoid a link error (PR 35456).
According to the gnutls maintainer, the C++ compiler on Darwin is
probably broken.

diffstat:

 security/gnutls/Makefile |  12 +++++++++++-
 security/gnutls/PLIST    |   6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (53 lines):

diff -r 24f115b5a724 -r eef078cac762 security/gnutls/Makefile
--- a/security/gnutls/Makefile  Sun Jan 21 17:13:58 2007 +0000
+++ b/security/gnutls/Makefile  Sun Jan 21 18:13:55 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/01/20 17:38:06 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2007/01/21 18:13:55 minskim Exp $
 
 DISTNAME=      gnutls-1.6.1
 CATEGORIES=    security devel
@@ -37,6 +37,16 @@
 DOCDIR=                ${PREFIX}/share/doc/gnutls
 EGDIR=         ${PREFIX}/share/examples/gnutls
 
+.include "../../mk/bsd.prefs.mk"
+
+# Darwin's g++ cannot build the gnutls C++ library (PR 35456).
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=       --disable-cxx
+PLIST_SUBST+=          CXX="@comment "
+.else
+PLIST_SUBST+=          CXX=""
+.endif
+
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} include/gnutls
 
 post-install:
diff -r 24f115b5a724 -r eef078cac762 security/gnutls/PLIST
--- a/security/gnutls/PLIST     Sun Jan 21 17:13:58 2007 +0000
+++ b/security/gnutls/PLIST     Sun Jan 21 18:13:55 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2007/01/20 17:38:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2007/01/21 18:13:55 minskim Exp $
 bin/certtool
 bin/gnutls-cli
 bin/gnutls-cli-debug
@@ -10,7 +10,7 @@
 include/gnutls/compat.h
 include/gnutls/extra.h
 include/gnutls/gnutls.h
-include/gnutls/gnutlsxx.h
+${CXX}include/gnutls/gnutlsxx.h
 include/gnutls/openpgp.h
 include/gnutls/openssl.h
 include/gnutls/pkcs12.h
@@ -19,7 +19,7 @@
 lib/libgnutls-extra.la
 lib/libgnutls-openssl.la
 lib/libgnutls.la
-lib/libgnutlsxx.la
+${CXX}lib/libgnutlsxx.la
 lib/pkgconfig/gnutls-extra.pc
 lib/pkgconfig/gnutls.pc
 man/man1/certtool.1



Home | Main Index | Thread Index | Old Index