pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/libgcrypt Nuke the special libtool handling s...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/079665cba7ff
branches:  trunk
changeset: 471570:079665cba7ff
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 29 07:42:16 2004 +0000

description:
Nuke the special libtool handling since the version of libgcrypt in
pkgsrc does the right thing with assembler source files.

diffstat:

 security/libgcrypt/Makefile |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (34 lines):

diff -r 13fcc19da7e1 -r 079665cba7ff security/libgcrypt/Makefile
--- a/security/libgcrypt/Makefile       Mon Mar 29 07:24:49 2004 +0000
+++ b/security/libgcrypt/Makefile       Mon Mar 29 07:42:16 2004 +0000
@@ -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 @@
 
 .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"



Home | Main Index | Thread Index | Old Index