security/gnutls has a rather confusing conditional section added
one and a half years ago in rev 1.136 by espie@:
  use lang/clang if amd64 and system compiler is not clang

I don't think we need deal with this eventuality any longer.  It
also appears to have hidden the fact that COMPILER_LIBCXX was added
to WANTLIB only on some archs.

OK or did I misunderstand this?  It's very confusing.

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/gnutls/Makefile,v
retrieving revision 1.147
diff -u -p -r1.147 Makefile
--- Makefile    24 Oct 2018 14:28:10 -0000      1.147
+++ Makefile    4 Nov 2018 17:44:57 -0000
@@ -5,7 +5,7 @@ COMMENT=                GNU Transport Layer Security l
 V=                     3.5.19
 DISTNAME=              gnutls-${V}
 EXTRACT_SUFX=          .tar.xz
-REVISION=              0
+REVISION=              1
 
 CATEGORIES=            security
 
@@ -20,22 +20,12 @@ MAINTAINER=         Antoine Jacoutot <ajacoutot
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += c ffi gmp hogweed iconv idn2 intl m nettle p11-kit pthread
-WANTLIB += tasn1 unistring z
+WANTLIB += tasn1 unistring z ${COMPILER_LIBCXX}
 
 COMPILER =             base-clang ports-gcc base-gcc
 
 MASTER_SITES=          https://www.gnupg.org/ftp/gcrypt/gnutls/v${V:R}/ \
                        ftp://ftp.gnutls.org/gcrypt/gnutls/v${V:R}/
-
-.include <bsd.port.arch.mk>
-.if ${PROPERTIES:Mclang} || ${MACHINE_ARCH} != amd64
-WANTLIB += ${COMPILER_LIBCXX}
-.else
-# assembly instructions
-MODULES +=     lang/clang
-MODCLANG_ARCHS=        amd64
-MODCLANG_LANGS= c++
-.endif
 
 # needed for tests
 BUILD_DEPENDS=         devel/cmocka
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to