pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/opensc Stop forcing pcsc-lite's library to be...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4d0ab511fae
branches:  trunk
changeset: 632154:d4d0ab511fae
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Mon Mar 17 18:21:42 2014 +0000

description:
Stop forcing pcsc-lite's library to be the libtool version.

opensc upstream has removed the use of ltdl.  Thus, it is not longer
reasonable to expect it to be able to dlopen a .la file.  So pass the
.so, not the .la, to configure, when using the pcsc-lite (default)
option.  Resolves a failure of pkcs15-init to load modules.

diffstat:

 security/opensc/Makefile   |  3 ++-
 security/opensc/options.mk |  6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r b682c4ee7a02 -r d4d0ab511fae security/opensc/Makefile
--- a/security/opensc/Makefile  Mon Mar 17 17:58:54 2014 +0000
+++ b/security/opensc/Makefile  Mon Mar 17 18:21:42 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2014/03/14 20:49:56 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2014/03/17 18:21:42 gdt Exp $
 
 OPENSC_PKG_VERSION=    0.13.0
 DISTNAME=              opensc-${OPENSC_PKG_VERSION}
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=opensc/OpenSC/opensc-0.13.0/}
 
diff -r b682c4ee7a02 -r d4d0ab511fae security/opensc/options.mk
--- a/security/opensc/options.mk        Mon Mar 17 17:58:54 2014 +0000
+++ b/security/opensc/options.mk        Mon Mar 17 18:21:42 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/12/03 20:23:15 gdt Exp $
+# $NetBSD: options.mk,v 1.4 2014/03/17 18:21:42 gdt Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opensc
 
@@ -13,7 +13,9 @@
 .if !empty(PKG_OPTIONS:Mpcsc-lite)
 .include "../../security/pcsc-lite/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-pcsc
-CONFIGURE_ARGS+=       --with-pcsc-provider=${BUILDLINK_PREFIX.pcsc-lite}/lib/libpcsclite.la
+# While one might expect the libtool .la, ltdl support has been
+# removed from opensc.
+CONFIGURE_ARGS+=       --with-pcsc-provider=${BUILDLINK_PREFIX.pcsc-lite}/lib/libpcsclite.so
 .else
 CONFIGURE_ARGS+=       --disable-pcsc
 .endif



Home | Main Index | Thread Index | Old Index