libp11: update to version 0.4.6
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
fa1a510595
commit
cef04a5a25
|
@ -8,9 +8,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=libp11
|
||||
PKG_VERSION:=0.4.1
|
||||
PKG_RELEASE:=2
|
||||
PKG_MD5SUM:=70489f6dbe0b7fd72aab010c25016fa047723f67ea50ce9ae73bc8d38181b673
|
||||
PKG_VERSION:=0.4.6
|
||||
PKG_RELEASE:=1
|
||||
PKG_HASH:=03d4990c17c8dc1ba18a442a944acca6c03f4a3972be9aea6e727882f2be6d7c
|
||||
|
||||
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||
PKG_LICENSE:=LGPL-2.1+
|
||||
|
|
|
@ -1,25 +1,22 @@
|
|||
Index: libp11-0.4.1/src/Makefile.am
|
||||
===================================================================
|
||||
--- libp11-0.4.1.orig/src/Makefile.am
|
||||
+++ libp11-0.4.1/src/Makefile.am
|
||||
@@ -36,12 +36,6 @@ pkcs11_la_LIBADD = $(libp11_la_OBJECTS)
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -47,13 +47,6 @@ pkcs11_la_LIBADD = $(libp11_la_OBJECTS)
|
||||
pkcs11_la_LDFLAGS = $(AM_LDFLAGS) -module -shared -shrext $(SHARED_EXT) \
|
||||
-avoid-version -export-symbols "$(srcdir)/pkcs11.exports"
|
||||
|
||||
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
|
||||
-check-local: $(LTLIBRARIES)
|
||||
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
|
||||
-
|
||||
-install-exec-hook:
|
||||
- cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
|
||||
- cd '$(DESTDIR)$(enginesexecdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
|
||||
-
|
||||
if WIN32
|
||||
# def file required for MS users to build library
|
||||
mylibdir=$(libdir)
|
||||
Index: libp11-0.4.1/src/Makefile.in
|
||||
===================================================================
|
||||
--- libp11-0.4.1.orig/src/Makefile.in
|
||||
+++ libp11-0.4.1/src/Makefile.in
|
||||
@@ -839,7 +839,7 @@ distdir: $(DISTFILES)
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -844,7 +844,7 @@ distdir: $(DISTFILES)
|
||||
fi; \
|
||||
done
|
||||
check-am: all-am
|
||||
|
@ -28,42 +25,30 @@ Index: libp11-0.4.1/src/Makefile.in
|
|||
check: check-am
|
||||
all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h
|
||||
installdirs:
|
||||
@@ -910,7 +910,7 @@ install-dvi-am:
|
||||
@@ -915,7 +915,7 @@ install-dvi-am:
|
||||
|
||||
install-exec-am: install-libLTLIBRARIES
|
||||
install-exec-am: install-enginesexecLTLIBRARIES install-libLTLIBRARIES
|
||||
@$(NORMAL_INSTALL)
|
||||
- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
|
||||
+ $(MAKE) $(AM_MAKEFLAGS)
|
||||
install-html: install-html-am
|
||||
|
||||
install-html-am:
|
||||
@@ -955,7 +955,7 @@ uninstall-am: uninstall-enginesLTLIBRARI
|
||||
@@ -960,7 +960,7 @@ uninstall-am: uninstall-enginesexecLTLIB
|
||||
|
||||
.MAKE: all check-am install-am install-exec-am install-strip
|
||||
|
||||
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \
|
||||
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
|
||||
clean-enginesLTLIBRARIES clean-generic clean-libLTLIBRARIES \
|
||||
clean-libtool cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-hdr \
|
||||
@@ -963,7 +963,7 @@ uninstall-am: uninstall-enginesLTLIBRARI
|
||||
html-am info info-am install install-am install-data \
|
||||
install-data-am install-dvi install-dvi-am \
|
||||
install-enginesLTLIBRARIES install-exec install-exec-am \
|
||||
clean-enginesexecLTLIBRARIES clean-generic \
|
||||
clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
|
||||
ctags-am distclean distclean-compile distclean-generic \
|
||||
@@ -968,7 +968,7 @@ uninstall-am: uninstall-enginesexecLTLIB
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-enginesexecLTLIBRARIES install-exec install-exec-am \
|
||||
- install-exec-hook install-html install-html-am \
|
||||
+ install-html install-html-am \
|
||||
install-includeHEADERS install-info install-info-am \
|
||||
install-libLTLIBRARIES install-man install-mylibDATA \
|
||||
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
|
||||
@@ -979,11 +979,6 @@ uninstall-am: uninstall-enginesLTLIBRARI
|
||||
|
||||
$(srcdir)/config.h.in $(srcdir)/config.h.in~
|
||||
|
||||
-# OpenSSL older than 1.1.0 expected libpkcs11.so instead of pkcs11.so
|
||||
-check-local: $(LTLIBRARIES)
|
||||
- cd .libs && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
|
||||
-install-exec-hook:
|
||||
- cd '$(DESTDIR)$(enginesdir)' && $(LN_S) -f pkcs11$(SHARED_EXT) libpkcs11$(SHARED_EXT)
|
||||
@WIN32_TRUE@.libs/@WIN_LIBPREFIX@p11-@LIBP11_LT_OLDEST@.dll.def: libp11.la
|
||||
|
||||
.rc.lo:
|
||||
|
|
Loading…
Reference in New Issue