summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-03-29 07:42:16 +0000
committerjlam <jlam@pkgsrc.org>2004-03-29 07:42:16 +0000
commit758f793d65451bcfacaec5a86ec02b9ed83aed27 (patch)
tree236b075e747953a594fe0d094e777a88094af19f /security
parentc08e9a07d1f4ba8171a1e857a2ffc4ec05e58c53 (diff)
downloadpkgsrc-758f793d65451bcfacaec5a86ec02b9ed83aed27.tar.gz
Nuke the special libtool handling since the version of libgcrypt in
pkgsrc does the right thing with assembler source files.
Diffstat (limited to 'security')
-rw-r--r--security/libgcrypt/Makefile12
1 files changed, 3 insertions, 9 deletions
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index aefd69b7434..633f004f070 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/25 15:51:51 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2004/03/29 07:42:16 jlam Exp $
#
DISTNAME= libgcrypt-1.1.92
@@ -23,22 +23,16 @@ INFO_FILES= gcrypt.info
.include "../../mk/bsd.prefs.mk"
-# Our "libtool" doesn't like the crafted ".lo" files with the assembly
-# implementations. So we use the bundled "libtool" for NetBSD-i386 ELF
-# and ours otherwise.
-#
.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
CONFIGURE_ARGS+= --disable-asm
-LIBTOOL_OVERRIDE+= libtool
-.else
-LIBTOOL_OVERRIDE= # empty
.endif
+.include "../../security/libgpg-error/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
+
.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "native")
CONFIGURE_ARGS+= --without-pth
.endif
-.include "../../security/libgpg-error/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"